コミットを比較

..
11 コミット
89個のファイルの変更、1674行の追加、5366行の削除
+35
ファイルの表示
@@ -0,0 +1,35 @@
## 背景
なぜ必要か。
## 対象範囲
- backend:
- frontend:
- docs:
- migration:
## やること
- [ ]
## 受け入れ条件
- [ ]
## 実行すべき確認
- [ ] `cd backend && bundle exec rspec`
- [ ] `cd frontend && npm run build`
- [ ] `cd frontend && npm run lint`
## 禁止事項
- unrelated refactor はしない
- 既存 API response shape を壊さない
- 認証・認可・BAN を弱めない
## Codex への指示
この issue を読んで実装してください。
不明点があれば、実装前に調査結果と選択肢を提示してください。
+10 -1
ファイルの表示
@@ -100,9 +100,18 @@ class PostVersionsController < ApplicationController
def external_tag_names_for snapshots def external_tag_names_for snapshots
ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq
ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name| names = ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
[id, "#{ platform }:#{ name }"] [id, "#{ platform }:#{ name }"]
} }
missing_ids = ids - names.keys
HistoryAccess.visible(NicoTagVersion.all)
.where(tag_id: missing_ids)
.order(:tag_id, version_no: :desc)
.pluck(:tag_id, :name)
.each { |id, name| names[id] ||= name }
names
end end
def snapshot_tag_literals snapshots, tag_names, external_tag_names def snapshot_tag_literals snapshots, tag_names, external_tag_names
-55
ファイルの表示
@@ -1,55 +0,0 @@
class StaticMirrorsController < ApplicationController
before_action :development_only
wrap_parameters false
def show
render json: { resource_limit: StaticMirror::RESOURCE_LIMIT,
name_limit: StaticMirror::NAME_LIMIT, max_bytes: StaticMirror::MAX_BYTES,
max_seconds: StaticMirrorJob::MAX_SECONDS, concurrency: 1,
cooldown_seconds: StaticMirrorJob::COOLDOWN,
expiry_seconds: StaticMirrorJob::EXPIRY.to_i, exclusions: StaticMirror::EXCLUSIONS }
end
def create
# No date input is accepted: this endpoint cannot promise historical restoration.
payload = request.request_parameters.except('authenticity_token')
.merge(request.query_parameters)
return head :bad_request unless (payload.keys - ['locale']).empty?
locale = resolve_locale!
session[:static_mirror_owner] ||= SecureRandom.hex(32)
job = StaticMirrorJob.start(owner: session[:static_mirror_owner], locale: locale.code,
origin: request.base_url)
render json: { job: }, status: :accepted
rescue StaticMirrorJob::Busy
response.headers['Retry-After'] = StaticMirrorJob::COOLDOWN.to_s
head :too_many_requests
rescue ActiveJob::EnqueueError
render json: { error: 'generation_failed' }, status: :service_unavailable
end
def status
value = StaticMirrorJob.status(params[:id], session[:static_mirror_owner])
return head :not_found unless value
render json: value
rescue StaticMirrorJob::Busy
head :service_unavailable
end
def download
bytes = StaticMirrorJob.download(params[:id], session[:static_mirror_owner])
return head :not_found unless bytes
send_data bytes, filename: 'static-mirror.zip', type: 'application/zip',
disposition: 'attachment'
rescue StaticMirrorJob::Busy
head :service_unavailable
end
private
def development_only
head :not_found unless Rails.env.development?
end
end
-155
ファイルの表示
@@ -1,155 +0,0 @@
require 'fileutils'
require 'timeout'
# Development PoC: one filesystem slot and Rails' in-process async executor.
# A process restart loses queued work; stale state fails rather than reporting success.
class StaticMirrorJob < ApplicationJob
self.queue_adapter = :async
EXPIRY = 10.minutes
COOLDOWN = 60
MAX_SECONDS = 60
class Busy < StandardError; end
def self.directory = Rails.root.join('tmp/static_mirror')
def self.synchronise(blocking: false)
FileUtils.mkdir_p(directory, mode: 0o700)
File.open(directory.join('.registry.lock'), File::RDWR | File::CREAT, 0o600) do |lock|
mode = blocking ? File::LOCK_EX : File::LOCK_EX | File::LOCK_NB
raise Busy unless lock.flock(mode)
yield
end
end
def self.state
JSON.parse(directory.join('state.json').read)
rescue Errno::ENOENT
nil
end
def self.write(value)
path = directory.join('state.tmp')
File.open(path, 'w', 0o600) { _1.write(JSON.generate(value)) }
File.rename(path, directory.join('state.json'))
ensure
File.unlink(path) if path&.exist?
end
def self.start(owner:, locale:, origin:)
id = synchronise do
previous = state
if previous && Time.current.to_f - previous.fetch('created_at') < COOLDOWN
raise Busy
end
File.open(directory.join('.generation.lock'), File::RDWR | File::CREAT, 0o600) do |lock|
raise Busy unless lock.flock(File::LOCK_EX | File::LOCK_NB)
FileUtils.rm_f(directory.join('archive.zip'))
FileUtils.rm_f(directory.join('archive.part'))
identifier = SecureRandom.hex(24)
write({ 'id' => identifier, 'owner' => owner, 'locale' => locale, 'origin' => origin,
'created_at' => Time.current.to_f, 'expiry_at' => (Time.current + EXPIRY).to_f,
'status' => 'queued', 'processed' => 0, 'total' => nil, 'data_at' => nil })
identifier
end
end
perform_later(id)
id
rescue ActiveJob::EnqueueError
update(id) { _1.merge!('status' => 'failed', 'error' => 'generation_failed') } if id
raise
end
def self.authorised_state(id, owner)
value = state
return unless owner.present? && value && value['id'] == id && value['owner'] == owner
return unless value['expiry_at'] > Time.current.to_f
if (['queued', 'running'].include?(value['status']) &&
Time.current.to_f - value['created_at'] > MAX_SECONDS + 15)
value.merge!('status' => 'failed', 'error' => 'worker_stopped')
write(value)
end
if value['status'] == 'ready'
permitted = HistoryAccess.set(user: nil) { HistoryAccess.authorised_artifact?(value) }
return unless permitted && directory.join('archive.zip').file?
end
value
end
def self.status(id, owner)
synchronise do
authorised_state(id, owner)&.slice('status', 'processed', 'total', 'data_at', 'error')
end
end
def self.download(id, owner)
synchronise do
value = authorised_state(id, owner)
return unless value && value['status'] == 'ready'
bytes = directory.join('archive.zip').binread
# Revalidate after reading; send_data avoids delayed sendfile reuse of a stale path.
permitted = HistoryAccess.set(user: nil) { HistoryAccess.authorised_artifact?(value) }
permitted ? bytes : nil
end
end
def self.update(id)
# Worker updates may wait for a short status/download read; request intake never waits.
synchronise(blocking: true) do
value = state
return unless value && value['id'] == id
yield value
write(value)
end
end
def perform(id)
File.open(self.class.directory.join('.generation.lock'), File::RDWR) do |lock|
return unless lock.flock(File::LOCK_EX | File::LOCK_NB)
value = self.class.state
return unless value && value['id'] == id && value['status'] == 'queued'
generate(id, value)
end
end
private
def generate(id, value)
self.class.update(id) { _1['status'] = 'running' }
remaining = MAX_SECONDS - (Time.current.to_f - value.fetch('created_at'))
raise Timeout::Error unless remaining.positive?
Timeout.timeout(remaining) do
locale = Locale.find_by!(code: value.fetch('locale'), deprecated_at: nil)
mirror = StaticMirror.new(locale:, origin: value.fetch('origin'))
bytes = mirror.export do |processed, total|
self.class.update(id) do |metadata|
metadata.merge!('processed' => processed, 'total' => total, 'data_at' => mirror.data_at)
end
end
part = self.class.directory.join('archive.part')
File.open(part, 'wb', 0o600) { _1.write(bytes) }
File.rename(part, self.class.directory.join('archive.zip'))
self.class.update(id) do |metadata|
metadata.merge!(mirror.authority).merge!('status' => 'ready', 'data_at' => mirror.data_at)
end
end
rescue StandardError => error
FileUtils.rm_f(self.class.directory.join('archive.part'))
FileUtils.rm_f(self.class.directory.join('archive.zip'))
code = case error
when StaticMirror::TooLarge then 'too_large'
when Timeout::Error then 'generation_timeout'
when HistoryAccess::Forbidden then 'publication_changed'
else 'generation_failed'
end
self.class.update(id) { _1.merge!('status' => 'failed', 'error' => code) }
Rails.logger.warn("static_mirror_failure: #{ error.class }")
end
end
+6 -19
ファイルの表示
@@ -1,11 +1,8 @@
class ExternalTag < ApplicationRecord class ExternalTag < ApplicationRecord
before_create { SharedResourceIdAllocator.assign!(self) } before_create { SharedResourceIdAllocator.assign!(self) }
# Must run before dependent association callbacks.
before_destroy :prevent_destroy
enum :platform, nico: 'nico' enum :platform, nico: 'nico'
validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys } validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys }
validate :immutable_identity, on: :update
has_many :post_external_tags, dependent: :delete_all has_many :post_external_tags, dependent: :delete_all
has_many :posts, through: :post_external_tags has_many :posts, through: :post_external_tags
@@ -19,21 +16,11 @@ class ExternalTag < ApplicationRecord
has_many :linked_tags, through: :nico_tag_relations, source: :tag has_many :linked_tags, through: :nico_tag_relations, source: :tag
def snapshot_linked_tag_ids = linked_tags.distinct.order(:id).pluck(:id) def snapshot_linked_tag_names language_code = 'ja'
linked_tags
def delete .joins(:tag_names)
raise ActiveRecord::ReadOnlyRecord, '外部タグは削除できません.' .where(tag_names: { language_code:, primary_flg: true })
end .order('tag_names.name')
.pluck('tag_names.name')
private
def immutable_identity
errors.add(:platform, 'は変更できません.') if will_save_change_to_platform?
errors.add(:name, 'は変更できません.') if will_save_change_to_name?
end
def prevent_destroy
errors.add(:base, '外部タグは削除できません.')
throw(:abort)
end end
end end
+15 -1
ファイルの表示
@@ -106,7 +106,21 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
snapshot_reference(TagVersion, row), snapshot_reference(TagVersion, row),
snapshot_reference(NicoTagVersion, row, external: true)] snapshot_reference(NicoTagVersion, row, external: true)]
when 'nico_tag_versions' when 'nico_tag_versions'
[list_reference('tag_versions', 'tag_id', "#{ row }.linked_tag_ids")] # Legacy linked_tags snapshots contain names, not IDs. Match recorded names
# conservatively; never expose a private linked name through an external tag.
names = "JSON_MERGE_PRESERVE(JSON_ARRAY(private_tag.name), " +
"COALESCE(JSON_EXTRACT(private_tag.names, '$**.name'), JSON_ARRAY()))"
# DISTINCT prevents merging this independent name set into the correlated scan.
# Keep byte-distinct names even when the column collation considers them equal.
private_names = 'SELECT DISTINCT private_name.name, ' +
'CAST(private_name.name AS BINARY) AS name_bytes FROM tag_versions private_tag ' +
"JOIN (#{ discarded_keys('tag_versions', 'tag_id') }) blocked " +
'ON blocked.tag_id = private_tag.tag_id ' +
"JOIN JSON_TABLE(#{ names }, '$[*]' COLUMNS (name TEXT PATH '$')) private_name " +
"WHERE private_name.name <> ''"
["NOT EXISTS (SELECT 1 FROM (#{ private_names }) private_name WHERE " +
"LOCATE(CONCAT(' ', private_name.name, ' '), " +
"CONCAT(' ', COALESCE(#{ row }.linked_tags, ''), ' ')) > 0)"]
when 'tag_versions' when 'tag_versions'
[list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")] [list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")]
when 'tag_description_versions' when 'tag_description_versions'
+1 -6
ファイルの表示
@@ -3,10 +3,5 @@ class NicoTagVersion < ApplicationRecord
belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions
validates :event_type, inclusion: { in: ['create', 'update'] } validates :name, presence: true
def name
tag = external_tag
"#{ tag.platform }:#{ tag.name }" if tag
end
end end
+1 -4
ファイルの表示
@@ -139,8 +139,6 @@ class CountsVersionRepr
result = {} result = {}
table = model.table_name table = model.table_name
comparison = @inclusive ? '<=' : '<' comparison = @inclusive ? '<=' : '<'
name = model == NicoTagVersion ?
CountsResourceDefinition.new('nico_tags').expression('name', table) : 'name'
requests.each_slice(100) do |batch| requests.each_slice(100) do |batch|
queries = batch.map do |id, point| queries = batch.map do |id, point|
scope = HistoryAccess.visible(model.where(tag_id: id)) scope = HistoryAccess.visible(model.where(tag_id: id))
@@ -150,8 +148,7 @@ class CountsVersionRepr
"AND newer.version_no > #{ table }.version_no)", point) "AND newer.version_no > #{ table }.version_no)", point)
quoted = model.connection.quote(point.iso8601(6)) quoted = model.connection.quote(point.iso8601(6))
names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names' names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names'
scope.select("tag_id, #{ name } AS name, #{ names }, " + scope.select("tag_id, name, #{ names }, #{ quoted } AS reference_point").to_sql
"#{ quoted } AS reference_point").to_sql
end end
next if queries.empty? next if queries.empty?
+2 -4
ファイルの表示
@@ -28,18 +28,16 @@ class CountsCandidates
[external, 'external', 'NULL', 'JSON_OBJECT()']] [external, 'external', 'NULL', 'JSON_OBJECT()']]
sources = sources.map do |population, kind, category, names| sources = sources.map do |population, kind, category, names|
scope = population.scope.except(:select) scope = population.scope.except(:select)
name = population.definition.expression('name')
if @params['query'].present? if @params['query'].present?
pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%" pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
scope = scope.where("(#{ name } LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" + scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
"SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " + "SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
"JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " + "JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern) 'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
end end
scope.select(Arel.sql( scope.select(Arel.sql(
"CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " + "CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
"#{ name } AS name, #{ names } AS names, " + "v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind"))
"#{ category } AS category, '#{ kind }' AS kind"))
.to_sql .to_sql
end end
clauses = [] clauses = []
+1 -1
ファイルの表示
@@ -113,7 +113,7 @@ class CountsPopulation
else else
raise ArgumentError unless definition.axes(history).include?(key) raise ArgumentError unless definition.axes(history).include?(key)
scope = scope.where("#{ definition.expression(key) } <=> ?", entry['value']) scope = scope.where(definition.expression(key) => entry['value'])
end end
scope scope
end end
+3 -18
ファイルの表示
@@ -105,25 +105,12 @@ class CountsResourceDefinition
def time_column = 'created_at' def time_column = 'created_at'
def column(key) def column(key)
raise ArgumentError unless fields.key?(key) raise ArgumentError unless fields.key?(key)
# Keep the V1 Counts field name at the API boundary only.
return 'linked_tag_ids' if resource == 'nico_tags' && key == 'linked_tags'
{ 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key) { 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key)
end end
def expression(key, row = 'v') def expression(key, row = 'v') = "#{ row }.#{ column(key) }"
if resource == 'nico_tags' && key == 'name' def changes = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
return "(SELECT CONCAT(external_tags.platform, ':', external_tags.name) " +
"FROM external_tags WHERE external_tags.id = #{ row }.tag_id)"
end
"#{ row }.#{ column(key) }"
end
def changes
columns = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
resource == 'nico_tags' ? columns - ['name'] : columns
end
def axes(history) def axes(history)
fields.reject { |_key, type| type == :json }.keys + fields.reject { |_key, type| type == :json }.keys +
(resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : []) (resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : [])
@@ -131,9 +118,7 @@ class CountsResourceDefinition
def metadata def metadata
fields.map do |key, type| fields.map do |key, type|
nullable = (resource == 'nico_tags' && key == 'name') || { key:, type:, nullable: model.columns_hash.fetch(column(key)).null,
model.columns_hash.fetch(column(key)).null
{ key:, type:, nullable:,
operators: OPERATORS.fetch(type, []) } operators: OPERATORS.fetch(type, []) }
end end
end end
+1 -3
ファイルの表示
@@ -201,8 +201,6 @@ class CountsStateQuery
end end
def listing def listing
external_name = CountsResourceDefinition.new('nico_tags')
.expression('name', 'external_version')
catalog = <<~SQL catalog = <<~SQL
, tag_counts AS ( , tag_counts AS (
SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
@@ -211,7 +209,7 @@ class CountsStateQuery
SELECT 'internal' AS kind, tag_id, name, names, SELECT 'internal' AS kind, tag_id, name, names,
deprecated_at FROM tag_at WHERE event_type <> 'discard' deprecated_at FROM tag_at WHERE event_type <> 'discard'
UNION ALL UNION ALL
SELECT tc.kind, tc.tag_id, #{ external_name } AS name, JSON_OBJECT() AS names, SELECT tc.kind, tc.tag_id, external_version.name, JSON_OBJECT() AS names,
NULL AS deprecated_at NULL AS deprecated_at
FROM tag_counts tc FROM tag_counts tc
LEFT JOIN tag_at internal_version LEFT JOIN tag_at internal_version
-2
ファイルの表示
@@ -182,7 +182,6 @@ class CountsTableQuery
order = sort_sql { detail_expression(_1) } order = sort_sql { detail_expression(_1) }
query = query.order(Arel.sql((order + ['v.id ASC']).join(', '))) query = query.order(Arel.sql((order + ['v.id ASC']).join(', ')))
.limit(limit).offset((page - 1) * limit) .limit(limit).offset((page - 1) * limit)
query = query.preload(:external_tag) if @definition.resource == 'nico_tags'
rows = query.to_a rows = query.to_a
if ['posts', 'tags'].include?(@definition.resource) if ['posts', 'tags'].include?(@definition.resource)
point = population.history ? population.at : point = population.history ? population.at :
@@ -487,7 +486,6 @@ class CountsTableQuery
table = model.table_name table = model.table_name
scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point) scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point)
scope = scope.includes(:external_tag) if model == NicoTagVersion
bound = @connection.quote(point) bound = @connection.quote(point)
if population.history && @definition.resource == 'posts' if population.history && @definition.resource == 'posts'
key = kind == 'internal' ? 'tag_id' : 'external_tag_id' key = kind == 'internal' ? 'tag_id' : 'external_tag_id'
+2 -2
ファイルの表示
@@ -1,5 +1,4 @@
class NicoTagVersionRecorder < VersionRecorder class NicoTagVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update'].freeze
def self.record! external_tag:, event_type:, created_by_user: def self.record! external_tag:, event_type:, created_by_user:
new(external_tag:, event_type:, created_by_user:).record! new(external_tag:, event_type:, created_by_user:).record!
end end
@@ -15,7 +14,8 @@ class NicoTagVersionRecorder < VersionRecorder
def record_key = :external_tag def record_key = :external_tag
def snapshot_attributes def snapshot_attributes
{ linked_tag_ids: @record.snapshot_linked_tag_ids.join(' ') } { name: "#{ @record.platform }:#{ @record.name }",
linked_tags: @record.snapshot_linked_tag_names.join(' ') }
end end
def tracks_version_no_on_record? = false def tracks_version_no_on_record? = false
-201
ファイルの表示
@@ -1,201 +0,0 @@
require 'cgi'
require 'digest'
require 'erb'
require 'pathname'
require 'uri'
# A deliberately small current-state projection, always under public authority.
class StaticMirror
RESOURCE_LIMIT = 100
NAME_LIMIT = 2_000
MAX_BYTES = 8.megabytes
EXCLUSIONS = [
'historical_state', 'unversioned_resources', 'tag_descriptions', 'help', 'materials',
'external_tags', 'parent_relations', 'tag_sections', 'users', 'audit_data',
'authentication', 'editing', 'images', 'videos', 'resources_beyond_limits'].freeze
class TooLarge < StandardError; end
class UnsafeUrl < StandardError; end
attr_reader :data_at, :authority, :counts
def initialize(locale:, origin:)
@locale = locale
@origin = validated_url(origin).sub(%r{/+\z}, '')
end
def export(&progress)
@files = { }
@bytes = 0
HistoryAccess.set(user: nil) do
capture
progress&.call(0, @posts.length + @tags.length)
generate_pages(&progress)
raise HistoryAccess::Forbidden unless HistoryAccess.authorised_artifact?(authority)
generated_at = Time.current.utc
manifest = { format_version: 1, generated_at: generated_at.iso8601(6),
data_at:, locale: @locale.code, resources: counts, exclusions: EXCLUSIONS,
fields: { posts: ['id', 'title', 'url', 'tags'], tags: ['id', 'category', 'names'] },
limits: { posts: RESOURCE_LIMIT, tags: RESOURCE_LIMIT, names: NAME_LIMIT,
bytes: MAX_BYTES },
external_assets: 'not_included', checksum_scope: 'all_files_except_manifest.json',
files: @files.map { |path, data| { path:, sha256: Digest::SHA256.hexdigest(data) } } }
add_file('manifest.json', JSON.pretty_generate(manifest))
entries = @files.map do |path, data|
MaterialZipExporter::Entry.new(path: "archive/#{ path }", data:, mtime: generated_at)
end
bytes = MaterialZipExporter::ZipWriter.write(entries)
raise TooLarge if bytes.bytesize > MAX_BYTES
bytes
end
end
private
def capture
CountsExporter.with_read_snapshot do
@data_at = Time.current.utc.iso8601(6)
@authority = HistoryAccess.authority
# Requiring a matching immutable revision closes the legacy unversioned gap.
@posts = confirmed(Post, PostVersion, :post_versions).order(:id)
.limit(RESOURCE_LIMIT).select(:id, :title, :url).to_a
@tags = confirmed(Tag, TagVersion, :tag_versions).where(deprecated_at: nil)
.order(:id).limit(RESOURCE_LIMIT).select(:id, :category).to_a
@names = TagName.where(tag_id: @tags.map(&:id)).order(:tag_id, :language_code, :id)
.limit(NAME_LIMIT + 1).pluck(:tag_id, :language_code, :script_code, :name, :primary_flg)
raise TooLarge if @names.length > NAME_LIMIT
@names = @names.group_by(&:first)
@relations = PostTag.where(post_id: @posts.map(&:id), tag_id: @tags.map(&:id))
.order(:post_id, :tag_id).pluck(:post_id, :tag_id)
@counts = { posts: @posts.length, tags: @tags.length }
end
end
def confirmed(model, version_model, association)
HistoryAccess.current(model.all, version_model).joins(association)
.where("#{ version_model.table_name }.version_no = #{ model.table_name }.version_no")
end
def generate_pages
assets = Rails.root.join('app/views/static_mirror')
['archive.css', 'archive.js'].each do |name|
add_file("assets/#{ name }", assets.join(name).read)
end
add_file('robots.txt', "User-agent: *\nDisallow: /\n")
add_file('archive-config.js', 'window.archiveConfig = { origin: null };')
page('index.html', 'Static Mirror 生成機能', '', search_form + limitations)
page("#{ @locale.code }/posts/index.html", 'Post', '/posts', post_list(@posts))
page("#{ @locale.code }/tags/index.html", 'Tag', '/tags', tag_list(@tags))
processed = 0
@posts.each do |post|
tags = @tags.select { |tag| @relations.include?([post.id, tag.id]) }
content = "<p>#{ external_link(post.url) }</p>#{ tag_list(tags) }"
page(resource_path('posts', post.id), post.title.presence || post.id.to_s,
"/posts/#{ post.id }", content)
processed += 1
yield(processed, @posts.length + @tags.length) if block_given?
end
@tags.each do |tag|
posts = @posts.select { |post| @relations.include?([post.id, tag.id]) }
names = @names.fetch(tag.id, []).map do |_, language, script, name, _primary|
"<li><span lang=\"#{ h(language) }\">#{ h(name) }</span> (#{ h(script) })</li>"
end.join
content = "<p>#{ h(tag.category) }</p><ul>#{ names }</ul>#{ post_list(posts) }"
page(resource_path('tags', tag.id), tag_name(tag), "/tags/#{ tag.id }", content)
processed += 1
yield(processed, @posts.length + @tags.length) if block_given?
end
index = @posts.map { |post|
{ path: resource_path('posts', post.id), title: post.title.presence || post.id.to_s }
} + @tags.map { |tag|
{ path: resource_path('tags', tag.id), title: tag_name(tag),
names: @names.fetch(tag.id, []).map { _1[3] } }
}
add_file('search-index.json', JSON.generate(index))
end
def page(path, title, original_path, content)
@path = path
@title = title
@original_path = "/#{ @locale.code }#{ original_path }"
@content = content
template = Rails.root.join('app/views/static_mirror/page.html.erb').read
add_file(path, ERB.new(template).result(binding))
end
def add_file(path, data)
@bytes += data.bytesize
raise TooLarge if @bytes > MAX_BYTES
@files[path] = data
end
def resource_path(resource, id) = "#{ @locale.code }/#{ resource }/#{ id }/index.html"
def relative(path)
Pathname.new(path).relative_path_from(Pathname.new(@path).dirname).to_s
end
def h(value) = CGI.escapeHTML(value.to_s)
def tag_name(tag)
@names.fetch(tag.id, []).find { _1[1] == @locale.language_code && _1[4] }&.fetch(3) ||
tag.id.to_s
end
# Links are resolved after the page path is known; only generated numeric IDs enter paths.
def post_list(posts)
'<h2>Post</h2><ul>' + posts.map { |post|
title = post.title.presence || post.id.to_s
"<li><a data-path=\"#{ resource_path('posts', post.id) }\">#{ h(title) }</a></li>"
}.join + '</ul>'
end
def tag_list(tags)
'<h2>Tag</h2><ul>' + tags.map { |tag|
"<li><a data-path=\"#{ resource_path('tags', tag.id) }\">#{ h(tag_name(tag)) }</a></li>"
}.join + '</ul>'
end
def linked_content
@content.gsub(/data-path="([^"]+)"/) { "href=\"#{ h(relative(Regexp.last_match(1))) }\"" }
end
def validated_url(value)
uri = URI.parse(value.to_s)
unless uri.is_a?(URI::HTTP) && uri.host.present? && uri.userinfo.nil?
raise UnsafeUrl
end
uri.to_s
rescue URI::InvalidURIError
raise UnsafeUrl
end
def external_link(value)
url = validated_url(value)
"<a href=\"#{ h(url) }\" target=\"_blank\" rel=\"noopener noreferrer\">#{ h(url) }</a>"
rescue UnsafeUrl
''
end
def search_form
'<form id="archive-search"><label>検索 <input name="q" type="search"></label>' +
'<button type="submit">検索</button></form><ul id="search-results"></ul>'
end
def limitations
<<~HTML
<h2>未対応機能</h2>
<p>Tag Description, Help, Material, 外部タグ, 親子関係, 区間, 履歴, ログイン, 作成, 編輯</p>
<h2>出力件数の制限</h2><p>Post: #{ RESOURCE_LIMIT }, Tag: #{ RESOURCE_LIMIT }</p>
<p>TagName: #{ NAME_LIMIT }, #{ MAX_BYTES } B</p>
<h2>外部画像や動画への依存</h2><p>ローカルへ取り込めていない資産: 外部画像や動画</p>
<h2>データ保護上の制約</h2>
<p>公開抑止、除票、非公開情報、認証情報、監査専用情報を ZIP に含めない。</p>
<p>今回は現在状態のみの対応</p>
HTML
end
end
-7
ファイルの表示
@@ -1,7 +0,0 @@
:root { color-scheme: light dark; }
body { max-width: 65rem; margin: auto; padding: 1rem; font: 1rem/1.6 sans-serif; }
header { border-bottom: 1px solid; padding-bottom: 1rem; }
nav { display: flex; flex-wrap: wrap; gap: 1rem; }
a, p, li { overflow-wrap: anywhere; }
li { margin-block: .4rem; }
input, button { font: inherit; }
-61
ファイルの表示
@@ -1,61 +0,0 @@
(() => {
const root = new URL ('../', document.currentScript.src)
const origin = window.archiveConfig?.origin
if (typeof origin === 'string')
{
try
{
const url = new URL (origin)
if (['http:', 'https:'].includes (url.protocol) && !url.username && !url.password)
{
url.search = ''
url.hash = ''
document.querySelectorAll ('[data-original]').forEach (link => {
link.href = url.href.replace (/\/+$/, '') + link.dataset.original
})
}
}
catch
{
// Each HTML retains its original link when configuration is absent or invalid.
}
}
const form = document.getElementById ('archive-search')
const results = document.getElementById ('search-results')
if (!form || !results) return
form.addEventListener ('submit', async event => {
event.preventDefault ()
results.replaceChildren ()
const query = (new FormData (form).get ('q') ?? '').toString ().toLocaleLowerCase ()
if (!query.trim ()) return
try
{
const response = await fetch (new URL ('search-index.json', root))
if (!response.ok) throw new Error ('Search index unavailable')
const entries = await response.json ()
for (const entry of entries)
{
const text = [entry.title, ...(entry.names ?? [])].join (' ').toLocaleLowerCase ()
if (!text.includes (query)) continue
const url = new URL (entry.path, root)
if (url.origin !== root.origin || !url.pathname.startsWith (root.pathname)) continue
const item = document.createElement ('li')
const link = document.createElement ('a')
link.setAttribute ('href', entry.path)
link.textContent = entry.title
item.append (link)
results.append (item)
}
}
catch
{
// Lists remain available if the index cannot be loaded.
for (const link of document.querySelectorAll ('nav a:not([data-original])'))
{
const item = document.createElement ('li')
item.append (link.cloneNode (true))
results.append (item)
}
}
})
})()
-28
ファイルの表示
@@ -1,28 +0,0 @@
<!doctype html>
<html lang="ja">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="robots" content="noindex, nofollow">
<meta name="referrer" content="no-referrer">
<meta http-equiv="Content-Security-Policy"
content="default-src 'none'; script-src 'self'; style-src 'self'; connect-src 'self'; form-action 'none'; base-uri 'none'">
<title><%= h(@title) %></title>
<link rel="stylesheet" href="<%= h(relative('assets/archive.css')) %>">
<script defer src="<%= h(relative('archive-config.js')) %>"></script>
<script defer src="<%= h(relative('assets/archive.js')) %>"></script>
</head>
<body>
<header>
<p>静的保存版 — データ基準時点: <time><%= h(data_at) %></time></p>
<nav>
<a href="<%= h(relative('index.html')) %>">Static Mirror 生成機能</a>
<a href="<%= h(relative("#{ @locale.code }/posts/index.html")) %>">Post</a>
<a href="<%= h(relative("#{ @locale.code }/tags/index.html")) %>">Tag</a>
<a href="<%= h(@origin + @original_path) %>" data-original="<%= h(@original_path) %>"
target="_blank" rel="noopener noreferrer">本家へのリンク</a>
</nav>
</header>
<main><h1><%= h(@title) %></h1><%= linked_content %></main>
</body>
</html>
-5
ファイルの表示
@@ -1,9 +1,4 @@
Rails.application.routes.draw do Rails.application.routes.draw do
get 'static_mirror', to: 'static_mirrors#show'
post 'static_mirror/jobs', to: 'static_mirrors#create'
get 'static_mirror/jobs/:id', to: 'static_mirrors#status'
get 'static_mirror/files/:id', to: 'static_mirrors#download'
get 'counts/definitions/:resource', to: 'counts_tables#definition' get 'counts/definitions/:resource', to: 'counts_tables#definition'
get 'counts/definitions/:resource/candidates', to: 'counts_tables#candidates' get 'counts/definitions/:resource/candidates', to: 'counts_tables#candidates'
get 'counts/query', to: 'counts_tables#index' get 'counts/query', to: 'counts_tables#index'
-5
ファイルの表示
@@ -1,5 +0,0 @@
class AddLinkedTagIdsToNicoTagVersions < ActiveRecord::Migration[8.0]
def change
add_column :nico_tag_versions, :linked_tag_ids, :text
end
end
-42
ファイルの表示
@@ -1,42 +0,0 @@
class MigrateLinkedTagsInNicoTagVersions < ActiveRecord::Migration[8.0]
class MigrationTagVersion < ActiveRecord::Base
self.table_name = 'tag_versions'
end
class MigrationNicoTagVersion < ActiveRecord::Base
self.table_name = 'nico_tag_versions'
end
def up
# 除票外部タグの恢復はないので除票履歴があれば全消しでよいはず.
execute <<~SQL
DELETE
t1
FROM
nico_tag_versions t1
INNER JOIN
nico_tag_versions t2
ON
t1.tag_id = t2.tag_id
AND t2.event_type = 'discard'
SQL
MigrationNicoTagVersion.find_each do |ntv|
linked_tag_ids = ntv.linked_tags.split.map { |name|
# 厳密には一意ぢゃないけどめんだぅだからこれでいいや.
MigrationTagVersion
.order(created_at: :desc, id: :desc)
.find_by("names ->> '$.ja.name' = ?", name)
&.tag_id
}.compact.uniq.sort.join(' ')
ntv.update_columns(linked_tag_ids:)
end
change_column_null :nico_tag_versions, :linked_tag_ids, false
end
def down
raise ActiveRecord::IrreversibleMigration, '戻せません.'
end
end
-6
ファイルの表示
@@ -1,6 +0,0 @@
class RemoveLinkedTagsFromNicoTagVersions < ActiveRecord::Migration[8.0]
def change
remove_column :nico_tag_versions, :linked_tags
remove_column :nico_tag_versions, :name
end
end
生成ファイル
+3 -2
ファイルの表示
@@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "name", null: false t.string "name", null: false
t.string "record_type", null: false t.string "record_type", null: false
@@ -301,9 +301,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.bigint "tag_id", null: false t.bigint "tag_id", null: false
t.integer "version_no", null: false t.integer "version_no", null: false
t.string "event_type", null: false t.string "event_type", null: false
t.string "name", null: false
t.text "linked_tags", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.text "linked_tag_ids", null: false
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at" t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc } t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc } t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
+8 -43
ファイルの表示
@@ -11,63 +11,28 @@ RSpec.describe ExternalTag, type: :model do
expect(external.reload.name).to eq('raw tag[]') expect(external.reload.name).to eq('raw tag[]')
end end
it 'does not allow a persisted external tag to change its platform or name' do it 'deletes post associations without deleting posts or version history' do
external = create(:external_tag, name: 'immutable')
expect { external.update!(name: 'renamed') }
.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:name]).to include('は変更できません.')
external.reload
external.platform = nil
expect { external.save! }.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:platform]).to include('は変更できません.')
expect(external.reload).to have_attributes(platform: 'nico', name: 'immutable')
end
it 'rejects delete, which bypasses destroy callbacks' do
external = create(:external_tag)
expect { external.delete }.to raise_error(ActiveRecord::ReadOnlyRecord)
expect(external.reload).to be_persisted
end
it 'increments the counter through post associations without changing identity' do
external = create(:external_tag, name: 'counter')
post = create(:post)
expect {
PostExternalTag.create!(post:, external_tag: external)
}.to change { external.reload.post_count }.by(1)
expect(external.reload).to have_attributes(platform: 'nico', name: 'counter')
end
it 'does not destroy external tags or their post associations and history' do
external = create(:external_tag) external = create(:external_tag)
post = create(:post) post = create(:post)
PostExternalTag.create!(post:, external_tag: external) PostExternalTag.create!(post:, external_tag: external)
version = NicoTagVersionRecorder.record!( version = NicoTagVersionRecorder.record!(
external_tag: external, event_type: :create, created_by_user: nil) external_tag: external, event_type: :create, created_by_user: nil)
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed) external.destroy!
expect(external.reload).to be_persisted expect(PostExternalTag.where(external_tag_id: external.id)).to be_empty
expect(PostExternalTag.exists?(post:, external_tag: external)).to be(true) expect(post.reload.external_tags).to be_empty
expect(post.reload.external_tags).to contain_exactly(external)
expect(version.reload.tag_id).to eq(external.id) expect(version.reload.tag_id).to eq(external.id)
end end
it 'does not destroy an external tag or its links to internal tags' do it 'deletes external links without deleting linked internal tags' do
external = create(:external_tag) external = create(:external_tag)
tag = create(:tag) tag = create(:tag)
relation = NicoTagRelation.create!(nico_tag: external, tag:) NicoTagRelation.create!(nico_tag: external, tag:)
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed) external.destroy!
expect(external.reload).to be_persisted expect(NicoTagRelation.where(nico_tag_id: external.id)).to be_empty
expect(relation.reload).to be_persisted
expect(Tag.exists?(tag.id)).to be(true) expect(Tag.exists?(tag.id)).to be(true)
end end
end end
+3 -3
ファイルの表示
@@ -76,7 +76,7 @@ RSpec.describe 'Counts artifact policy and external references' do
end end
end end
it 'does not expose a private linked tag ID through an external history snapshot' do it 'does not expose a private linked tag name through an external history snapshot' do
tag = create(:tag, primary_name: 'private-linked-name') tag = create(:tag, primary_name: 'private-linked-name')
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name', TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024), category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
@@ -84,7 +84,7 @@ RSpec.describe 'Counts artifact policy and external references' do
auto_generated: false, aliases: [] } }) auto_generated: false, aliases: [] } })
external = create(:external_tag, name: 'public-external') external = create(:external_tag, name: 'public-external')
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create', row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
linked_tag_ids: tag.id.to_s, name: 'nico:public-external', linked_tags: 'private-linked-name',
created_at: Time.utc(2024)) created_at: Time.utc(2024))
post = create(:post) post = create(:post)
snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create', snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
@@ -99,7 +99,7 @@ RSpec.describe 'Counts artifact policy and external references' do
expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist
end end
public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update', public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update',
linked_tag_ids: '', name: 'nico:public-external', linked_tags: 'private-linked-name-extra',
created_at: Time.utc(2024, 7)) created_at: Time.utc(2024, 7))
HistoryAccess.set(user: nil) do HistoryAccess.set(user: nil) do
expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist
+4 -3
ファイルの表示
@@ -10,22 +10,23 @@ RSpec.describe 'Shared Tag and ExternalTag IDs', type: :model do
expect(next_tag.id).to be > external.id expect(next_tag.id).to be > external.id
end end
it 'does not reuse IDs after internal deletion while external tags remain' do it 'does not reuse physically deleted IDs in either table' do
tag = create(:tag) tag = create(:tag)
external = create(:external_tag) external = create(:external_tag)
TagName.where(tag_id: tag.id).delete_all TagName.where(tag_id: tag.id).delete_all
tag.destroy! tag.destroy!
expect(ExternalTag.exists?(external.id)).to be(true) external.destroy!
expect(create(:tag).id).to be > external.id expect(create(:tag).id).to be > external.id
expect(create(:external_tag).id).to be > external.id expect(create(:external_tag).id).to be > external.id
end end
it 'retains overlapping IDs after a tag update and a new allocation' do it 'retains existing overlapping IDs without renumbering on update or insert' do
tag = create(:tag) tag = create(:tag)
external = create(:external_tag) external = create(:external_tag)
external.update_columns(id: tag.id) external.update_columns(id: tag.id)
tag.update!(category: :meta) tag.update!(category: :meta)
external.update!(name: 'updated_external')
before_tag = tag.reload.attributes before_tag = tag.reload.attributes
before_external = external.reload.attributes before_external = external.reload.attributes
+5 -15
ファイルの表示
@@ -47,34 +47,24 @@ RSpec.describe VersionRecord, type: :model do
external_tag: nico_tag, external_tag: nico_tag,
version_no: 1, version_no: 1,
event_type: 'create', event_type: 'create',
linked_tag_ids: '', name: "nico:#{ nico_tag.name }",
linked_tags: '',
created_at: Time.current, created_at: Time.current,
created_by_user: nil created_by_user: nil
) )
expect { expect {
version.update!(linked_tag_ids: '123') version.update!(name: 'nico:changed')
}.to raise_error(ActiveRecord::ReadOnlyRecord) }.to raise_error(ActiveRecord::ReadOnlyRecord)
end end
it 'rejects discard and restore versions for external tags' do
[:discard, :restore].each do |event_type|
version = NicoTagVersion.new(
external_tag: nico_tag, version_no: 1, event_type:,
linked_tag_ids: '', created_at: Time.current)
expect(version).not_to be_valid
expect(version.errors[:event_type]).not_to be_empty
end
end
it 'prevents NicoTagVersion destroy' do it 'prevents NicoTagVersion destroy' do
version = NicoTagVersion.create!( version = NicoTagVersion.create!(
external_tag: nico_tag, external_tag: nico_tag,
version_no: 1, version_no: 1,
event_type: 'create', event_type: 'create',
linked_tag_ids: '', name: "nico:#{ nico_tag.name }",
linked_tags: '',
created_at: Time.current, created_at: Time.current,
created_by_user: nil created_by_user: nil
) )
+6 -114
ファイルの表示
@@ -19,7 +19,7 @@ RSpec.describe 'Counts table API', type: :request do
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023)) created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 1, NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023)) event_type: 'create', name: 'beta', linked_tags: '', created_at: Time.utc(2023))
snapshots = [ snapshots = [
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] }, { tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }] { external_tag_id: external.id }]
@@ -50,115 +50,6 @@ RSpec.describe 'Counts table API', type: :request do
def versions(result) = result.fetch('versions').map { _1.fetch('version_no') } def versions(result) = result.fetch('versions').map { _1.fetch('version_no') }
context 'nico link ID snapshots through the V1 field name' do
let(:base) do
super().merge(resource: 'nico_tags')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024, 1, 1))
NicoTagVersion.create!(external_tag: external, version_no: 3,
event_type: 'update', linked_tag_ids: '',
created_at: Time.utc(2024, 2, 1))
end
it 'returns ID values under linked_tags without exposing the physical column key' do
result = query
expect(versions(result)).to eq([1, 2, 3])
expect(result['versions'].map { _1.fetch('linked_tags') }).to eq(['', tag.id.to_s, ''])
result['versions'].each do |row|
expect(row).not_to have_key('linked_tag_ids')
expect(row.fetch('name')).to eq('nico:beta')
end
end
it 'preloads external names separately for aliased link-change details' do
statements = []
listener = lambda do |_name, _start, _finish, _id, payload|
statements << payload[:sql]
end
ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do
result = query(axis('changed_field', 'linked_tags'))
expect(versions(result)).to eq([2, 3])
expect(result.fetch('versions').map { _1.fetch('name') })
.to eq(['nico:beta', 'nico:beta'])
end
details = statements.find { _1.include?('AS counts_latest') }
expect(details).not_to be_nil
expect(details).not_to include('JOIN `external_tags`')
names = statements.select { _1.match?(/SELECT .* FROM `external_tags`/) }
expect(names.length).to eq(1)
end
it 'advertises the legacy field, label and default columns only' do
get '/counts/definitions/nico_tags', params: { locale: 'ja' }
expect(response).to have_http_status(:ok)
body = response.parsed_body
['fields', 'filter_fields', 'output_fields'].each do |collection|
keys = body.fetch(collection).map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
field = body.fetch('output_fields').find { _1['key'] == 'linked_tags' }
expect(field.fetch('label')).to eq('counts:attributes.linked_tags')
body.fetch('axes').each_value do |keys|
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
body.fetch('defaults').select { _1['mode'] == 'details' }.each do |entry|
settings = entry.fetch('params').to_h { [_1.fetch('key'), _1.fetch('value')] }
expect(settings.fetch('columns').split).to include('name', 'linked_tags')
expect(settings.fetch('columns').split).not_to include('linked_tag_ids')
end
end
it 'filters IDs and legacy drills and compares link changes through linked_tags' do
predicate = { conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(axis('linked_tags', tag.id.to_s, root: 'drill')))).to eq([2])
expect(versions(query(axis('changed_field', 'linked_tags')))).to eq([2, 3])
expect(versions(query(predicate.merge('conditions.0.value' => 'alpha')))).to be_empty
end
it 'sorts ID snapshots through the public field in both directions' do
expect(versions(query(sort: 'linked_tags:asc version_no:asc'))).to eq([1, 3, 2])
expect(versions(query(sort: 'linked_tags:desc version_no:asc'))).to eq([2, 1, 3])
end
it 'restores historical link IDs before applying a latest snapshot filter' do
predicate = { definition: 'latest', at: '2024-01-15T00:00:00Z',
conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(predicate.except(:at)))).to be_empty
end
it 'groups by linked_tags ID values and accepts the resulting drill condition' do
sign_in_as(create(:user, :admin))
result = query(mode: 'summary', rows: 'linked_tags', cols: '', sort: '')
expect(result.fetch('cells')).to match_array([
{ 'values' => [''], 'count' => 2 },
{ 'values' => [tag.id.to_s], 'count' => 1 }])
expect(versions(query(axis('linked_tags', tag.id.to_s)))).to eq([2])
end
it 'rejects the physical column as a public filter, axis, sort or change field' do
sign_in_as(create(:user, :admin))
[
axis('linked_tag_ids', tag.id.to_s),
axis('changed_field', 'linked_tag_ids'),
{ mode: 'summary', rows: 'linked_tag_ids', cols: '', sort: '' },
{ sort: 'linked_tag_ids:asc' }].each do |invalid|
get '/counts/query', params: base.merge(invalid)
expect(response).to have_http_status(:bad_request), invalid.inspect
end
end
end
it 'identifies a totals timeout without exposing SQL in the error response' do it 'identifies a totals timeout without exposing SQL in the error response' do
allow_any_instance_of(CountsPivotTotals).to receive(:call) allow_any_instance_of(CountsPivotTotals).to receive(:call)
.and_raise(CountsPivotTotals::TimedOut, 'private SQL') .and_raise(CountsPivotTotals::TimedOut, 'private SQL')
@@ -332,10 +223,11 @@ RSpec.describe 'Counts table API', type: :request do
expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4]) expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4])
end end
it 'resolves immutable external names across historical snapshots' do it 'resolves external names from current registrations too' do
expect(versions(query(tags: 'nico:beta'))).to eq([1]) external.update!(name: 'renamed-beta')
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([]) expect(versions(query(tags: 'nico:renamed-beta'))).to eq([1])
expect(versions(query(tags: 'not:nico:beta'))).to eq([2, 3, 4]) expect(versions(query(tags: 'nico:beta'))).to eq([])
expect(versions(query(tags: 'not:nico:renamed-beta'))).to eq([2, 3, 4])
end end
end end
+14 -8
ファイルの表示
@@ -38,9 +38,12 @@ RSpec.describe 'NicoTags', type: :request do
end end
it 'filters by nico tag name, linked tag name, and link status' do it 'filters by nico tag name, linked tag name, and link status' do
linked = create(:external_tag, name: 'search_linked') linked = create(:external_tag)
unlinked = create(:external_tag, name: 'search_unlinked') linked.update!(name: 'search_linked')
other = create(:external_tag, name: 'other') unlinked = create(:external_tag)
unlinked.update!(name: 'search_unlinked')
other = create(:external_tag)
other.update!(name: 'other')
destination = create(:tag, category: :general) destination = create(:tag, category: :general)
primary_tag_name_for(destination, 'ja').update!(name: 'destination_search') primary_tag_name_for(destination, 'ja').update!(name: 'destination_search')
NicoTagRelation.create!(nico_tag: linked, tag: destination) NicoTagRelation.create!(nico_tag: linked, tag: destination)
@@ -77,9 +80,11 @@ RSpec.describe 'NicoTags', type: :request do
end end
it 'sorts by name and timestamps' do it 'sorts by name and timestamps' do
older = create(:external_tag, name: 'ordered_a') older = create(:external_tag)
older.update!(name: 'ordered_a')
older.update_columns(created_at: 2.days.ago) older.update_columns(created_at: 2.days.ago)
newer = create(:external_tag, name: 'ordered_b') newer = create(:external_tag)
newer.update!(name: 'ordered_b')
newer.update_columns(created_at: 1.day.ago) newer.update_columns(created_at: 1.day.ago)
older_post_tag = older_post_tag =
PostExternalTag.create!(post: create(:post), external_tag: older) PostExternalTag.create!(post: create(:post), external_tag: older)
@@ -184,8 +189,9 @@ RSpec.describe 'NicoTags', type: :request do
versions = nico_tag.reload.nico_tag_versions.order(:version_no) versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update']) expect(versions.map(&:event_type)).to eq(['create', 'update'])
expect(versions.last.linked_tag_ids.split.map(&:to_i)) expect(versions.last.linked_tags.split).to match_array([
.to match_array([linked_a.id, linked_b.id]) 'nico_linked_a',
'nico_linked_b'])
expect(versions.last.created_by_user_id).to eq(admin.id) expect(versions.last.created_by_user_id).to eq(admin.id)
end end
@@ -204,7 +210,7 @@ RSpec.describe 'NicoTags', type: :request do
expect(json).to eq([]) expect(json).to eq([])
expect(nico_tag.reload.linked_tags).to be_empty expect(nico_tag.reload.linked_tags).to be_empty
expect(nico_tag.nico_tag_versions.order(:version_no).last) expect(nico_tag.nico_tag_versions.order(:version_no).last)
.to have_attributes(linked_tag_ids: '', created_by_user: member) .to have_attributes(linked_tags: '', created_by_user: member)
end end
it 'returns the tags field error when a nico tag is specified directly' do it 'returns the tags field error when a nico tag is specified directly' do
+1 -1
ファイルの表示
@@ -20,7 +20,7 @@ RSpec.describe 'Post history privacy', type: :request do
created_at: origin + index.hours) created_at: origin + index.hours)
end end
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create', NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
linked_tag_ids: tag.id.to_s, name: 'nico:external-history-tag', linked_tags: 'private-history-tag',
created_at: origin) created_at: origin)
['create', 'discard', 'restore', 'update'].each_with_index do |event, index| ['create', 'discard', 'restore', 'update'].each_with_index do |event, index|
snapshots = snapshots =
-169
ファイルの表示
@@ -1,169 +0,0 @@
require 'rails_helper'
require 'tmpdir'
RSpec.describe 'Static Mirror API', type: :request do
include ActiveSupport::Testing::TimeHelpers
around do |example|
Dir.mktmpdir('static-mirror-spec') do |path|
allow(StaticMirrorJob).to receive(:directory).and_return(Pathname.new(path))
example.run
end
end
before do
allow(Rails.env).to receive(:development?).and_return(true)
allow(StaticMirrorJob).to receive(:perform_later)
end
def create_job
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:accepted)
json.fetch('job')
end
it 'accepts anonymous jobs asynchronously and serves the completed ZIP' do
record = create(:post, title: 'mirror-public-api-title')
PostVersion.create!(post: record, version_no: 1, event_type: 'create',
title: record.title, url: record.url, tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.current)
get '/static_mirror'
expect(json).to include('resource_limit' => 100, 'concurrency' => 1)
id = create_job
expect(StaticMirrorJob).to have_received(:perform_later).with(id)
expect(StaticMirrorJob.directory.join('archive.zip')).not_to exist
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'queued', 'data_at' => nil)
StaticMirrorJob.perform_now(id)
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'ready', 'processed' => 1, 'total' => 1)
expect(json.fetch('data_at')).to be_present
expect(json.keys).not_to include('owner', 'origin', 'actor_id', 'policy_revision')
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:ok)
expect(response.media_type).to eq('application/zip')
expect(response.body.byteslice(0, 4)).to eq("PK\x03\x04".b)
expect(response.body).to include(record.title)
expect(response.headers['Cache-Control']).to include('no-store')
end
it 'rejects historical and unknown input instead of pretending to restore it' do
['at', 'data_at', 'admin', 'limit'].each do |key|
post '/static_mirror/jobs', params: { locale: 'ja', key => '2020-01-01' }, as: :json
expect(response).to have_http_status(:bad_request)
end
expect(StaticMirrorJob).not_to have_received(:perform_later)
end
it 'limits requests globally even across fresh anonymous sessions' do
create_job
other = ActionDispatch::Integration::Session.new(Rails.application)
other.post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(other.response).to have_http_status(:too_many_requests)
expect(other.response.headers['Retry-After']).to eq('60')
expect(StaticMirrorJob).to have_received(:perform_later).once
end
it 'binds job status and downloads to the creating session' do
id = create_job
StaticMirrorJob.perform_now(id)
other = ActionDispatch::Integration::Session.new(Rails.application)
["/static_mirror/jobs/#{ id }", "/static_mirror/files/#{ id }"].each do |path|
other.get path
expect(other.response).to have_http_status(:not_found)
end
end
it 'refuses ready artifacts after a new discard even for admins' do
id = create_job
StaticMirrorJob.perform_now(id)
record = create(:post)
PostVersion.create!(post: record, version_no: 1, event_type: 'discard',
url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.current)
sign_in_as(create(:user, :admin))
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
get "/static_mirror/jobs/#{ id }"
expect(response).to have_http_status(:not_found)
end
it 'fails lost jobs and rejects expired downloads' do
id = create_job
travel 80.seconds do
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'failed', 'error' => 'worker_stopped')
end
travel 11.minutes do
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
end
end
it 'rejects a previously ready ZIP after its expiry' do
id = create_job
StaticMirrorJob.perform_now(id)
travel 11.minutes do
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
get "/static_mirror/jobs/#{ id }"
expect(response).to have_http_status(:not_found)
end
end
it 'keeps simultaneous generation bounded after the cooldown' do
create_job
lock = File.open(StaticMirrorJob.directory.join('.generation.lock'), File::RDWR)
lock.flock(File::LOCK_EX)
travel 61.seconds do
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:too_many_requests)
end
ensure
lock&.close
end
it 'reports bounded-generation failures without returning internal exception messages' do
id = create_job
allow(StaticMirror).to receive(:new).and_raise(StaticMirror::TooLarge, 'private details')
StaticMirrorJob.perform_now(id)
get "/static_mirror/jobs/#{ id }"
expect(json).to include('status' => 'failed', 'error' => 'too_large')
expect(response.body).not_to include('private details')
get "/static_mirror/files/#{ id }"
expect(response).to have_http_status(:not_found)
end
it 'is unavailable outside development' do
allow(Rails.env).to receive(:development?).and_return(false)
get '/static_mirror'
expect(response).to have_http_status(:not_found)
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:not_found)
get '/static_mirror/jobs/unknown'
expect(response).to have_http_status(:not_found)
get '/static_mirror/files/unknown'
expect(response).to have_http_status(:not_found)
end
it 'preserves user and IP BAN checks' do
user = create(:user, banned_at: Time.current)
sign_in_as(user)
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:forbidden)
sign_out
IpAddress.create!(ip_address: IPAddr.new('127.0.0.1').hton, banned_at: Time.current)
get '/static_mirror', headers: { 'REMOTE_ADDR' => '127.0.0.1' }
expect(response).to have_http_status(:forbidden)
expect(StaticMirrorJob).not_to have_received(:perform_later)
end
it 'requires the normal CSRF token for anonymous generation', csrf: true do
get '/users/csrf'
token = json.fetch('token')
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json
expect(response).to have_http_status(:forbidden)
post '/static_mirror/jobs', params: { locale: 'ja' }, as: :json,
headers: { 'X-CSRF-Token' => token }
expect(response).to have_http_status(:accepted)
end
end
-49
ファイルの表示
@@ -22,55 +22,6 @@ RSpec.describe 'Counts export contracts' do
.and_return(@counts_export_dir) .and_return(@counts_export_dir)
end end
context 'nico link IDs with the V1 export field name' do
let(:tag) { create(:tag, primary_name: 'linked export tag') }
let(:external) { create(:external_tag, name: 'external export tag') }
let(:payload) do
super().merge('resource' => 'nico_tags', 'columns' => 'linked_tags',
'headers' => '["linked_tags"]')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024))
end
it 'exports recorded IDs with the legacy JSON key and metadata' do
result = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
expect(result.fetch('data')).to eq([
{ 'linked_tags' => '' }, { 'linked_tags' => tag.id.to_s }])
expect(result.fetch('metadata').fetch('columns')).to eq(['linked_tags'])
keys = result.fetch('metadata').fetch('fields').map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
it 'exports the selected legacy CSV header and ID values' do
body = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
expect(CSV.parse(body.delete_prefix("\uFEFF")))
.to eq([['linked_tags'], [''], [tag.id.to_s]])
end
it 'keeps the legacy link column in default JSON exports' do
options = payload.except('columns', 'headers')
result = JSON.parse(CountsTableExport.new(options).body.to_a.join)
expect(result.fetch('metadata').fetch('columns')).to include('linked_tags')
result.fetch('data').each do |row|
expect(row).to have_key('linked_tags')
expect(row).not_to have_key('linked_tag_ids')
end
end
it 'rejects the physical column as a selected CSV or JSON field' do
['csv', 'json'].each do |format|
options = payload.merge('format' => format, 'columns' => 'linked_tag_ids')
expect { CountsTableExport.new(options) }.to raise_error(ArgumentError)
end
end
end
context 'serialization after the authorised query' do context 'serialization after the authorised query' do
let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] } let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] }
let(:page) do let(:page) do
+8 -18
ファイルの表示
@@ -8,23 +8,21 @@ RSpec.describe NicoTagVersionRecorder do
described_class.record!(external_tag:, event_type:, created_by_user: member) described_class.record!(external_tag:, event_type:, created_by_user: member)
end end
it 'records the external association and derives the platform-qualified name' do it 'records the external association and platform-qualified name' do
version = record(:create) version = record(:create)
expect(version).to have_attributes( expect(version).to have_attributes(
external_tag:, version_no: 1, event_type: 'create', external_tag:, version_no: 1, event_type: 'create',
name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member) name: 'nico:raw tag[]', linked_tags: '', created_by_user: member)
expect(external_tag.reload.nico_tag_versions).to contain_exactly(version) expect(external_tag.reload.nico_tag_versions).to contain_exactly(version)
end end
it 'uses the latest history number when the record has no version_no column' do it 'uses the latest history number when the record has no version_no column' do
first = record(:create) first = record(:create)
tag = create(:tag) external_tag.update!(name: 'changed')
NicoTagRelation.create!(nico_tag: external_tag, tag:)
second = record(:update) second = record(:update)
expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]', expect(second).to have_attributes(version_no: 2, name: 'nico:changed')
linked_tag_ids: tag.id.to_s)
expect(first.reload.name).to eq('nico:raw tag[]') expect(first.reload.name).to eq('nico:raw tag[]')
expect(external_tag.reload.has_attribute?(:version_no)).to be(false) expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
end end
@@ -42,7 +40,7 @@ RSpec.describe NicoTagVersionRecorder do
expect(version).to have_attributes( expect(version).to have_attributes(
external_tag: external, name: 'registered_external:foo', version_no: 1, external_tag: external, name: 'registered_external:foo', version_no: 1,
event_type: 'create', linked_tag_ids: '', created_by_user: member) event_type: 'create', linked_tags: '', created_by_user: member)
end end
it 'returns the latest version without appending an unchanged snapshot' do it 'returns the latest version without appending an unchanged snapshot' do
@@ -66,21 +64,13 @@ RSpec.describe NicoTagVersionRecorder do
expect(external_tag.nico_tag_versions).to contain_exactly(first) expect(external_tag.nico_tag_versions).to contain_exactly(first)
end end
it 'records sorted linked internal names and later link removal' do
it 'rejects discard and restore events for external tags' do
[:discard, :restore].each do |event_type|
expect { record(event_type) }
.to raise_error(ArgumentError, "Invalid event_type: #{ event_type }")
end
end
it 'records sorted linked internal IDs and later link removal' do
tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) } tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) }
tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) } tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) }
expect(record(:create).linked_tag_ids).to eq(tags.map(&:id).sort.join(' ')) expect(record(:create).linked_tags).to eq('a_link z_link')
external_tag.linked_tags = [tags.first] external_tag.linked_tags = [tags.first]
expect(record(:update)).to have_attributes(version_no: 2, linked_tag_ids: tags.first.id.to_s) expect(record(:update)).to have_attributes(version_no: 2, linked_tags: 'z_link')
end end
end end
-158
ファイルの表示
@@ -1,158 +0,0 @@
require 'rails_helper'
RSpec.describe StaticMirror do
include_context 'Ainu locale'
let(:tag) { create(:tag, primary_name: 'mirror-public-tag') }
let(:post) { create(:post, title: '<img src=x onerror=alert(1)>') }
let(:mirror) { described_class.new(locale: Locale.nipponese, origin: 'https://source.test') }
def snapshot_tag(record, event: 'create', number: 1)
TagVersion.create!(tag: record, version_no: number, event_type: event,
name: record.name('ja'), category: record.category, aliases: '', parent_tag_ids: '',
names: { ja: { name: record.name('ja'), script_code: 'Jpan',
auto_generated: false, aliases: [] } }, created_at: Time.current)
end
def snapshot_post(record, tags: [])
PostVersion.create!(post: record, version_no: 1, event_type: 'create',
title: record.title, url: record.url, tags: '', tags_json: tags,
parent_post_ids: '', created_at: Time.current)
end
# Read STORE entries independently of the production writer and verify CRCs.
def archive_files(bytes)
offset = 0
files = { }
while bytes.byteslice(offset, 4).unpack1('V') == 0x04034b50
header = bytes.byteslice(offset, 30).unpack('VvvvvvVVVvv')
size, name_size, extra_size = header[7], header[9], header[10]
path = bytes.byteslice(offset + 30, name_size).force_encoding('UTF-8')
data = bytes.byteslice(offset + 30 + name_size + extra_size, size)
expect(Zlib.crc32(data)).to eq(header[6])
files[path.delete_prefix('archive/')] = data.force_encoding('UTF-8')
offset += 30 + name_size + extra_size + size
end
expect(bytes.byteslice(-22, 4).unpack1('V')).to eq(0x06054b50)
files
end
before do
snapshot_tag(tag)
PostTag.create!(post:, tag:)
snapshot_post(post, tags: [{ tag_id: tag.id, version_no: 1, sections: [] }])
end
it 'generates a navigable ZIP, escaped HTML, search data and verified hashes' do
progress = []
files = archive_files(mirror.export { |done, total| progress << [done, total] })
expect(progress.last).to eq([2, 2])
expect(files.keys).to include('index.html', 'robots.txt', 'assets/archive.css',
'assets/archive.js', 'archive-config.js', 'search-index.json', 'manifest.json',
'ja/posts/index.html', "ja/posts/#{ post.id }/index.html",
'ja/tags/index.html', "ja/tags/#{ tag.id }/index.html")
files.select { |path, _| path.end_with?('.html') }.each do |path, html|
document = Nokogiri::HTML(html)
expect(document.at_css('meta[name="robots"]')['content']).to include('noindex')
expect(document.text).to include('静的保存版', mirror.data_at)
expect(document.css('img')).to be_empty
expect(document.at_css('[data-original]')['href']).to start_with('https://source.test/ja')
document.css('a[href], link[href], script[src]').each do |node|
target = node['href'] || node['src']
next if target.start_with?('https://')
expect(target).not_to start_with('/')
resolved = Pathname.new(path).dirname.join(target).cleanpath.to_s
expect(files).to have_key(resolved)
end
end
detail = Nokogiri::HTML(files.fetch("ja/posts/#{ post.id }/index.html"))
expect(detail.at_css('h1').text).to eq(post.title)
expect(detail.css('main a').map { _1['href'] })
.to include("../../tags/#{ tag.id }/index.html")
manifest = JSON.parse(files.fetch('manifest.json'))
expect(manifest).to include('format_version' => 1, 'locale' => 'ja',
'data_at' => mirror.data_at, 'resources' => { 'posts' => 1, 'tags' => 1 })
expect(Time.iso8601(manifest.fetch('generated_at'))).to be >= Time.iso8601(mirror.data_at)
expect(manifest.fetch('files').map { _1.fetch('path') })
.to match_array(files.keys - ['manifest.json'])
manifest.fetch('files').each do |entry|
digest = Digest::SHA256.hexdigest(files.fetch(entry.fetch('path')))
expect(entry.fetch('sha256')).to eq(digest)
end
expect(JSON.parse(files.fetch('search-index.json')).map { _1.fetch('path') })
.to include("ja/posts/#{ post.id }/index.html", "ja/tags/#{ tag.id }/index.html")
end
it 'keeps private and unversioned records out even for an admin caller' do
private_tag = create(:tag, primary_name: 'mirror-secret-tag')
snapshot_tag(private_tag)
snapshot_tag(private_tag, event: 'discard', number: 2)
private_post = create(:post, title: 'mirror-secret-post')
snapshot_post(private_post)
PostVersion.create!(post: private_post, version_no: 2, event_type: 'discard',
url: private_post.url, tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.current)
legacy = create(:post, title: 'mirror-unversioned-secret')
referencing = create(:post, title: 'mirror-secret-reference')
snapshot_post(referencing,
tags: [{ tag_id: private_tag.id, version_no: 1, sections: [] }])
files = HistoryAccess.set(user: create(:user, :admin)) { archive_files(mirror.export) }
expect(files.values.join).not_to include('mirror-secret', legacy.title, private_post.url)
expect(files.keys).not_to include("ja/tags/#{ private_tag.id }/index.html",
"ja/posts/#{ private_post.id }/index.html", "ja/posts/#{ referencing.id }/index.html")
expect(mirror.authority.fetch('admin')).to be(false)
end
it 'applies later discard boundaries after a restoration' do
snapshot_tag(tag, event: 'discard', number: 2)
snapshot_tag(tag, event: 'restore', number: 3)
tag.update_columns(version_no: 3)
expect(archive_files(mirror.export)).to have_key("ja/tags/#{ tag.id }/index.html")
snapshot_tag(tag, event: 'discard', number: 4)
second = described_class.new(locale: Locale.nipponese, origin: 'https://source.test')
files = archive_files(second.export)
expect(files.keys).not_to include("ja/tags/#{ tag.id }/index.html")
expect(files.values.join).not_to include('mirror-public-tag')
end
it 'does not include credentials or executable URL schemes' do
post.update_columns(url: 'https://secret-user:secret-password@source.test/path')
content = archive_files(mirror.export).values.join
expect(content).not_to include('secret-password', 'secret-user')
post.update_columns(url: 'javascript:alert(1)')
expect(archive_files(mirror.export).values.join).not_to include('javascript:')
end
it 'fails if publication changes during generation' do
expect do
mirror.export do |done, _|
snapshot_tag(tag, event: 'discard', number: 2) if done.zero?
end
end.to raise_error(HistoryAccess::Forbidden)
end
it 'bounds output and never reports hidden population counts' do
stub_const('StaticMirror::RESOURCE_LIMIT', 1)
second = create(:post, title: 'mirror-beyond-limit')
snapshot_post(second)
files = archive_files(mirror.export)
expect(files.values.join).not_to include(second.title, 'population_count', 'excluded_count')
stub_const('StaticMirror::MAX_BYTES', 16)
expect { mirror.export }.to raise_error(StaticMirror::TooLarge)
end
it 'keeps all registered language names and aliases without locale filtering' do
locale
create(:tag_name, :alias, tag:, name: 'mirror-alias', language_code: 'ja', script_code: 'Jpan')
files = archive_files(described_class.new(locale:, origin: 'https://source.test').export)
detail = files.fetch("ain-Kana/tags/#{ tag.id }/index.html")
expect(detail).to include('mirror-public-tag', 'mirror-alias', 'lang="ain"', 'lang="ja"')
end
it 'fails rather than truncating registered aliases at the name limit' do
create(:tag_name, :alias, tag:, name: 'mirror-extra-alias')
stub_const('StaticMirror::NAME_LIMIT', 1)
expect { mirror.export }.to raise_error(StaticMirror::TooLarge)
end
end
-3366
ファイルの表示
ファイル差分が大きすぎるため省略します 差分を読み込み
+4 -12
ファイルの表示
@@ -158,15 +158,7 @@ private ID の正誤に応じて許可可否を変えないため、条件の一
非公開列を含む列順変更は API の column_values_editable でも不可と通知する。 非公開列を含む列順変更は API の column_values_editable でも不可と通知する。
公開列の値を使うソートは引き続き利用できる。 公開列の値を使うソートは引き続き利用できる。
明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。 明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。
外部タグ履歴の linked_tag_ids は、連携する内部タグの ID を半角スペース区切りで 外部タグ履歴の linked_tags は名前しか記録していないため、非公開タグの記録名を含む
記録する。除票履歴のある内部タグの ID を含むスナップショットを非管理者へ公開しない。 スナップショットを保守的に非公開とする。名前全体を空白区切りの境界で照合する。
名前や UI ロカールを参照 ID の判定に使わない。 区切りが曖昧な旧データでは過剰な秘匿の可能性はあるが、参照 ID がない旧形式から
外部タグ名は履歴に保存せず、external_tags の platform と name を参照する。 名前の公開可否を楽観的に推定しない。
V1 Counts の公開フィールド名は linked_tags を維持し、DB の linked_tag_ids へ対応付ける。
明細・フィルタ・集計軸・変更項目・ソート・CSV / JSON 出力で同じ対応付けを使う。
既定列と既存の表示ラベルも linked_tags のままとし、値は ID のスペース区切りとする。
linked_tag_ids は物理カラム名であり、Counts の公開フィールドとしては受け付けない。
旧 URL や保存済み設定のフィールド指定は維持できるが、値にタグ名を指定した検索条件や
ドリル条件は ID 値への見直しが必要となる。旧履歴の名称は移行後の ID 列から復元できず、
現在の名称からの推定変換も行わない。
-169
ファイルの表示
@@ -1,169 +0,0 @@
# Static Mirror PoC (#483)
現在の公開状態の一部を、Rails で HTML にして ZIP 出力する開発環境専用の PoC。
Post は ID・タイトル・URL・出力済み Tag との関連、Tag は ID・カテゴリ・全言語の
名前と別名・出力済み Post との関連を出力する。それ以外の Post / Tag 属性は対象外。
DB backup / restore とは別機能で、日時指定の復元機能はない。
本番環境では全 API が 404 になる。依存パッケージ・DB schema の変更はない。
## 操作
既存のローカル開発用 MySQL 設定と locale 登録を用意した環境で、
`backend/` の `bin/rails server -p 3002` と、`frontend/` の `npm run dev` を使う。
Vite の既存 `/api` proxy は3002番ポートを参照する。これらの起動コマンドは
今回実行していない。DB の準備・migration・依存導入も実行していない。
1. `http://localhost:5173/ja/static-mirror` を開く。開発時の「その他」にもリンクがある。
有効な locale では `/:locale/static-mirror` から利用できる。
2. 「スナップショット生成」を押す。ログインは不要。通常の CSRF、IP BAN、user BAN
の境界を通り、セッションに紐づくジョブを登録する。
3. 状態・処理件数・データ基準時点を確認し、完了後「ZIP ダウンロード」を押す。
4. ZIP を展開し、`archive/` を通常の静的 HTTP サーバーへ配置する。
`/保存版/archive/index.html` のようなサブディレクトリ配置に対応する。
DB、Node.js、原サーバー、外部 API は閲覧先では不要。
一覧・詳細・相互リンクは JavaScript 無効でも利用できる。検索は HTTP 配信した
`search-index.json` を JavaScript が読む。`file://` からの検索は保証しない。
外部動画・画像・サムネール・素材ファイルは取得も同梱もしない。Post の外部 URL は
通常のリンクとして残すため、そのリンク先の閲覧は外部サイトの存続に依存する。
各 HTML に静的保存版の表示、UTC のデータ基準時点、`noindex, nofollow`、
本家への絶対リンクを焼き込む。内部リンク・CSS・JS は相対参照。
`archive-config.js` の `window.archiveConfig.origin` を HTTP(S) の本家基点 URL
(例: `https://example.org`)に変更すれば本家リンクをまとめて変更できる。
設定 JS が削除・欠落・不正な場合や JS 無効時にも HTML の初期リンクが残る。
設定は配置先ミラーの URL ではなく、本家の基点を指す。
## API と処理上限
| API | 役割 |
| --- | --- |
| `GET /static_mirror` | 件数・容量・実行制限と対象外機能 |
| `POST /static_mirror/jobs` | 現在状態のジョブ登録。入力は `locale` のみ |
| `GET /static_mirror/jobs/:id` | 所有セッションの状態・処理進捗・基準時点・失敗コード |
| `GET /static_mirror/files/:id` | 所有セッションの完成 ZIP を再認可して取得 |
通常どおりフロントエンドの API transport と Query key を使用する。
URL に JSON を格納しない。`at` 等の任意時点入力・未知の生成オプションは400で拒否する。
- Post / Tag は各100件。公開認可後に ID 昇順で選ぶ。非公開件数や全母集団件数は返さない。
- 対象 Tag の全言語名・別名は最大2,000行。超過時は失敗させ、黙って切り捨てない。
言語・文字体系は保持し、表示対象言語に登録がない場合は ID を使う。
- Post と Tag の関連は両者が出力集合にあるものだけ。出力外への内部リンクは生成しない。
- 展開後のファイル合計及び ZIP は各8 MiB 以下。超過時は配布しない。
- 同時実行1件、全セッションを通じて新規登録は60秒に1件、登録から処理期限60秒。
競合・受付制限は429と `Retry-After`。状態取得・取得時の短いロック競合は503。
- ZIP とジョブの認可期限は10分。次のジョブ登録で前の ZIP / ジョブは置き換える。
期限後も最後のファイルがディスクに残り得るが、API では取得できない。
容量は単一 ZIP と作業ファイルに限定され、無制限に蓄積しない。
Rails の既存 Active Job と `:async` adapter を使い、生成は HTTP request の外で行う。
既存 `CountsExportJobs` は Counts の入力・投影・配信確認に結合しているため変更せず、
本機能の状態・単一成果物の管理だけを feature 固有の Job に置く。
受付・状態・ZIP は `backend/tmp/static_mirror/` の単一 spool を使う。
プロセス間の filesystem lock で実行枠と更新を制御する。各ファイルは0600、directory は
0700で作成する。Web プロセス再起動で非永続キューが失われる点が PoC の限界。
進まない queued / running は75秒後の状態取得で failed になる。再開や再実行はしない。
失敗コードは `too_large`、`generation_timeout`、`publication_changed`、
`generation_failed`、`worker_stopped`。内部の例外本文・パス・資源属性は応答に含めない。
画面では失敗コード又は既存の通信・認可エラー文言を表示する。
## 公開制御と整合性
生成者の role によらず `HistoryAccess.set(user: nil)` の公開権限を使う。
既存の `HistoryAccess.current` と確定済みの同一 `version_no` の存在確認を組み合わせる。
独自の role 判定や簡易な除票判定は作らない。対応する immutable revision がない
legacy record は安全側で対象外とする。公開不可の参照を含む確定版も既存認可で除外する。
廃止 Tag は対象外。HTML / 検索 JSON / manifest の件数には認可済みの出力集合だけが入る。
user、actor、履歴版番号、監査、認証、blob 情報は投影しない。
`CountsExporter.with_read_snapshot` の既存 repeatable-read 境界を再利用し、Post、Tag、
全言語 TagName、PostTag、publication revision を同じ読み取り view から取得する。
これには既存 HistoryAccess の SQL が動作する MySQL 環境が必要。未対応の adapter や
未整備の DB では生成失敗とし、認可を迂回した出力へフォールバックしない。
`data_at` はこの現在状態読み取りの開始時刻であり、履歴の指定日時復元を表さない。
`generated_at` はファイル生成後の別の時刻。
生成の最後と状態・ZIP 取得時に既存 artifact policy / discard revision を再検証する。
生成中の除票は失敗にし、生成後の除票では古い ZIP の再取得を404にする。
ZIP は再認可後のバイト列として返し、遅延 sendfile に古いパスを渡さない。
HTTP 応答は既存境界の `private, no-store`。ダウンロード済み ZIP の回収や、
最終認可と送出の間に発生する公開制御変更の完全な排他は保証できない。
新しい公開制御を導入する場合は共通 policy と artifact revision の連動が必要。
本文・名前・URL は escape する。外部リンクは HTTP(S)・host・userinfo 不在を検証し、
不正な URL はリンクとして出さない。外部 URL の取得は行わないため SSRF 用 DNS 検査を
流用しない。HTML の CSP は外部スクリプト・画像・通信を許可しない。
`manifest.json` に形式版、生成日時、基準時点、locale、出力件数、対象外項目、上限、
各ファイルの相対パスと SHA-256 を記録する。自己ハッシュは成立しないため manifest
自身だけは一覧の対象外とし、`checksum_scope` にその範囲を記録する。
## 過去時点復元の調査
- `post_versions` / `tag_versions` は親 ID と正の `version_no` に一意制約があり、
readonly の `VersionRecord` を使う。`created_at <= 時点` の中で最大の確定版を
選ぶことは可能。同一時刻の順序は時刻だけで決めず版番号を併用する必要がある。
- Tag は `names` に言語別の名前・script・別名を保存する。古い行の移行では
日本語として backfill し、旧 aliases 文字列を分割している。失われた区切りや
当時未記録の他言語名を現在の TagName で補完して正確と称することはできない。
- Post は `tags_json`、区間、Tag 版参照、`parent_post_ids` を、Tag は
`parent_tag_ids` を記録する。ただし legacy `tags_json` は名前・時刻からの補完を
含む。全時代・全書き込み経路の関係変更の完全性を検証する必要がある。
外部 Tag 名の現行参照など、immutable history だけでは揃わない値もある。
- Tag Description は `(tag_id, language_code, version_no)` の版に本文と翻訳元を記録する。
Material にはファイル情報等の版があるが、blob 本体の永久保存や除票・公開抑止との
整合は別途必要。Help はフロントエンドの文書配信に依存し、DB の任意時点だけでは
当時の公開版を復元できない。
- 当時の publication policy そのものや将来追加される公開抑止の完全な履歴は、
これらの内容版だけでは保証できない。指定時点の再現と現在の公開許可を別々に評価し、
現在の全後続除票境界を版番号と複合キーで適用する必要がある。恢復しても過去の
秘匿履歴を再公開しない。Counts の件数例外はこの機能へ拡張しない。
- 正確な時点復元には、全 resource の履歴の起点・欠落・backfill の識別、関係・名前・
policy・locale・asset の時点整合性、immutable な Help の版、削除済み asset の保存方針、
一つの DB read view と現在の認可の再検証、同時刻更新の順序・境界の設計が必要。
このため日時入力は実装していない。履歴評価はソース調査であり、実 DB の網羅監査ではない。
## 検証と残課題
追加した回帰テスト:
- `backend/spec/services/static_mirror_spec.rb`: ZIP の CRC / 構造、全ファイルの hash、
内部参照、escape、基準時点、公開権限、後続除票、言語名・別名、容量・件数上限。
- `backend/spec/requests/static_mirrors_spec.rb`: 一般受付、非同期境界、所有権、
公開制御変更、失敗・期限・競合・全体 rate limit、開発環境制限、CSRF と BAN。
- `frontend/src/pages/StaticMirrorPage.test.tsx`: 開始、進捗、取得、失敗、
受付エラー、認可喪失、日本語 fallback の言語属性。
- `frontend/src/lib/staticMirrorAssets.test.ts`: 静的検索の相対参照・escape と
サブディレクトリ配備、本家設定の欠落・不正・変更。
実施したのは既存コードの調査と差分の目視確認のみ。テスト、lint、build、型検査、
migration、実ブラウザーでの表示、ZIP 展開・HTTP 配置は実行していない。
管理者指定の suite による結果確認と、サブディレクトリ配置・JS 無効・原サーバー停止・
設定 JS 欠落・静的検索の実画面確認が残る。
本番公開には durable な worker / queue、復旧・取消・削除と運用監視、適切な利用者別
rate limit、容量・時間・負荷の実測、公開制御の監査と変更検知、長時間配信の再認可方針、
asset の権利・保管方針、追加 resource の安全な投影、UI 文言・翻訳の確定が必要。
本 PoC の開発環境制限を単に外して公開することは想定しない。
## 変更ファイルの責務
| ファイル | 責務 |
| --- | --- |
| `backend/config/routes.rb` | metadata・job・ZIP の4経路 |
| `backend/app/controllers/static_mirrors_controller.rb` | 通常認証境界、開発制限、入力・HTTP 応答 |
| `backend/app/jobs/static_mirror_job.rb` | 単一生成枠、受付制限、状態・成果物・期限・取得認可 |
| `backend/app/services/static_mirror.rb` | 公開データの一貫した投影、ページ・検索・manifest・ZIP |
| `backend/app/views/static_mirror/page.html.erb` | escape 済み HTML、ナビ、基準時点・本家リンク・CSP |
| `backend/app/views/static_mirror/archive.css` | 静的サイトの読み取り表示 |
| `backend/app/views/static_mirror/archive.js` | ローカル検索と本家リンクの設定変更 |
| `frontend/src/App.tsx` | locale 付き操作画面経路 |
| `frontend/src/lib/queryKeys.ts` | 既存 Query key entrypoint への追加 |
| `frontend/src/pages/StaticMirrorPage.tsx` | 開始・制限・進捗・失敗・ZIP 操作 |
| `frontend/src/pages/MorePage.tsx` | 開発時の画面への導線 |
| `frontend/src/locales/{ja,ain-Kana}/archive.json` | Issue 指定の文言と未翻訳 fallback |
| 上記4テストファイル | 回帰テスト |
| `docs/static-mirror.md` | 手順・制約・調査・未検証事項 |
+27 -4
ファイルの表示
@@ -1,6 +1,29 @@
export default { import autoprefixer from 'autoprefixer'
plugins: { import tailwindcss from 'tailwindcss'
tailwindcss: {},
autoprefixer: {}, // Apply the same breakpoints to handwritten CSS and Tailwind utilities.
export const inlineBreakpoints = {
postcssPlugin: 'inline-breakpoints',
OnceExit (root) {
const queries = []
root.walkAtRules ('media', query => {
if (/\b(?:min|max)-width\s*:/.test (query.params))
queries.push (query)
})
for (const query of queries) {
const vertical = query.cloneAfter ({
params: query.params.replace (/\b(min|max)-width(?=\s*:)/g, '$1-height') })
for (const [branch, scope] of [
[query, ':where(html:not(:lang(mn-Mong)))'],
[vertical, ':where(html:lang(mn-Mong))']]) {
branch.walkRules (rule => {
rule.selectors = rule.selectors.map (selector => `${scope} ${selector}`)
})
}
}
}, },
} }
export default {
plugins: [tailwindcss (), inlineBreakpoints, autoprefixer ()],
}
+52
ファイルの表示
@@ -0,0 +1,52 @@
import postcss from 'postcss'
import tailwindcss from 'tailwindcss'
import { describe, expect, it } from 'vitest'
import { inlineBreakpoints } from './postcss.config.js'
describe ('inline breakpoints', () => {
it ('uses height for vertical menus and width for horizontal menus', async () => {
const source = `
@media (min-width: 768px) { .menu, .account { display: flex } }
@media (min-width: 1024px) { .menu { font-size: 1rem } }
@media (max-width: 767px) { .mobile { display: block } }
@media (prefers-reduced-motion: reduce) { .menu { transition: none } }
`
const { css } = await postcss ([inlineBreakpoints]).process (
source, { from: 'menus.css' })
const rules = []
postcss.parse (css).walkRules (rule => {
rules.push ([rule.parent.params, rule.selector])
})
expect (rules).toEqual ([
['(min-width: 768px)',
':where(html:not(:lang(mn-Mong))) .menu, '
+ ':where(html:not(:lang(mn-Mong))) .account'],
['(min-height: 768px)',
':where(html:lang(mn-Mong)) .menu, :where(html:lang(mn-Mong)) .account'],
['(min-width: 1024px)', ':where(html:not(:lang(mn-Mong))) .menu'],
['(min-height: 1024px)', ':where(html:lang(mn-Mong)) .menu'],
['(max-width: 767px)', ':where(html:not(:lang(mn-Mong))) .mobile'],
['(max-height: 767px)', ':where(html:lang(mn-Mong)) .mobile'],
['(prefers-reduced-motion: reduce)', '.menu']])
})
it ('includes responsive utilities generated by Tailwind', async () => {
const { css } = await postcss ([tailwindcss ({
content: [{ raw: '<div class="md:hidden lg:text-base"></div>' }],
corePlugins: { preflight: false } }), inlineBreakpoints]).process (
'@tailwind utilities;', { from: 'utilities.css' })
const rules = []
postcss.parse (css).walkRules (rule => {
rules.push ([rule.parent.params, rule.selector])
})
expect (rules).toContainEqual ([
'(min-width: 768px)', ':where(html:not(:lang(mn-Mong))) .md\\:hidden'])
expect (rules).toContainEqual ([
'(min-height: 768px)', ':where(html:lang(mn-Mong)) .md\\:hidden'])
expect (rules).toContainEqual ([
'(min-height: 1024px)', ':where(html:lang(mn-Mong)) .lg\\:text-base'])
})
})
+94
ファイルの表示
@@ -0,0 +1,94 @@
Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts)
This Font Software is licensed under the SIL Open Font License,
Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font
creation efforts of academic and linguistic communities, and to
provide a free and open framework in which fonts may be shared and
improved in partnership with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply to
any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software
components as distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to,
deleting, or substituting -- in part or in whole -- any of the
components of the Original Version, by changing formats or by porting
the Font Software to a new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed,
modify, redistribute, and sell modified and unmodified copies of the
Font Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components, in
Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the
corresponding Copyright Holder. This restriction only applies to the
primary font name as presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created using
the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
バイナリファイルは表示されません。
+11
ファイルの表示
@@ -0,0 +1,11 @@
Noto Sans Mongolian Regular, unmodified TrueType font.
Font copyright: Copyright 2018 Google Inc. All Rights Reserved.
- Source: https://github.com/notofonts/noto-fonts/tree/main/hinted/ttf/NotoSansMongolian
- Font: https://raw.githubusercontent.com/notofonts/noto-fonts/main/hinted/ttf/NotoSansMongolian/NotoSansMongolian-Regular.ttf
- License: SIL Open Font License 1.1; see the accompanying LICENSE.
- Retrieved: 2026-11-08.
Used by the Mongolian UI at `/mn-Mong`.
The font and license are served together from this directory.
+20 -1
ファイルの表示
@@ -1,9 +1,10 @@
import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises' import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
import { tmpdir } from 'node:os' import { tmpdir } from 'node:os'
import path from 'node:path' import path from 'node:path'
import { createServer } from 'vite'
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { generateHelpAssets } from './help-assets' import { generateHelpAssets, helpAssets } from './help-assets'
import type { ArticleMeta, HelpChange, HelpSearchEntry, HelpTitleIndex } from '@/lib/help' import type { ArticleMeta, HelpChange, HelpSearchEntry, HelpTitleIndex } from '@/lib/help'
@@ -109,4 +110,22 @@ describe ('Build-time Help assets', () => {
it ('rejects an empty Help checkout', async () => { it ('rejects an empty Help checkout', async () => {
await expect (generateHelpAssets (root)).rejects.toThrow ('No Help articles found') await expect (generateHelpAssets (root)).rejects.toThrow ('No Help articles found')
}) })
it ('defers missing Help errors until a Help module is requested', async () => {
const server = await createServer ({
configFile: false,
root,
plugins: [helpAssets ()],
server: { middlewareMode: true, watch: null } })
try
{
await server.pluginContainer.buildStart ({})
await expect (server.pluginContainer.load ('\0virtual:help/articles'))
.rejects.toThrow ('ENOENT')
}
finally
{
await server.close ()
}
})
}) })
+6 -5
ファイルの表示
@@ -159,10 +159,9 @@ export const helpAssets = (): Plugin => {
configResolved (config) { configResolved (config) {
state.root = path.resolve (config.root, 'help') state.root = path.resolve (config.root, 'help')
}, },
async buildStart () { buildStart () {
state.data = generateHelpAssets (state.root) state.data = undefined
const generated = await data () this.addWatchFile (state.root)
generated.files.forEach (file => this.addWatchFile (file))
}, },
resolveId (id) { resolveId (id) {
return id.startsWith (prefix) ? `\0${ id }` : null return id.startsWith (prefix) ? `\0${ id }` : null
@@ -170,7 +169,9 @@ export const helpAssets = (): Plugin => {
async load (id) { async load (id) {
if (!(id.startsWith (`\0${ prefix }`))) if (!(id.startsWith (`\0${ prefix }`)))
return null return null
const source = (await data ()).modules.get (id.slice (1)) const generated = await data ()
generated.files.forEach (file => this.addWatchFile (file))
const source = generated.modules.get (id.slice (1))
if (source == null) if (source == null)
throw new Error (`Unknown Help asset: ${ id.slice (1) }`) throw new Error (`Unknown Help asset: ${ id.slice (1) }`)
return source return source
+30 -22
ファイルの表示
@@ -20,13 +20,13 @@ import { Toaster } from '@/components/ui/toaster'
import { isApiError } from '@/lib/api' import { isApiError } from '@/lib/api'
import { initialiseUserSession } from '@/lib/users' import { initialiseUserSession } from '@/lib/users'
import { prepareHelpPage } from '@/lib/help' import { prepareHelpPage } from '@/lib/help'
import { fetchLocales, isLocaleCode, legacyLocalePath, import { fetchLocales, isLocaleCode, isVerticalPreviewPath, legacyLocalePath,
switchLocalePath, unlocalisedPath } from '@/lib/locales' localiseTo, switchLocalePath, unlocalisedPath } from '@/lib/locales'
import { isAuthorityDependentQuery, localesKeys, sessionKeys } from '@/lib/queryKeys' import { isAuthorityDependentQuery, localesKeys, sessionKeys } from '@/lib/queryKeys'
import { isCountsPath } from '@/lib/routeLocales' import { isCountsPath } from '@/lib/routeLocales'
import { switchPostFilterLocale } from '@/lib/posts' import { switchPostFilterLocale } from '@/lib/posts'
import { switchWikiLocale } from '@/lib/wiki' import { switchWikiLocale } from '@/lib/wiki'
import { useLocale } from '@/lib/useLocale' import { useLocale, useUILocale, useVerticalPreview } from '@/lib/useLocale'
import { applyClientAnimationMode, import { applyClientAnimationMode,
applyClientAppearance, applyClientAppearance,
fetchUserThemeSlots, fetchUserThemeSlots,
@@ -46,7 +46,7 @@ import ServiceUnavailable from '@/pages/ServiceUnavailable'
import type { ComponentType, Dispatch, FC, ReactNode, SetStateAction } from 'react' import type { ComponentType, Dispatch, FC, ReactNode, SetStateAction } from 'react'
import type { RouteMatch } from 'react-router-dom' import type { RouteMatch } from 'react-router-dom'
import type { AvailableLocale, LocaleCode } from '@/lib/locales' import type { AvailableLocale, LocaleCode, UILocaleCode } from '@/lib/locales'
import type { PageRoute } from '@/lib/routeLocales' import type { PageRoute } from '@/lib/routeLocales'
import type { User } from '@/types' import type { User } from '@/types'
@@ -83,7 +83,6 @@ const MaterialSyncSuppressionsPage = lazyPage (
() => import ('@/pages/materials/MaterialSyncSuppressionsPage')) () => import ('@/pages/materials/MaterialSyncSuppressionsPage'))
const CountsResourcePage = lazyPage (() => import ('@/pages/counts/CountsResourcePage')) const CountsResourcePage = lazyPage (() => import ('@/pages/counts/CountsResourcePage'))
const MorePage = lazyPage (() => import ('@/pages/MorePage')) const MorePage = lazyPage (() => import ('@/pages/MorePage'))
const StaticMirrorPage = lazyPage (() => import ('@/pages/StaticMirrorPage'))
const GekanatorUnavailablePage = lazyPage (() => import ('@/pages/GekanatorUnavailablePage')) const GekanatorUnavailablePage = lazyPage (() => import ('@/pages/GekanatorUnavailablePage'))
const NicoTagListPage = lazyPage (() => import ('@/pages/tags/NicoTagListPage')) const NicoTagListPage = lazyPage (() => import ('@/pages/tags/NicoTagListPage'))
const TOSPage = lazyPage (() => import ('@/pages/TOSPage')) const TOSPage = lazyPage (() => import ('@/pages/TOSPage'))
@@ -127,8 +126,6 @@ export const pageRoutes = (
user: User | null, user: User | null,
setUser: Dispatch<SetStateAction<User | null>>, setUser: Dispatch<SetStateAction<User | null>>,
): PageRoute[] => [ ): PageRoute[] => [
{ path: 'static-mirror', element: <StaticMirrorPage/>,
handle: { preload: StaticMirrorPage.preload, robots: 'noindex' } },
{ path: '', element: <LocaleRedirect to="/posts"/>, { path: '', element: <LocaleRedirect to="/posts"/>,
handle: { redirectTo: '/posts' } }, handle: { redirectTo: '/posts' } },
{ path: 'posts', element: <PostListPage/>, { path: 'posts', element: <PostListPage/>,
@@ -270,15 +267,21 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
const client = useQueryClient () const client = useQueryClient ()
const location = useLocation () const location = useLocation ()
const locale = useLocale () const locale = useLocale ()
const verticalPreview = useVerticalPreview ()
const route = resolvePageRoute (location.pathname) const route = resolvePageRoute (location.pathname)
const robots = isCountsPath (location.pathname) ? 'noindex' : route?.route.handle?.robots const robots = isCountsPath (location.pathname) ? 'noindex' : route?.route.handle?.robots
const pagePath = unlocalisedPath (location.pathname) const pagePath = unlocalisedPath (location.pathname)
const countsPage = pagePath === '/counts' || pagePath.startsWith ('/counts/') const countsPage = pagePath === '/counts' || pagePath.startsWith ('/counts/')
const switchLocale = async (targetLocale: LocaleCode): Promise<string> => { const switchLocale = async (target: UILocaleCode): Promise<string> => {
const targetLocale = target === 'mn-Mong' ? 'ja' : target
if (targetLocale === locale)
return switchLocalePath (location, target)
const resolve = route?.route.handle?.switchLocale const resolve = route?.route.handle?.switchLocale
return (resolve != null && route != null) const destination =
? resolve ({ location, params: route.params, locale, targetLocale }) (resolve != null && route != null)
? await resolve ({ location, params: route.params, locale, targetLocale })
: switchLocalePath (location, targetLocale) : switchLocalePath (location, targetLocale)
return target === 'mn-Mong' ? `/mn-Mong${unlocalisedPath (destination)}` : destination
} }
const [user, setUserState] = useState<User | null> ( const [user, setUserState] = useState<User | null> (
() => client.getQueryData<User> (sessionKeys.current) ?? null) () => client.getQueryData<User> (sessionKeys.current) ?? null)
@@ -396,7 +399,8 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
<motion.div <motion.div
layout={(animationMode === 'off' || countsPage) ? false : 'position'} layout={(animationMode === 'off' || countsPage) ? false : 'position'}
transition={{ layout: appLayoutTransition }} transition={{ layout: appLayoutTransition }}
className="relative flex h-dvh w-full flex-col overflow-y-hidden"> data-vertical-preview={verticalPreview || undefined}
className="app-layout relative flex h-dvh w-full flex-col overflow-y-hidden">
<TopNav user={user} locales={locales} resolveLocaleSwitch={switchLocale}/> <TopNav user={user} locales={locales} resolveLocaleSwitch={switchLocale}/>
<RouteTransitionWrapper <RouteTransitionWrapper
user={user} user={user}
@@ -414,7 +418,9 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
const LocaleRoute: FC = () => { const LocaleRoute: FC = () => {
const { locale } = useParams () const { locale } = useParams ()
const uiLocale = useUILocale ()
const location = useLocation () const location = useLocation ()
const verticalPreview = isVerticalPreviewPath (location.pathname)
const { i18n } = useTranslation () const { i18n } = useTranslation ()
const { data, isError } = useQuery ({ const { data, isError } = useQuery ({
queryKey: localesKeys.index, queryKey: localesKeys.index,
@@ -424,29 +430,30 @@ const LocaleRoute: FC = () => {
refetchOnMount: true, refetchOnMount: true,
refetchOnWindowFocus: true, refetchOnWindowFocus: true,
refetchOnReconnect: true }) refetchOnReconnect: true })
const contentLocale = verticalPreview ? 'ja' : locale
const activeLocale = const activeLocale =
(isLocaleCode (locale) (isLocaleCode (contentLocale)
&& data?.locales.some (entry => entry.code === locale)) && data?.locales.some (entry => entry.code === contentLocale))
? locale ? contentLocale
: null : null
useLayoutEffect (() => { useLayoutEffect (() => {
if (activeLocale != null) if (activeLocale != null)
document.documentElement.lang = activeLocale document.documentElement.lang = uiLocale
if (activeLocale != null && i18n.language !== activeLocale) if (activeLocale != null && i18n.language !== uiLocale)
void i18n.changeLanguage (activeLocale) void i18n.changeLanguage (uiLocale)
}, [activeLocale, i18n]) }, [activeLocale, uiLocale, i18n])
const redirect = legacyLocalePath (location, pathname => resolvePageRoute (pathname) != null) const redirect = legacyLocalePath (location, pathname => resolvePageRoute (pathname) != null)
if (!(isLocaleCode (locale)) && redirect == null) if (!(isLocaleCode (locale)) && !verticalPreview && redirect == null)
return <NotFound/> return <NotFound/>
if (isError && data == null) if (isError && data == null)
return <ServiceUnavailable/> return <ServiceUnavailable/>
if (data == null) if (data == null)
return null return null
if (isLocaleCode (locale)) if (isLocaleCode (locale) || verticalPreview)
{ {
return data.locales.some (entry => entry.code === locale) return data.locales.some (entry => entry.code === contentLocale)
? <RoutedApp locales={data.locales}/> ? <RoutedApp locales={data.locales}/>
: <NotFound/> : <NotFound/>
} }
@@ -458,7 +465,8 @@ const LocaleRoute: FC = () => {
const LocaleRedirect = ({ to }: { to: string }) => { const LocaleRedirect = ({ to }: { to: string }) => {
const locale = useLocale () const locale = useLocale ()
const location = useLocation () const location = useLocation ()
return <Navigate to={switchLocalePath ({ ...location, pathname: to }, locale)} replace/> return <Navigate to={localiseTo (
{ ...location, pathname: to }, locale, location.pathname)} replace/>
} }
+1 -1
ファイルの表示
@@ -34,7 +34,7 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
const cardRef = useRef<HTMLDivElement> (null) const cardRef = useRef<HTMLDivElement> (null)
return ( return (
<div className="flex flex-wrap gap-6 p-4"> <div className="post-list flex flex-wrap gap-6 p-4">
{posts.map ((post, i) => { {posts.map ((post, i) => {
const sharedId = `page-${ post.id }` const sharedId = `page-${ post.id }`
const layoutId = sharedId const layoutId = sharedId
+9 -5
ファイルの表示
@@ -1,9 +1,10 @@
import { useQueryClient } from '@tanstack/react-query' import { useQueryClient } from '@tanstack/react-query'
import { forwardRef, useMemo } from 'react' import { forwardRef, useMemo } from 'react'
import { flushSync } from 'react-dom' import { flushSync } from 'react-dom'
import { createPath } from 'react-router-dom' import { createPath, useLocation } from 'react-router-dom'
import { localiseTo } from '@/lib/locales' import { isVerticalPreviewPath, localeFromPath,
localiseTo, unlocalisedPath } from '@/lib/locales'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useOverlayStore } from '@/components/RouteBlockerOverlay' import { useOverlayStore } from '@/components/RouteBlockerOverlay'
import { prefetchForURL } from '@/lib/prefetchers' import { prefetchForURL } from '@/lib/prefetchers'
@@ -38,15 +39,18 @@ export default forwardRef<HTMLAnchorElement, Props> (({
const navigate = useLocaleNavigate () const navigate = useLocaleNavigate ()
const locale = useLocale () const locale = useLocale ()
const { pathname } = useLocation ()
const qc = useQueryClient () const qc = useQueryClient ()
const behaviourSettings = useClientBehaviourSettings () const behaviourSettings = useClientBehaviourSettings ()
const linkPreloadMode = behaviourSettings.linkPreload ?? 'intent' const linkPreloadMode = behaviourSettings.linkPreload ?? 'intent'
const path = useMemo ( const path = useMemo (
() => { () => {
const localised = localiseTo (to, locale) const localised = localiseTo (to, locale, pathname)
return typeof localised === 'string' ? localised : createPath (localised) const destination = typeof localised === 'string' ? localised : createPath (localised)
return (isVerticalPreviewPath (pathname) && localeFromPath (destination) === locale)
? `/mn-Mong${ unlocalisedPath (destination) }` : destination
}, },
[to, locale], [to, locale, pathname],
) )
const url = useMemo (() => { const url = useMemo (() => {
return (new URL (path, currentRenderContext ()?.origin ?? 'http://localhost')).toString () return (new URL (path, currentRenderContext ()?.origin ?? 'http://localhost')).toString ()
+9 -5
ファイルの表示
@@ -1,7 +1,9 @@
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { cn } from '@/lib/utils'
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { useVerticalPreview } from '@/lib/useLocale'
import { cn } from '@/lib/utils'
import type { FC } from 'react' import type { FC } from 'react'
type Props = { type Props = {
@@ -11,7 +13,7 @@ type Props = {
title?: string } title?: string }
const DESKTOP_MARQUEE_MEDIA = const DESKTOP_MARQUEE_MEDIA =
'(min-width: 768px) and (hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference)' '(hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference)'
const MARQUEE_START_DELAY_MS = 1600 const MARQUEE_START_DELAY_MS = 1600
const MARQUEE_END_HOLD_MS = 2400 const MARQUEE_END_HOLD_MS = 2400
const MARQUEE_SCROLL_PX_PER_SECOND = 43 const MARQUEE_SCROLL_PX_PER_SECOND = 43
@@ -21,6 +23,7 @@ const MIN_MARQUEE_OVERFLOW_PX = 1
const ResponsiveMarqueeText: FC<Props> = ( const ResponsiveMarqueeText: FC<Props> = (
{ text, className, truncateOnMobile = false, title }, { text, className, truncateOnMobile = false, title },
) => { ) => {
const verticalPreview = useVerticalPreview ()
const behaviourSettings = useClientBehaviourSettings () const behaviourSettings = useClientBehaviourSettings ()
const animationMode = behaviourSettings.animation ?? 'normal' const animationMode = behaviourSettings.animation ?? 'normal'
const outerRef = useRef<HTMLSpanElement | null> (null) const outerRef = useRef<HTMLSpanElement | null> (null)
@@ -69,7 +72,8 @@ const ResponsiveMarqueeText: FC<Props> = (
if (typeof window === 'undefined' || typeof window.matchMedia !== 'function') if (typeof window === 'undefined' || typeof window.matchMedia !== 'function')
return return
const media = window.matchMedia (DESKTOP_MARQUEE_MEDIA) const sizeMedia = verticalPreview ? '(min-height: 768px)' : '(min-width: 768px)'
const media = window.matchMedia (`${ sizeMedia } and ${ DESKTOP_MARQUEE_MEDIA }`)
const update = () => { const update = () => {
setDesktopMarqueeEnabled (media.matches) setDesktopMarqueeEnabled (media.matches)
} }
@@ -80,7 +84,7 @@ const ResponsiveMarqueeText: FC<Props> = (
return () => { return () => {
media.removeEventListener ('change', update) media.removeEventListener ('change', update)
} }
}, []) }, [verticalPreview])
useEffect (() => { useEffect (() => {
const clearScheduled = () => { const clearScheduled = () => {
+8 -5
ファイルの表示
@@ -79,7 +79,9 @@ const TagLink: FC<Props> = ({ tag,
} as CSSProperties } as CSSProperties
const spanClass = 'tag-link-colour' const spanClass = 'tag-link-colour'
const linkClass = 'tag-link-colour tag-link-hover-colour' const linkClass = 'tag-link-colour tag-link-hover-colour'
const textClass = 'group min-w-0 max-w-full overflow-hidden align-bottom' const textClass = cn (
'group [min-inline-size:0] [max-inline-size:100%]',
'overflow-hidden align-bottom')
const markerWrapClass = 'shrink-0 self-start md:self-auto' const markerWrapClass = 'shrink-0 self-start md:self-auto'
const countClass = 'shrink-0 self-end md:self-auto' const countClass = 'shrink-0 self-end md:self-auto'
const matchedAlias = isFullTag (tag) ? tag.matchedAlias : null const matchedAlias = isFullTag (tag) ? tag.matchedAlias : null
@@ -89,7 +91,8 @@ const TagLink: FC<Props> = ({ tag,
return ( return (
<span <span
className={cn ( className={cn (
'inline-flex min-w-0 max-w-full flex-nowrap items-stretch align-baseline', 'inline-flex [min-inline-size:0] [max-inline-size:100%] flex-nowrap',
'items-stretch align-baseline',
'gap-x-1 md:items-baseline')}> 'gap-x-1 md:items-baseline')}>
{(linkFlg && withWiki && isFullTag (tag) && tag.category !== 'nico') && ( {(linkFlg && withWiki && isFullTag (tag) && tag.category !== 'nico') && (
<span className={markerWrapClass}> <span className={markerWrapClass}>
@@ -153,9 +156,9 @@ const TagLink: FC<Props> = ({ tag,
</span>)} </span>)}
{nestLevel > 0 && ( {nestLevel > 0 && (
<span <span
className="ml-1 mr-1 shrink-0" className="ms-1 me-1 shrink-0"
style={{ paddingLeft: `${ (nestLevel - 1) }rem` }}> style={{ paddingInlineStart: `${ (nestLevel - 1) }rem` }}>
↳ <span className="tag-tree-arrow">↳</span>
</span>)} </span>)}
{matchedAlias != null && ( {matchedAlias != null && (
<> <>
+4 -3
ファイルの表示
@@ -3,7 +3,7 @@
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate, useVerticalPreview } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import { apiGet } from '@/lib/api' import { apiGet } from '@/lib/api'
import { inputClass } from '@/lib/utils' import { inputClass } from '@/lib/utils'
@@ -18,6 +18,7 @@ import type { Tag } from '@/types'
const TagSearch: FC = () => { const TagSearch: FC = () => {
const { message } = useUITranslation ('shared') const { message } = useUITranslation ('shared')
const locale = useLocale () const locale = useLocale ()
const verticalPreview = useVerticalPreview ()
const location = useLocation () const location = useLocation ()
const navigate = useLocaleNavigate () const navigate = useLocaleNavigate ()
const compositionFlgRef = useRef (false) const compositionFlgRef = useRef (false)
@@ -105,13 +106,13 @@ const TagSearch: FC = () => {
switch (ev.key) switch (ev.key)
{ {
case 'ArrowDown': case verticalPreview ? 'ArrowRight' : 'ArrowDown':
ev.preventDefault () ev.preventDefault ()
setActiveIndex (i => Math.min (i + 1, suggestions.length - 1)) setActiveIndex (i => Math.min (i + 1, suggestions.length - 1))
setSuggestionsVsbl (true) setSuggestionsVsbl (true)
break break
case 'ArrowUp': case verticalPreview ? 'ArrowLeft' : 'ArrowUp':
ev.preventDefault () ev.preventDefault ()
setActiveIndex (i => Math.max (i - 1, -1)) setActiveIndex (i => Math.max (i - 1, -1))
setSuggestionsVsbl (true) setSuggestionsVsbl (true)
+1 -1
ファイルの表示
@@ -15,7 +15,7 @@ const TagSearchBox: FC<Props> = ({ suggestions, activeIndex, onSelect }) => {
return return
return ( return (
<ul className="absolute left-0 right-0 z-50 w-full <ul className="tag-search-suggestions absolute left-0 right-0 z-50 w-full
bg-gray-100 dark:bg-gray-800 border dark:border-gray-600 bg-gray-100 dark:bg-gray-800 border dark:border-gray-600
rounded shadow"> rounded shadow">
{suggestions.map ((tag, i) => ( {suggestions.map ((tag, i) => (
+85 -50
ファイルの表示
@@ -4,7 +4,7 @@ import { Globe } from 'lucide-react'
import { Fragment, useEffect, useLayoutEffect, useRef, useState } from 'react' import { Fragment, useEffect, useLayoutEffect, useRef, useState } from 'react'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate, useUILocale, useVerticalPreview } from '@/lib/useLocale'
import LocalisedText, { formatUIString } from '@/components/LocalisedText' import LocalisedText, { formatUIString } from '@/components/LocalisedText'
import Separator from '@/components/MenuSeparator' import Separator from '@/components/MenuSeparator'
import PrefetchLink from '@/components/PrefetchLink' import PrefetchLink from '@/components/PrefetchLink'
@@ -12,9 +12,9 @@ import TopNavUser from '@/components/TopNavUser'
import TranslatedText from '@/components/TranslatedText' import TranslatedText from '@/components/TranslatedText'
import { toast } from '@/components/ui/use-toast' import { toast } from '@/components/ui/use-toast'
import { WikiIdBus } from '@/lib/eventBus/WikiIdBus' import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
import { isLocaleCode, import { isUILocaleCode,
localeFromPath,
switchLocalePath, switchLocalePath,
uiLocaleFromPath,
unlocalisedPath } from '@/lib/locales' unlocalisedPath } from '@/lib/locales'
import { uiMessage, uiMessageLanguage } from '@/lib/messages' import { uiMessage, uiMessageLanguage } from '@/lib/messages'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
@@ -28,13 +28,13 @@ import { fetchWikiPage } from '@/lib/wiki'
import type { FC, MouseEvent } from 'react' import type { FC, MouseEvent } from 'react'
import type { AvailableLocale, LocaleCode } from '@/lib/locales' import type { AvailableLocale, UILocaleCode } from '@/lib/locales'
import type { Material, Menu, MenuVisibleItem, Tag, User } from '@/types' import type { Material, Menu, MenuVisibleItem, Tag, User } from '@/types'
type Props = { type Props = {
user: User | null user: User | null
locales: AvailableLocale[] locales: AvailableLocale[]
resolveLocaleSwitch?: (locale: LocaleCode) => Promise<string> } resolveLocaleSwitch?: (locale: UILocaleCode) => Promise<string> }
type NavDensity = 'auto' | 'comfortable' | 'compact' type NavDensity = 'auto' | 'comfortable' | 'compact'
@@ -47,7 +47,7 @@ export const menuOutline = (
pathName: string }, pathName: string },
): Menu => { ): Menu => {
const pathName = unlocalisedPath (fullPathname) const pathName = unlocalisedPath (fullPathname)
const locale = localeFromPath (fullPathname) ?? 'ja' const locale = uiLocaleFromPath (fullPathname)
const message = ( const message = (
key: Parameters<typeof uiMessage>[1], key: Parameters<typeof uiMessage>[1],
@@ -137,7 +137,10 @@ export const menuOutline = (
const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => { const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
const { message, label } = useUITranslation ('shared') const { message, label } = useUITranslation ('shared')
const locale = useLocale () const locale = useLocale ()
const localeName = locales.find (entry => entry.code === locale)?.name const uiLocale = useUILocale ()
const verticalPreview = useVerticalPreview ()
const uiLocales = locales.filter (entry => isUILocaleCode (entry.code))
const localeName = uiLocales.find (entry => entry.code === uiLocale)?.name
const navigate = useLocaleNavigate () const navigate = useLocaleNavigate ()
const location = useLocation () const location = useLocation ()
const currentLocation = useRef (location) const currentLocation = useRef (location)
@@ -180,11 +183,12 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
let node: HTMLElement | null = el let node: HTMLElement | null = el
while (node != null && node !== nav) while (node != null && node !== nav)
{ {
left += node.offsetLeft left += verticalPreview ? node.offsetTop : node.offsetLeft
const parent: Element | null = node.offsetParent const parent: Element | null = node.offsetParent
node = parent instanceof HTMLElement ? parent : null node = parent instanceof HTMLElement ? parent : null
} }
const width = node === nav ? el.offsetWidth : 0 const width = node === nav
? (verticalPreview ? el.offsetHeight : el.offsetWidth) : 0
const visible = width > 0 const visible = width > 0
setHL (current => setHL (current =>
(current.left === left && current.width === width && current.visible === visible) (current.left === left && current.width === width && current.visible === visible)
@@ -202,6 +206,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
const [moreVsbl, setMoreVsbl] = useState (false) const [moreVsbl, setMoreVsbl] = useState (false)
const [openItemIdx, setOpenItemIdx] = useState (-1) const [openItemIdx, setOpenItemIdx] = useState (-1)
const [submenuHeight, setSubmenuHeight] = useState (0) const [submenuHeight, setSubmenuHeight] = useState (0)
const [submenuWidth, setSubmenuWidth] = useState (0)
const [wikiId, setWikiId] = useState<number | null> (WikiIdBus.get ()) const [wikiId, setWikiId] = useState<number | null> (WikiIdBus.get ())
const wikiIdStr = String (wikiId ?? '') const wikiIdStr = String (wikiId ?? '')
@@ -255,8 +260,22 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
animationsOff animationsOff
? undefined ? undefined
: (reducedAnimations : (reducedAnimations
? 'transition-[transform,width] duration-75 ease-linear' ? 'transition-[transform,width,height] duration-75 ease-linear'
: 'transition-[transform,width] duration-200 ease-out') : 'transition-[transform,width,height] duration-200 ease-out')
const submenuItemMotion = animationsOff ? { } : {
initial: { x: verticalPreview ? -40 : 0,
y: verticalPreview ? 0 : -40, opacity: 0 },
animate: { x: 0, y: 0, opacity: 1 },
exit: { x: verticalPreview ? -40 : 0,
y: verticalPreview ? 0 : -40, opacity: 0 } }
const submenuVariants = {
enter: (direction: -1 | 1) => ({
x: verticalPreview ? direction * 24 : 0,
y: verticalPreview ? 0 : direction * 24, opacity: 0 }),
centre: { x: 0, y: 0, opacity: 1 },
exit: (direction: -1 | 1) => ({
x: verticalPreview ? (-direction) * 24 : 0,
y: verticalPreview ? 0 : (-direction) * 24, opacity: 0 }) }
const prevActiveIdxRef = useRef<number> (activeIdx) const prevActiveIdxRef = useRef<number> (activeIdx)
@@ -280,7 +299,8 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
let active = true let active = true
const update = () => { const update = () => {
if (!(window.matchMedia ('(min-width: 768px)').matches)) const desktopMedia = verticalPreview ? '(min-height: 768px)' : '(min-width: 768px)'
if (!(window.matchMedia (desktopMedia).matches))
{ {
setDesktop (false) setDesktop (false)
setDensity ('auto') setDensity ('auto')
@@ -297,16 +317,25 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
{ {
layout.setAttribute ('data-density', candidate) layout.setAttribute ('data-density', candidate)
const style = getComputedStyle (bar) const style = getComputedStyle (bar)
const primaryWidth = Math.max ( const primarySize =
primary.getBoundingClientRect ().width, primary.scrollWidth) verticalPreview
const accountWidth = ? Math.max (primary.getBoundingClientRect ().height, primary.scrollHeight)
: Math.max (primary.getBoundingClientRect ().width, primary.scrollWidth)
const accountSize =
account == null account == null
? 0 ? 0
: Math.max (account.getBoundingClientRect ().width, account.scrollWidth) : (verticalPreview
const required = primaryWidth + accountWidth ? Math.max (account.getBoundingClientRect ().height, account.scrollHeight)
+ parseFloat (style.paddingLeft) + parseFloat (style.paddingRight) : Math.max (account.getBoundingClientRect ().width, account.scrollWidth))
+ (account == null ? 0 : parseFloat (style.columnGap)) const padding =
if (Math.ceil (required) <= bar.clientWidth) verticalPreview
? parseFloat (style.paddingTop) + parseFloat (style.paddingBottom)
: parseFloat (style.paddingLeft) + parseFloat (style.paddingRight)
const gap = verticalPreview ? style.rowGap : style.columnGap
const required = primarySize + accountSize + padding
+ (account == null ? 0 : parseFloat (gap))
const available = verticalPreview ? bar.clientHeight : bar.clientWidth
if (Math.ceil (required) <= available)
return candidate return candidate
} }
return null return null
@@ -351,7 +380,8 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
removeEventListener ('resize', schedule) removeEventListener ('resize', schedule)
document.fonts?.removeEventListener ('loadingdone', schedule) document.fonts?.removeEventListener ('loadingdone', schedule)
} }
}, [activeIdx, moreVsbl, desktop, density, user?.name, locale, locales, menuLabels]) }, [activeIdx, moreVsbl, desktop, density, user?.name, locale, locales,
menuLabels, verticalPreview])
useEffect (() => { useEffect (() => {
if (desktop == null || layoutReady) if (desktop == null || layoutReady)
@@ -378,7 +408,8 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
measure (moreVsbl ? -1 : activeIdx) measure (moreVsbl ? -1 : activeIdx)
if (!(desktop)) if (!(desktop))
setMoreVsbl (false) setMoreVsbl (false)
}, [activeIdx, moreVsbl, desktop, density, locale, animationMode, menuLabels]) }, [activeIdx, moreVsbl, desktop, density, locale, animationMode,
menuLabels, verticalPreview])
useEffect (() => { useEffect (() => {
const unsubscribe = WikiIdBus.subscribe (setWikiId) const unsubscribe = WikiIdBus.subscribe (setWikiId)
@@ -392,6 +423,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
const update = () => { const update = () => {
setSubmenuHeight (Math.ceil (content.getBoundingClientRect ().height)) setSubmenuHeight (Math.ceil (content.getBoundingClientRect ().height))
setSubmenuWidth (Math.ceil (content.getBoundingClientRect ().width))
} }
const observer = const observer =
typeof ResizeObserver === 'undefined' ? null : new ResizeObserver (update) typeof ResizeObserver === 'undefined' ? null : new ResizeObserver (update)
@@ -403,7 +435,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
observer?.disconnect () observer?.disconnect ()
removeEventListener ('resize', update) removeEventListener ('resize', update)
} }
}, [activeIdx, moreVsbl, desktop, density, locale]) }, [activeIdx, moreVsbl, desktop, density, locale, verticalPreview])
useEffect (() => { useEffect (() => {
setMenuOpen (false) setMenuOpen (false)
@@ -415,17 +447,18 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
rounded px-1 focus-within:ring-2"> rounded px-1 focus-within:ring-2">
<Globe aria-hidden="true" size={16}/> <Globe aria-hidden="true" size={16}/>
<span className="top-nav-locale-name whitespace-nowrap text-sm"> <span className="top-nav-locale-name whitespace-nowrap text-sm">
<LocalisedText language={locale}>{localeName}</LocalisedText> <LocalisedText language={uiLocale}>{localeName}</LocalisedText>
</span> </span>
<select <select
aria-label={formatUIString (localeName ?? '', locale)} aria-label={formatUIString (localeName ?? '', uiLocale)}
value={locale} lang={uiLocale}
value={uiLocale}
disabled={switchingLocale} disabled={switchingLocale}
className="absolute inset-0 h-full w-full cursor-pointer opacity-0" className="absolute inset-0 h-full w-full cursor-pointer opacity-0"
onChange={async event => { onChange={async event => {
const nextLocale = event.target.value const nextLocale = event.target.value
if (isLocaleCode (nextLocale) if (isUILocaleCode (nextLocale)
&& locales.some (entry => entry.code === nextLocale)) && uiLocales.some (entry => entry.code === nextLocale))
{ {
const request = ++localeSwitchRequest.current const request = ++localeSwitchRequest.current
setSwitchingLocale (true) setSwitchingLocale (true)
@@ -450,8 +483,8 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
} }
} }
}}> }}>
{locales.map (entry => isLocaleCode (entry.code) && ( {uiLocales.map (entry => (
<option key={entry.code} value={entry.code}> <option key={entry.code} value={entry.code} lang={entry.code}>
{formatUIString (entry.name, entry.code)} {formatUIString (entry.name, entry.code)}
</option>))} </option>))}
</select> </select>
@@ -461,7 +494,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
<div ref={layoutRef} className="top-nav-layout w-full min-w-0 shrink-0" <div ref={layoutRef} className="top-nav-layout w-full min-w-0 shrink-0"
data-desktop={desktop ?? undefined} data-density={density} data-desktop={desktop ?? undefined} data-density={density}
data-layout-ready={layoutReady}> data-layout-ready={layoutReady}>
<nav ref={barRef} lang={uiMessageLanguage (locale, 'posts')} <nav ref={barRef} lang={uiMessageLanguage (uiLocale, 'posts')}
className="top-nav-root top-nav-bar flex justify-between items-center w-full"> className="top-nav-root top-nav-bar flex justify-between items-center w-full">
<div className="top-nav-primary flex shrink-0 items-center h-12"> <div className="top-nav-primary flex shrink-0 items-center h-12">
<PrefetchLink <PrefetchLink
@@ -479,8 +512,11 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
className={cn ('absolute inset-y-0 h-12', className={cn ('absolute inset-y-0 h-12',
'top-nav-highlight', 'top-nav-highlight',
highlightTransitionClass)} highlightTransitionClass)}
style={{ width: hl.width, style={{ width: verticalPreview ? '100%' : hl.width,
transform: `translateX(${ hl.left }px)`, height: verticalPreview ? hl.width : undefined,
transform: verticalPreview
? `translateY(${ hl.left }px)`
: `translateX(${ hl.left }px)`,
opacity: hl.visible ? 1 : 0 }}/> opacity: hl.visible ? 1 : 0 }}/>
{visibleMenu.map ((item, i) => ( {visibleMenu.map ((item, i) => (
@@ -554,7 +590,9 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
layout layout
className="top-nav-desktop-submenu relative z-20 shrink-0 className="top-nav-desktop-submenu relative z-20 shrink-0
overflow-hidden top-nav-submenu" overflow-hidden top-nav-submenu"
animate={{ height: desktop == null ? 'auto' : submenuHeight }} animate={verticalPreview && desktop
? { width: submenuWidth, height: '100%' }
: { width: 'auto', height: desktop == null ? 'auto' : submenuHeight }}
onMouseLeave={() => { onMouseLeave={() => {
if (moreVsbl) if (moreVsbl)
setMoreVsbl (false) setMoreVsbl (false)
@@ -566,7 +604,8 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
onLayoutAnimationComplete={() => { onLayoutAnimationComplete={() => {
measure (highlightTargetRef.current) measure (highlightTargetRef.current)
}}> }}>
<div ref={submenuContentRef} className={cn (moreVsbl && 'top-nav-more-menu')}> <div ref={submenuContentRef}
className={cn ('top-nav-submenu-content', moreVsbl && 'top-nav-more-menu')}>
{moreVsbl {moreVsbl
? ( ? (
moreMenu.map ((item, i) => ( moreMenu.map ((item, i) => (
@@ -576,9 +615,11 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
{...((item.visible ?? true) {...((item.visible ?? true)
? { layoutId: `menu-${ menu.indexOf (item) }` } ? { layoutId: `menu-${ menu.indexOf (item) }` }
: (animationsOff ? { } : (animationsOff ? { }
: { initial: { x: 40, y: -40, opacity: 0 }, : { initial: {
x: 40, y: verticalPreview ? 0 : -40, opacity: 0 },
animate: { x: 0, y: 0, opacity: 1 }, animate: { x: 0, y: 0, opacity: 1 },
exit: { x: 40, y: -40, opacity: 0 } }))} exit: {
x: 40, y: verticalPreview ? 0 : -40, opacity: 0 } }))}
onLayoutAnimationComplete={() => measure (highlightTargetRef.current)} onLayoutAnimationComplete={() => measure (highlightTargetRef.current)}
className="z-10 min-w-0 px-3 py-2 font-bold"> className="z-10 min-w-0 px-3 py-2 font-bold">
<h2> <h2>
@@ -599,10 +640,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
transition={topNavTransition} transition={topNavTransition}
{...(visibleMenu[activeIdx] === item {...(visibleMenu[activeIdx] === item
? { layoutId: `submenu-${ menu.indexOf (item) }-${ j }` } ? { layoutId: `submenu-${ menu.indexOf (item) }-${ j }` }
: (animationsOff ? { } : submenuItemMotion)}>
: { initial: { y: -40, opacity: 0 },
animate: { y: 0, opacity: 1 },
exit: { y: -40, opacity: 0 } }))}>
{subItem.component} {subItem.component}
</motion.div>) </motion.div>)
: ( : (
@@ -612,10 +650,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
transition={topNavTransition} transition={topNavTransition}
{...(visibleMenu[activeIdx] === item {...(visibleMenu[activeIdx] === item
? { layoutId: `submenu-${ menu.indexOf (item) }-${ j }` } ? { layoutId: `submenu-${ menu.indexOf (item) }-${ j }` }
: (animationsOff ? { } : submenuItemMotion)}>
: { initial: { y: -40, opacity: 0 },
animate: { y: 0, opacity: 1 },
exit: { y: -40, opacity: 0 } }))}>
<PrefetchLink <PrefetchLink
to={subItem.to} to={subItem.to}
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined} target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
@@ -633,7 +668,8 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
<div className="relative min-h-[40px]"> <div className="relative min-h-[40px]">
{animationsOff {animationsOff
? ( ? (
<div className="flex min-h-[40px] flex-wrap items-center px-3"> <div className="top-nav-submenu-items flex min-h-[40px]
flex-wrap items-center px-3">
{(visibleMenu[activeIdx]?.subMenu ?? []) {(visibleMenu[activeIdx]?.subMenu ?? [])
.filter (item => item.visible ?? true) .filter (item => item.visible ?? true)
.map ((item, i) => ( .map ((item, i) => (
@@ -662,10 +698,9 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
<motion.div <motion.div
key={activeIdx} key={activeIdx}
custom={dir} custom={dir}
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }), variants={submenuVariants}
centre: { y: 0, opacity: 1 }, className="top-nav-submenu-items relative flex min-h-[40px]
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }} flex-wrap items-center px-3"
className="relative flex min-h-[40px] flex-wrap items-center px-3"
initial="enter" initial="enter"
animate="centre" animate="centre"
exit="exit" exit="exit"
+1 -1
ファイルの表示
@@ -8,7 +8,7 @@ type Props = {
const Form: FC<Props> = ({ children, className }) => ( const Form: FC<Props> = ({ children, className }) => (
<div className={cn ('mx-auto max-w-xl space-y-4 p-4', className)}> <div className={cn ('form-layout mx-auto max-w-xl space-y-4 p-4', className)}>
{children} {children}
</div>) </div>)
+1 -1
ファイルの表示
@@ -61,7 +61,7 @@ const Pagination: FC<Props> = ({ page, totalPages, siblingCount = 3 }) => {
const pages = getPages (page, totalPages, siblingCount) const pages = getPages (page, totalPages, siblingCount)
return ( return (
<nav className="mt-4 flex justify-center" <nav className="pagination mt-4 flex justify-center"
lang={message ('pagination.label').language} lang={message ('pagination.label').language}
aria-label={message ('pagination.label').text}> aria-label={message ('pagination.label').text}>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
+1 -1
ファイルの表示
@@ -12,7 +12,7 @@ export default forwardRef<HTMLTextAreaElement, Props> (
<textarea <textarea
ref={ref} ref={ref}
aria-invalid={invalid} aria-invalid={invalid}
className={cn ('rounded border w-full p-2 h-32', className={cn ('rounded border [inline-size:100%] p-2 [block-size:8rem]',
(invalid (invalid
? ['border-red-500 bg-red-50 text-red-900', ? ['border-red-500 bg-red-50 text-red-900',
'focus:border-red-500 focus:outline-none focus:ring-2', 'focus:border-red-500 focus:outline-none focus:ring-2',
+58 -5
ファイルの表示
@@ -1,7 +1,10 @@
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import { useEffect, useRef } from 'react'
import { useLocation } from 'react-router-dom'
import { clientAnimationTransition } from '@/lib/clientAnimation' import { clientAnimationTransition } from '@/lib/clientAnimation'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings' import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { useVerticalPreview } from '@/lib/useLocale'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import type { FC, ReactNode } from 'react' import type { FC, ReactNode } from 'react'
@@ -9,21 +12,71 @@ import type { FC, ReactNode } from 'react'
type Props = { type Props = {
children: ReactNode children: ReactNode
className?: string className?: string
animateLayout?: boolean } animateLayout?: boolean
verticalContent?: boolean }
const MainArea: FC<Props> = ({ children, className, animateLayout = true }) => { const MainArea: FC<Props> = (
{ children, className, animateLayout = true, verticalContent = true },
) => {
const behaviourSettings = useClientBehaviourSettings () const behaviourSettings = useClientBehaviourSettings ()
const verticalPreview = useVerticalPreview ()
const horizontal = verticalPreview && verticalContent
const { pathname, search } = useLocation ()
const rootRef = useRef<HTMLElement | null> (null)
const animationMode = behaviourSettings.animation ?? 'normal' const animationMode = behaviourSettings.animation ?? 'normal'
const layoutTransition = clientAnimationTransition ( const layoutTransition = clientAnimationTransition (
animationMode, animationMode,
{ normal: { duration: .2, ease: 'easeOut' as const } }, { normal: { duration: .2, ease: 'easeOut' as const } })
)
useEffect (() => {
if (horizontal && rootRef.current != null)
rootRef.current.scrollLeft = 0
}, [horizontal, pathname, search])
useEffect (() => {
const root = rootRef.current
if (!horizontal || root == null)
return
const handleWheel = (event: WheelEvent) => {
if (event.ctrlKey || event.metaKey || event.shiftKey
|| event.deltaX !== 0 || event.deltaY === 0 || event.defaultPrevented)
return
// Nested tables, forms and code blocks retain their own scrolling.
let node = event.target instanceof HTMLElement ? event.target : null
while (node != null && node !== root)
{
if (node.matches ('input, select, textarea, [contenteditable="true"]'))
return
const style = getComputedStyle (node)
if ((/auto|scroll/.test (style.overflowY) && node.scrollHeight > node.clientHeight)
|| (/auto|scroll/.test (style.overflowX) && node.scrollWidth > node.clientWidth))
return
node = node.parentElement
}
const unit = event.deltaMode === 1 ? 16 : (event.deltaMode === 2 ? root.clientWidth : 1)
const delta = event.deltaY * unit
if ((delta < 0 && root.scrollLeft <= 0)
|| (delta > 0 && root.scrollLeft + root.clientWidth >= root.scrollWidth))
return
event.preventDefault ()
root.scrollLeft += delta
}
root.addEventListener ('wheel', handleWheel, { passive: false })
return () => root.removeEventListener ('wheel', handleWheel)
}, [horizontal])
return ( return (
<motion.main <motion.main
ref={rootRef}
data-vertical-content={horizontal || undefined}
tabIndex={horizontal ? 0 : undefined}
transition={{ layout: layoutTransition }} transition={{ layout: layoutTransition }}
className={cn ('flex-1 overflow-y-auto p-4', className)} className={cn ('main-area flex-1 overflow-y-auto p-4', className)}
layout={(animationMode === 'off' || !animateLayout) ? false : 'position'}> layout={(animationMode === 'off' || !animateLayout) ? false : 'position'}>
{children} {children}
</motion.main>) </motion.main>)
+126 -103
ファイルの表示
@@ -1,13 +1,14 @@
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import { useCallback, useEffect, useRef, useState } from 'react'
import { Helmet } from 'react-helmet-async' import { Helmet } from 'react-helmet-async'
import { clientAnimationTransition } from '@/lib/clientAnimation' import { clientAnimationTransition } from '@/lib/clientAnimation'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings' import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import { useVerticalPreview } from '@/lib/useLocale'
import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react' import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
import { useCallback, useEffect, useRef, useState } from 'react'
type SidebarSide = 'left' | 'right' type SidebarSide = 'left' | 'right'
@@ -23,12 +24,12 @@ type Props = {
type ResizeState = { type ResizeState = {
pointerId: number pointerId: number
startWidth: number startSize: number
startX: number startX: number
startY: number
verticalPreview: boolean
side: SidebarSide } side: SidebarSide }
type PendingPressState = ResizeState & { startY: number }
const DEFAULT_SIDEBAR_WIDTH = 256 const DEFAULT_SIDEBAR_WIDTH = 256
const MIN_SIDEBAR_WIDTH = 192 const MIN_SIDEBAR_WIDTH = 192
const MIN_MAIN_WIDTH = 360 const MIN_MAIN_WIDTH = 360
@@ -37,84 +38,97 @@ const LONG_PRESS_DELAY_MS = 350
const TOUCH_MOVE_THRESHOLD_PX = 8 const TOUCH_MOVE_THRESHOLD_PX = 8
const storageKeyForSidebar = (sidebarKey: string, side: SidebarSide): string => const storageKeyForSidebar = (
`sidebar:${ sidebarKey }:${ side }:width` sidebarKey: string,
side: SidebarSide,
verticalPreview = false,
): string =>
`sidebar:${ sidebarKey }:${ side }:${ verticalPreview ? 'height' : 'width' }`
const getSidebarMaxWidth = (containerWidth: number): number => { const getSidebarMaxWidth = (containerSize: number): number => {
const viewportWidth = const viewportWidth =
typeof window === 'undefined' ? containerWidth : window.innerWidth typeof window === 'undefined' ? containerSize : window.innerWidth
const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO) const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO)
const containerMaxWidth = Math.floor (containerWidth - MIN_MAIN_WIDTH) const containerMaxWidth = Math.floor (containerSize - MIN_MAIN_WIDTH)
const dynamicMaxWidth = Math.min (viewportMaxWidth, containerMaxWidth) const dynamicMaxWidth = Math.min (viewportMaxWidth, containerMaxWidth)
return Math.max (MIN_SIDEBAR_WIDTH, dynamicMaxWidth) return Math.max (MIN_SIDEBAR_WIDTH, dynamicMaxWidth)
} }
const readStoredSidebarWidth = ( const readStoredSidebarSize = (
sidebarKey: string, sidebarKey: string,
side: SidebarSide): number => { side: SidebarSide,
verticalPreview: boolean,
): number => {
if (typeof window === 'undefined') if (typeof window === 'undefined')
return DEFAULT_SIDEBAR_WIDTH return DEFAULT_SIDEBAR_WIDTH
const value = window.localStorage.getItem (storageKeyForSidebar (sidebarKey, side)) try
const width = value == null ? Number.NaN : Number (value) {
const value = window.localStorage.getItem (
return Number.isFinite (width) ? width : DEFAULT_SIDEBAR_WIDTH storageKeyForSidebar (sidebarKey, side, verticalPreview))
const size = value == null ? Number.NaN : Number (value)
return Number.isFinite (size) ? size : DEFAULT_SIDEBAR_WIDTH
}
catch
{
return DEFAULT_SIDEBAR_WIDTH
}
} }
const SidebarComponent: FC<Props> = ({ const SidebarComponent: FC<Props> = (
children, { children, className, maxWidth, maxWidthRatio, animateLayout = true,
className, onWidthChange, sidebarKey, side = 'left' },
maxWidth, ) => {
maxWidthRatio,
animateLayout = true,
onWidthChange,
sidebarKey,
side = 'left',
}) => {
const { message } = useUITranslation ('shared') const { message } = useUITranslation ('shared')
const behaviourSettings = useClientBehaviourSettings () const behaviourSettings = useClientBehaviourSettings ()
const verticalPreview = useVerticalPreview ()
const animationMode = behaviourSettings.animation ?? 'normal' const animationMode = behaviourSettings.animation ?? 'normal'
const layoutTransition = clientAnimationTransition ( const layoutTransition = clientAnimationTransition (
animationMode, animationMode,
{ normal: { duration: .2, ease: 'easeOut' as const } }, { normal: { duration: .2, ease: 'easeOut' as const } })
)
const rootRef = useRef<HTMLDivElement | null> (null) const rootRef = useRef<HTMLDivElement | null> (null)
const maxWidthRef = useRef (maxWidth) const maxWidthRef = useRef (maxWidth)
const maxWidthRatioRef = useRef (maxWidthRatio) const maxWidthRatioRef = useRef (maxWidthRatio)
const getContainerWidth = useCallback (() => { const getContainerSize = useCallback (() => {
const containerWidth = rootRef.current const container = rootRef.current?.closest ('[data-sidebar-container]')
?.closest ('[data-sidebar-container]') return verticalPreview
?.clientWidth ? container?.clientHeight ?? window.innerHeight
?? window.innerWidth : container?.clientWidth ?? window.innerWidth
return containerWidth }, [verticalPreview])
}, []) const getClampedSize = useCallback ((
const getClampedWidth = useCallback (( nextSize: number,
nextWidth: number, containerSize: number,
containerWidth: number): number => { ): number => {
if (verticalPreview)
{
const maximum = Math.max (64, Math.min (
window.innerHeight * .6, containerSize - 160))
return Math.min (maximum, Math.max (64, nextSize))
}
const viewportWidth = const viewportWidth =
typeof window === 'undefined' ? containerWidth : window.innerWidth typeof window === 'undefined' ? containerSize : window.innerWidth
const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO) const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO)
const ratioMaxWidth = maxWidthRatioRef.current == null const ratioMaxWidth = maxWidthRatioRef.current == null
? Infinity : Math.floor (containerWidth * maxWidthRatioRef.current) ? Infinity : Math.floor (containerSize * maxWidthRatioRef.current)
const configuredMaxWidth = maxWidthRef.current == null const configuredMaxWidth = maxWidthRef.current == null
? getSidebarMaxWidth (containerWidth) ? getSidebarMaxWidth (containerSize)
: Math.max (MIN_SIDEBAR_WIDTH, : Math.max (MIN_SIDEBAR_WIDTH,
Math.min (viewportMaxWidth, maxWidthRef.current)) Math.min (viewportMaxWidth, maxWidthRef.current))
const maxAllowedWidth = Math.max (MIN_SIDEBAR_WIDTH, const maxAllowedWidth = Math.max (MIN_SIDEBAR_WIDTH,
Math.min (ratioMaxWidth, configuredMaxWidth)) Math.min (ratioMaxWidth, configuredMaxWidth))
return Math.min (maxAllowedWidth, Math.max (MIN_SIDEBAR_WIDTH, nextWidth)) return Math.min (maxAllowedWidth, Math.max (MIN_SIDEBAR_WIDTH, nextSize))
}, []) }, [verticalPreview])
const [width, setWidth] = useState (DEFAULT_SIDEBAR_WIDTH) const [size, setSize] = useState (DEFAULT_SIDEBAR_WIDTH)
const [resizing, setResizing] = useState (false) const [resizing, setResizing] = useState (false)
const widthRef = useRef (width) const sizeRef = useRef (size)
const longPressTimerRef = useRef<ReturnType<typeof setTimeout> | null> (null) const longPressTimerRef = useRef<ReturnType<typeof setTimeout> | null> (null)
const pendingPressRef = useRef<PendingPressState | null> (null) const pendingPressRef = useRef<ResizeState | null> (null)
const resizeRef = useRef<ResizeState | null> (null) const resizeRef = useRef<ResizeState | null> (null)
const bodyStyleRef = useRef<{ cursor: string, userSelect: string } | null> (null) const bodyStyleRef = useRef<{ cursor: string, userSelect: string } | null> (null)
@@ -148,7 +162,7 @@ const SidebarComponent: FC<Props> = ({
userSelect: document.body.style.userSelect } userSelect: document.body.style.userSelect }
} }
document.body.style.cursor = 'col-resize' document.body.style.cursor = state.verticalPreview ? 'row-resize' : 'col-resize'
document.body.style.userSelect = 'none' document.body.style.userSelect = 'none'
}, [clearLongPressTimer]) }, [clearLongPressTimer])
@@ -159,43 +173,50 @@ const SidebarComponent: FC<Props> = ({
const state = resizeRef.current const state = resizeRef.current
resizeRef.current = null resizeRef.current = null
if (state != null) try
window.localStorage.setItem ( {
storageKeyForSidebar (sidebarKey, state.side), if (state != null)
String (widthRef.current)) window.localStorage.setItem (
storageKeyForSidebar (sidebarKey, state.side, state.verticalPreview),
String (sizeRef.current))
}
catch
{
// Resizing remains usable when browser storage is unavailable.
}
setResizing (false) setResizing (false)
restoreBodyStyle () restoreBodyStyle ()
}, [clearLongPressTimer, restoreBodyStyle, sidebarKey]) }, [clearLongPressTimer, restoreBodyStyle, sidebarKey])
const applyWidth = useCallback ((nextWidth: number) => { const applySize = useCallback ((nextSize: number) => {
if (nextWidth === widthRef.current) if (nextSize === sizeRef.current)
return return
widthRef.current = nextWidth sizeRef.current = nextSize
setWidth (nextWidth) setSize (nextSize)
}, []) }, [])
useEffect (() => { useEffect (() => {
maxWidthRef.current = maxWidth maxWidthRef.current = maxWidth
maxWidthRatioRef.current = maxWidthRatio maxWidthRatioRef.current = maxWidthRatio
const containerWidth = getContainerWidth () const containerSize = getContainerSize ()
const nextWidth = getClampedWidth (widthRef.current, containerWidth) const nextSize = getClampedSize (sizeRef.current, containerSize)
applyWidth (nextWidth) applySize (nextSize)
}, [applyWidth, getClampedWidth, getContainerWidth, maxWidth, maxWidthRatio]) }, [applySize, getClampedSize, getContainerSize, maxWidth, maxWidthRatio])
const updateWidth = useCallback ((clientX: number) => { const updateSize = useCallback ((clientX: number, clientY: number) => {
const state = resizeRef.current const state = resizeRef.current
if (state == null) if (state == null)
return return
const containerWidth = getContainerWidth () const containerSize = getContainerSize ()
const delta = state.side === 'left' const delta = state.verticalPreview
? clientX - state.startX ? clientY - state.startY
: state.startX - clientX : (state.side === 'left' ? clientX - state.startX : state.startX - clientX)
const nextWidth = getClampedWidth (state.startWidth + delta, containerWidth) const nextSize = getClampedSize (state.startSize + delta, containerSize)
applyWidth (nextWidth) applySize (nextSize)
}, [applyWidth, getClampedWidth, getContainerWidth]) }, [applySize, getClampedSize, getContainerSize])
const handlePointerDown = (ev: PointerEvent<HTMLDivElement>) => { const handlePointerDown = (ev: PointerEvent<HTMLDivElement>) => {
if (ev.pointerType !== 'mouse' && ev.pointerType !== 'touch') if (ev.pointerType !== 'mouse' && ev.pointerType !== 'touch')
@@ -211,8 +232,10 @@ const SidebarComponent: FC<Props> = ({
const state = { const state = {
pointerId: ev.pointerId, pointerId: ev.pointerId,
side, side,
startWidth: widthRef.current, startSize: sizeRef.current,
startX: ev.clientX } startX: ev.clientX,
startY: ev.clientY,
verticalPreview }
if (ev.pointerType === 'mouse') if (ev.pointerType === 'mouse')
{ {
@@ -220,7 +243,7 @@ const SidebarComponent: FC<Props> = ({
return return
} }
pendingPressRef.current = { ...state, startY: ev.clientY } pendingPressRef.current = state
clearLongPressTimer () clearLongPressTimer ()
longPressTimerRef.current = setTimeout (() => { longPressTimerRef.current = setTimeout (() => {
if (pendingPressRef.current != null) if (pendingPressRef.current != null)
@@ -234,7 +257,7 @@ const SidebarComponent: FC<Props> = ({
if (resizeRef.current != null) if (resizeRef.current != null)
{ {
ev.preventDefault () ev.preventDefault ()
updateWidth (ev.clientX) updateSize (ev.clientX, ev.clientY)
return return
} }
@@ -262,58 +285,58 @@ const SidebarComponent: FC<Props> = ({
finishResize () finishResize ()
} }
const resetWidth = useCallback (() => { const resetSize = useCallback (() => {
const containerWidth = getContainerWidth () const containerSize = getContainerSize ()
const nextWidth = getClampedWidth (DEFAULT_SIDEBAR_WIDTH, containerWidth) const nextSize = getClampedSize (DEFAULT_SIDEBAR_WIDTH, containerSize)
applyWidth (nextWidth) applySize (nextSize)
window.localStorage.removeItem (storageKeyForSidebar (sidebarKey, side)) window.localStorage.removeItem (
}, [applyWidth, getClampedWidth, getContainerWidth, sidebarKey, side]) storageKeyForSidebar (sidebarKey, side, verticalPreview))
}, [applySize, getClampedSize, getContainerSize, sidebarKey, side, verticalPreview])
const handleDoubleClick = (ev: MouseEvent<HTMLDivElement>) => { const handleDoubleClick = (ev: MouseEvent<HTMLDivElement>) => {
ev.preventDefault () ev.preventDefault ()
ev.stopPropagation () ev.stopPropagation ()
resetWidth () resetSize ()
} }
useEffect (() => { useEffect (() => {
const containerWidth = getContainerWidth () const containerSize = getContainerSize ()
const nextWidth = getClampedWidth ( const nextSize = getClampedSize (
readStoredSidebarWidth (sidebarKey, side), readStoredSidebarSize (sidebarKey, side, verticalPreview),
containerWidth) containerSize)
applyWidth (nextWidth) applySize (nextSize)
}, [applyWidth, getClampedWidth, getContainerWidth, sidebarKey, side]) }, [applySize, getClampedSize, getContainerSize, sidebarKey, side, verticalPreview])
useEffect (() => { useEffect (() => {
const containerWidth = getContainerWidth () const containerSize = getContainerSize ()
const nextWidth = getClampedWidth (widthRef.current, containerWidth) const nextSize = getClampedSize (sizeRef.current, containerSize)
applyWidth (nextWidth) applySize (nextSize)
}, [applyWidth, getClampedWidth, getContainerWidth]) }, [applySize, getClampedSize, getContainerSize])
useEffect (() => { useEffect (() => {
if (typeof window === 'undefined') if (typeof window === 'undefined')
return return
const handleResize = () => { const handleResize = () => {
const containerWidth = getContainerWidth () const containerSize = getContainerSize ()
const nextWidth = getClampedWidth (widthRef.current, containerWidth) const nextSize = getClampedSize (sizeRef.current, containerSize)
applyWidth (nextWidth) applySize (nextSize)
} }
window.addEventListener ('resize', handleResize) window.addEventListener ('resize', handleResize)
return () => window.removeEventListener ('resize', handleResize) return () => window.removeEventListener ('resize', handleResize)
}, [applyWidth, getClampedWidth, getContainerWidth]) }, [applySize, getClampedSize, getContainerSize])
useEffect (() => { useEffect (() => {
onWidthChange?.(width) if (!verticalPreview)
}, [onWidthChange, width]) onWidthChange?.(size)
}, [onWidthChange, size, verticalPreview])
useEffect (() => () => { useEffect (() => () => finishResize (), [finishResize, verticalPreview])
clearLongPressTimer ()
restoreBodyStyle ()
}, [clearLongPressTimer, restoreBodyStyle])
const style = { const style = {
'--sidebar-width': `${ width }px` } as CSSProperties '--sidebar-width': `${ size }px`,
'--sidebar-height': `${ size }px` } as CSSProperties
return ( return (
<motion.div <motion.div
@@ -322,7 +345,7 @@ const SidebarComponent: FC<Props> = ({
transition={{ layout: layoutTransition }} transition={{ layout: layoutTransition }}
style={style} style={style}
className={cn ( className={cn (
'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full', 'sidebar-panel relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
className)}> className)}>
<Helmet> <Helmet>
<style> <style>
@@ -345,16 +368,16 @@ const SidebarComponent: FC<Props> = ({
<div <div
role="separator" role="separator"
aria-orientation="vertical" aria-orientation={verticalPreview ? 'horizontal' : 'vertical'}
aria-label={message ('sidebarWidth').text} aria-label={message (verticalPreview ? 'labels.menu' : 'sidebarWidth').text}
lang={message ('sidebarWidth').language} lang={message (verticalPreview ? 'labels.menu' : 'sidebarWidth').language}
onPointerDown={handlePointerDown} onPointerDown={handlePointerDown}
onPointerMove={handlePointerMove} onPointerMove={handlePointerMove}
onPointerUp={handlePointerEnd} onPointerUp={handlePointerEnd}
onPointerCancel={handlePointerEnd} onPointerCancel={handlePointerEnd}
onDoubleClick={handleDoubleClick} onDoubleClick={handleDoubleClick}
className={cn ( className={cn (
'hidden md:block absolute top-0 bottom-0 z-20 w-4 cursor-col-resize', 'sidebar-resize hidden md:block absolute top-0 bottom-0 z-20 w-4 cursor-col-resize',
'touch-none select-none', 'touch-none select-none',
side === 'left' ? '-right-2' : '-left-2', side === 'left' ? '-right-2' : '-left-2',
'before:absolute before:top-0 before:bottom-0 before:w-px', 'before:absolute before:top-0 before:bottom-0 before:w-px',
+4 -4
ファイルの表示
@@ -32,10 +32,10 @@ const buttonVariants = cva (
link: link:
'text-blue-700 underline-offset-4 hover:underline dark:text-blue-300'}, 'text-blue-700 underline-offset-4 hover:underline dark:text-blue-300'},
size: { size: {
default: 'h-10 px-4 py-2', default: '[block-size:2.5rem] [padding-inline:1rem] [padding-block:.5rem]',
sm: 'h-9 rounded-md px-3', sm: '[block-size:2.25rem] rounded-md [padding-inline:.75rem]',
lg: 'h-11 rounded-md px-8', lg: '[block-size:2.75rem] rounded-md [padding-inline:2rem]',
icon: 'h-10 w-10'}}, icon: '[block-size:2.5rem] [inline-size:2.5rem]'}},
defaultVariants: { defaultVariants: {
variant: 'default', variant: 'default',
size: 'default'}}) size: 'default'}})
+5 -3
ファイルの表示
@@ -60,12 +60,14 @@ const InheritDialogue: FC<Props> = ({ visible, onVisibleChange, setUser }) => {
return ( return (
<Dialog open={visible} onOpenChange={onVisibleChange}> <Dialog open={visible} onOpenChange={onVisibleChange}>
<DialogContent className="px-6 pp-6 pt-7" closeLabel={label ('actions.close')}> <DialogContent className="inheritance-dialogue px-6 pb-6 pt-7"
closeLabel={label ('actions.close')}>
<DialogHeader className="pl-8"> <DialogHeader className="pl-8">
<DialogTitle>{label ('account.inherit')}</DialogTitle> <DialogTitle>{label ('account.inherit')}</DialogTitle>
<DialogDescription asChild> <DialogDescription asChild>
<div className="flex gap-2"> <div className="inheritance-dialogue-fields flex gap-2">
<Input placeholder={message ('transfer.placeholder').text} <Input className="inheritance-code"
placeholder={message ('transfer.placeholder').text}
aria-label={message ('transfer.placeholder').text} aria-label={message ('transfer.placeholder').text}
lang={message ('transfer.placeholder').language} lang={message ('transfer.placeholder').language}
value={inputCode} value={inputCode}
+1 -1
ファイルの表示
@@ -60,7 +60,7 @@ const UserCodeDialogue: FC<Props> = ({ visible, onVisibleChange, user, setUser }
<DialogDescription asChild> <DialogDescription asChild>
<div> <div>
<p>{label ('userCode.description')}</p> <p>{label ('userCode.description')}</p>
<div className="m-2">{user?.inheritanceCode}</div> <div className="inheritance-code m-2">{user?.inheritanceCode}</div>
<p className="mt-1 text-sm text-destructive"> <p className="mt-1 text-sm text-destructive">
{label ('userCode.secretWarning')} {label ('userCode.secretWarning')}
</p> </p>
+9
ファイルの表示
@@ -0,0 +1,9 @@
import { describe, expect, it } from 'vitest'
import { API_BASE_URL } from '@/config'
describe ('test API configuration', () => {
it ('resolves the sample configuration without a local config file', () => {
expect (API_BASE_URL).toBe ('/api')
})
})
+11 -6
ファイルの表示
@@ -9,7 +9,8 @@ import { createStaticHandler, createStaticRouter,
import { AppFrame, appRoutes, resolvePageRoute } from '@/App' import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
import { apiGet, isApiError } from '@/lib/api' import { apiGet, isApiError } from '@/lib/api'
import { createUII18n } from '@/lib/i18n' import { createUII18n } from '@/lib/i18n'
import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales' import { fetchLocales, isLocaleCode, isVerticalPreviewPath,
legacyLocalePath, uiLocaleFromPath } from '@/lib/locales'
import { localesKeys, sessionKeys } from '@/lib/queryKeys' import { localesKeys, sessionKeys } from '@/lib/queryKeys'
import { withRenderContext } from '@/lib/renderContext.server' import { withRenderContext } from '@/lib/renderContext.server'
@@ -72,13 +73,16 @@ export const render = async (
pathname => resolvePageRoute (pathname) != null) pathname => resolvePageRoute (pathname) != null)
const pathname = legacy == null ? url.pathname : new URL (legacy, origin).pathname const pathname = legacy == null ? url.pathname : new URL (legacy, origin).pathname
const segment = pathname.split ('/')[1] const segment = pathname.split ('/')[1]
const verticalPreview = isVerticalPreviewPath (pathname)
const known = resolvePageRoute (pathname) const known = resolvePageRoute (pathname)
if (legacy != null && known != null) if (legacy != null && known != null)
return { status: 308, location: legacy } return { status: 308, location: legacy }
const locale = isLocaleCode (segment) ? segment : 'ja' const locale = isLocaleCode (segment) ? segment : 'ja'
const uiLocale = uiLocaleFromPath (pathname)
const routePrefix = verticalPreview ? 'mn-Mong' : locale
if (known?.route.handle?.redirectTo != null) if (known?.route.handle?.redirectTo != null)
return { status: 308, return { status: 308,
location: `/${locale}${known.route.handle.redirectTo}${url.search}` } location: `/${routePrefix}${known.route.handle.redirectTo}${url.search}` }
const requestContext: RenderContext & { status: number } = { const requestContext: RenderContext & { status: number } = {
pathname: url.pathname, origin, apiBaseURL, pathname: url.pathname, origin, apiBaseURL,
...authentication, status: 200 } ...authentication, status: 200 }
@@ -106,14 +110,15 @@ export const render = async (
} }
} }
const prepare = known?.route.handle?.prepare const prepare = known?.route.handle?.prepare
let status = known == null || !active || !isLocaleCode (segment) ? 404 : 200 const routeLocaleValid = isLocaleCode (segment) || verticalPreview
let status = known == null || !active || !routeLocaleValid ? 404 : 200
if (status === 200 && known?.route.handle?.authentication != null if (status === 200 && known?.route.handle?.authentication != null
&& client.getQueryData (sessionKeys.current) == null) && client.getQueryData (sessionKeys.current) == null)
status = 401 status = 401
if (prepare != null && known != null && status === 200) if (prepare != null && known != null && status === 200)
status = await prepare ({ client, params: known.params, locale, status = await prepare ({ client, params: known.params, locale,
searchParams: url.searchParams }) searchParams: url.searchParams })
const instance = createUII18n (locale) const instance = createUII18n (uiLocale)
const handler = createStaticHandler (appRoutes) const handler = createStaticHandler (appRoutes)
const context = await handler.query (new Request (url)) const context = await handler.query (new Request (url))
if (context instanceof Response) if (context instanceof Response)
@@ -183,11 +188,11 @@ export const render = async (
isAxiosError: true, response: { isAxiosError: true, response: {
status: isApiError (query.state.error) ? query.state.error.response?.status : 500 } } } status: isApiError (query.state.error) ? query.state.error.response?.status : 500 } } }
})) } })) }
const bootstrap = JSON.stringify ({ state, status, locale, const bootstrap = JSON.stringify ({ state, status, locale: uiLocale,
url: url.pathname + url.search }) url: url.pathname + url.search })
.replace (/</g, '\\u003c').replace (/\u2028/g, '\\u2028') .replace (/</g, '\\u003c').replace (/\u2028/g, '\\u2028')
.replace (/\u2029/g, '\\u2029') .replace (/\u2029/g, '\\u2029')
return { status, html, head, locale, bootstrap, return { status, html, head, locale: uiLocale, bootstrap,
setCookies: requestContext.setCookies } setCookies: requestContext.setCookies }
} }
finally finally
+840
ファイルの表示
@@ -625,3 +625,843 @@ body
white-space: nowrap; white-space: nowrap;
will-change: transform; will-change: transform;
} }
/* Locally hosted Mongolian font; the OFL accompanies the font file. */
@font-face
{
font-family: 'BTRC Mongolian';
src: url('/fonts/noto-sans-mongolian/NotoSansMongolian-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
font-display: swap;
}
/* Mongolian flows down each line, then into the next column on the right. */
:lang(mn-Mong)
{
font-family: 'BTRC Mongolian', 'Mongolian Baiti', 'Noto Sans JP Variable', sans-serif;
}
/* Include portalled dialogues and toasts, and controls with UA writing modes. */
html:lang(mn-Mong) body > :not(#root),
html:lang(mn-Mong) #root > :not(.app-layout),
html:lang(mn-Mong) :is(button, input, select, textarea),
[data-vertical-preview] :is(
.main-area:not(.posts-main-area, .tags-main-area, .wiki-main-area),
.sidebar > *, .tag-list-filter, .post-list > *,
.top-nav-brand-link, .top-nav-menu-link,
.top-nav-user-desktop, .top-nav-user-mobile, .top-nav-mobile-menu)
{
writing-mode: vertical-lr;
text-orientation: mixed;
}
/* Existing Japanese vertical decorations must also advance to the right. */
html:lang(mn-Mong) [style*='writing-mode']
{
writing-mode: vertical-lr !important;
}
/* Inline alignment turns left/right into top/bottom; flex cross alignment
and table vertical-align already follow the vertical writing mode. */
html:lang(mn-Mong) .text-left
{
text-align: start;
}
html:lang(mn-Mong) .text-right
{
text-align: end;
}
[data-vertical-preview]
{
min-width: 0;
min-height: 0;
overflow: hidden;
}
[data-vertical-preview] > :not(.top-nav-layout)
{
flex: 1;
min-width: 0;
min-height: 0;
overflow: auto;
}
[data-vertical-preview] [data-sidebar-container]
{
display: flex;
flex-direction: column;
min-width: 0;
min-height: 0;
overflow: hidden;
}
[data-vertical-preview] .main-area
{
min-width: 0;
min-height: 0;
overscroll-behavior: contain;
}
[data-vertical-preview] .main-area[data-vertical-content]
{
overflow-x: auto;
overflow-y: hidden;
overscroll-behavior-x: contain;
}
/* Specialised lists below retain their own grid and table layouts. */
[data-vertical-preview] .main-area[data-vertical-content]:not(
.posts-main-area, .tags-main-area, .wiki-main-area)
{
writing-mode: vertical-lr;
text-orientation: mixed;
text-align: start;
overflow-y: auto;
}
[data-vertical-preview] .main-area[data-vertical-content]:not(
.posts-main-area, .tags-main-area, .wiki-main-area) > :is(div, article, section)
{
max-width: none;
max-inline-size: 100%;
}
[data-vertical-preview] .main-area[data-vertical-content] .prose
{
max-width: none;
max-inline-size: 100%;
}
/* Input and data widgets retain nested scrolling in the vertical text flow. */
[data-vertical-preview] .main-area[data-vertical-content] :is(
form, .form-layout, pre, .overflow-x-auto, .rc-md-editor, .not-prose)
{
writing-mode: vertical-lr;
text-orientation: mixed;
max-height: 100%;
overflow: auto;
}
[data-vertical-preview] .main-area[data-vertical-content] :is(form, .form-layout)
{
width: auto;
inline-size: min(36rem, 100%);
}
[data-vertical-preview] .main-area[data-vertical-content] form.space-y-2
{
display: flex;
flex-direction: column;
align-items: flex-start;
gap: .75rem;
}
[data-vertical-preview] .main-area[data-vertical-content] form.space-y-2 > *
{
flex: none;
margin: 0;
}
[data-vertical-preview] .main-area[data-vertical-content] form label.block
{
margin: 0;
margin-block-end: .25rem;
}
[data-vertical-preview] .main-area[data-vertical-content] form.space-y-2
> :has(> input[type='checkbox'])
{
display: flex;
align-items: center;
gap: .5rem;
}
[data-vertical-preview] .main-area[data-vertical-content] form.space-y-2
> :has(> input[type='checkbox']) > label
{
margin: 0;
}
[data-vertical-preview] :where(.main-area[data-vertical-content]) :is(
button, input, select, textarea, code, time, table)
{
writing-mode: vertical-lr;
}
[data-vertical-preview] .main-area[data-vertical-content] :is(img, video, iframe, canvas)
{
max-height: 100%;
object-fit: contain;
}
/* Keep the URL source horizontal even in the vertical page flow. */
[data-vertical-preview] .main-area[data-vertical-content] .post-import-source textarea
{
writing-mode: horizontal-tb;
width: min(36rem, 65vw);
height: min(32rem, 70dvh);
inline-size: min(36rem, 65vw);
block-size: min(32rem, 70dvh);
}
[data-vertical-preview] .main-area .post-search-form
{
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 1rem;
inline-size: 100%;
}
[data-vertical-preview] .post-search-form > :not([hidden])
{
flex: none;
margin: 0;
width: auto;
}
[data-vertical-preview] .post-search-form label.block
{
margin: 0;
margin-block-end: .5rem;
}
[data-vertical-preview] .post-search-form input[type='text']
{
width: auto;
inline-size: min(24rem, 100%);
}
[data-vertical-preview] .post-search-form fieldset
{
width: auto;
margin: 0;
}
[data-vertical-preview] .post-search-form input[type='datetime-local']
{
inline-size: 13rem;
}
[data-vertical-preview] .main-area.post-import-review
{
padding-bottom: 1rem;
}
[data-vertical-preview] .post-import-review :is(.space-y-6, .space-y-3) > *
{
margin-top: 0;
margin-bottom: 0;
margin-block-end: 1rem;
}
[data-vertical-preview] > .post-import-footer
{
flex: none;
writing-mode: vertical-lr;
overflow: auto;
border-top: 0;
border-left-width: 1px;
}
[data-vertical-preview] .post-import-footer > div
{
height: 100%;
max-width: none;
flex-direction: column;
align-items: stretch;
}
[data-vertical-preview] .post-import-footer > div > :first-child
{
align-items: flex-start;
}
[data-vertical-preview] .post-import-footer > div > :last-child
{
flex-direction: row-reverse;
justify-content: space-between;
}
[data-vertical-preview] .post-import-footer button
{
width: auto;
}
[data-vertical-preview] .tag-tree-arrow
{
display: inline-block;
writing-mode: horizontal-tb;
transform: rotate(-90deg) scaleX(-1);
}
[data-vertical-preview] .sidebar-panel
{
width: 100%;
height: var(--sidebar-height);
min-height: 0;
flex: none;
}
/* Mirror the scroll box and its contents to put its scrollbar above the tags. */
[data-vertical-preview] .sidebar
{
display: flex;
align-items: flex-end;
gap: 1rem;
direction: ltr;
transform: scaleY(-1);
overflow-x: auto;
overflow-y: hidden;
overscroll-behavior: contain;
}
[data-vertical-preview] .sidebar > *
{
flex-shrink: 0;
transform: scaleY(-1);
}
[data-vertical-preview] .sidebar > form
{
writing-mode: vertical-lr;
text-orientation: mixed;
display: block;
width: auto;
height: 100%;
}
[data-vertical-preview] .sidebar > form > input[type='text']
{
writing-mode: vertical-lr;
text-orientation: mixed;
width: auto;
height: 100%;
min-height: 0;
padding: .75rem .5rem;
}
[data-vertical-preview] .sidebar > form > .tag-search-suggestions
{
inset: auto;
inset-inline-start: 0;
inset-block-start: 100%;
width: auto;
inline-size: 100%;
max-block-size: min(16rem, 75vw);
margin: 0;
overflow: auto;
}
[data-vertical-preview] .sidebar > div
{
writing-mode: vertical-lr;
text-orientation: mixed;
height: 100%;
margin: 0;
}
[data-vertical-preview] .sidebar :is(h2, h3, ul)
{
margin: 0;
margin-block-end: 1rem;
}
[data-vertical-preview] .sidebar-resize
{
display: block;
inset: auto 0 -.5rem;
width: 100%;
height: 1rem;
cursor: row-resize;
}
[data-vertical-preview] .sidebar-resize::before
{
inset: 50% 0 auto;
width: 100%;
height: 1px;
}
[data-vertical-preview] .top-nav-locale-name:has(:lang(mn-Mong))
{
display: inline;
writing-mode: vertical-lr;
text-orientation: mixed;
font-size: 1.25rem;
line-height: 1.5;
flex-shrink: 0;
}
[data-vertical-preview] .top-nav-menu-link:has(.top-nav-locale-name)
{
height: auto;
min-height: 2rem;
}
/* The post grid fills each column downwards before continuing to the right. */
[data-vertical-preview] .posts-main-area > div
{
display: flex;
height: 100%;
width: max-content;
margin: 0;
gap: 1rem;
}
[data-vertical-preview] .posts-main-area > div > div:first-child
{
flex: none;
flex-direction: row;
justify-content: space-between;
height: 100%;
writing-mode: vertical-lr;
text-orientation: mixed;
}
[data-vertical-preview] .posts-main-area > div > div:last-child
{
display: flex;
width: max-content;
height: 100%;
margin: 0;
gap: 1rem;
}
[data-vertical-preview] .main-area[data-vertical-content] .post-list
{
display: grid;
grid-auto-flow: column;
grid-auto-columns: 10rem;
grid-template-rows: repeat(auto-fill, min(10rem, 100%));
flex: none;
width: max-content;
height: 100%;
writing-mode: horizontal-tb;
}
[data-vertical-preview] .main-area[data-vertical-content] .post-list > a
{
height: 100%;
}
[data-vertical-preview] .main-area[data-vertical-content] nav
{
flex: none;
align-self: flex-start;
margin: 0;
writing-mode: vertical-lr;
}
[data-vertical-preview] .main-area[data-vertical-content] .pagination
{
align-self: stretch;
inline-size: 100%;
}
[data-vertical-preview] .tags-main-area
{
display: flex;
align-items: stretch;
gap: 1.5rem;
}
[data-vertical-preview] .tag-list-filter
{
flex: none;
width: auto;
inline-size: 100%;
max-inline-size: none;
overflow: visible;
}
[data-vertical-preview] .tag-list-filter > div
{
align-items: flex-start;
justify-content: flex-start;
flex-wrap: nowrap;
gap: 1rem;
}
[data-vertical-preview] .main-area .tag-list-filter form.space-y-2
{
inline-size: auto;
max-height: none;
overflow: visible;
}
[data-vertical-preview] .tag-list-filter input[type='datetime-local']
{
inline-size: 13rem;
}
@media (min-width: 768px)
{
[data-vertical-preview] .tag-list-filter form > div
{
white-space: nowrap;
}
}
html:lang(mn-Mong) .inheritance-code
{
writing-mode: horizontal-tb;
}
html:lang(mn-Mong) .inheritance-dialogue
{
width: auto;
max-width: calc(100vw - 2rem);
inline-size: min(32rem, calc(100dvh - 2rem));
block-size: fit-content;
}
html:lang(mn-Mong) .inheritance-dialogue-fields
{
writing-mode: horizontal-tb;
flex-direction: column;
justify-content: space-between;
width: min(16rem, calc(100vw - 8rem));
height: 100%;
min-height: 0;
}
html:lang(mn-Mong) .inheritance-dialogue-fields > button
{
align-self: flex-end;
}
[data-vertical-preview] .tag-list-filter h1
{
writing-mode: vertical-lr;
text-orientation: mixed;
max-height: 8rem;
margin-block: 0;
}
[data-vertical-preview] .tag-list-filter input[type='number']
{
max-inline-size: 7rem;
}
[data-vertical-preview] .tag-list-results
{
display: flex;
flex: none;
gap: 1rem;
max-width: none;
margin: 0;
}
[data-vertical-preview] .tag-list-table
{
max-width: none;
overflow-x: visible;
overflow-y: auto;
}
[data-vertical-preview] .tag-list-table table
{
writing-mode: vertical-lr;
text-orientation: mixed;
inline-size: max-content;
block-size: max-content;
min-width: 0;
}
[data-vertical-preview] .tag-list-table col
{
width: auto;
}
[data-vertical-preview] .tag-list-table :is(th, td)
{
min-inline-size: 2rem;
max-inline-size: 16rem;
}
[data-vertical-preview] .tag-list-table thead
{
border-bottom: 0;
border-block-end: 2px solid currentColor;
}
[data-vertical-preview] .tag-list-table td:nth-child(2),
[data-vertical-preview] .tag-list-table time
{
writing-mode: vertical-lr;
white-space: nowrap;
}
[data-vertical-preview] :is(.sidebar, .tag-list-table, .wiki-main-area) .tag-marquee,
[data-vertical-preview] :is(.sidebar, .tag-list-table, .wiki-main-area) .tag-marquee__static
{
white-space: normal;
overflow: visible;
text-overflow: clip;
max-inline-size: 16rem;
opacity: 1;
}
[data-vertical-preview] :is(.sidebar, .tag-list-table, .wiki-main-area) .tag-marquee__animated
{
display: none;
}
/* Prose flows through the viewport height and grows into columns on the right. */
[data-vertical-preview] .wiki-main-area
{
display: flex;
gap: 1rem;
}
[data-vertical-preview] .wiki-main-area > div
{
flex: none;
writing-mode: vertical-lr;
text-orientation: mixed;
margin: 0;
}
[data-vertical-preview] .wiki-main-area > div > span
{
writing-mode: vertical-lr;
}
[data-vertical-preview] .wiki-main-area article,
[data-vertical-preview] .posts-main-area .localised-document
{
writing-mode: vertical-lr;
text-orientation: mixed;
inline-size: 100%;
block-size: max-content;
max-width: none;
margin: 0;
flex: none;
}
[data-vertical-preview] .main-area[data-vertical-content] .localised-document
{
max-width: none;
overflow: visible;
}
[data-vertical-preview] .wiki-main-area article :is(h1, h2, h3, h4, p, ul, ol, blockquote)
{
margin: 0;
margin-block: 1em;
}
[data-vertical-preview] .wiki-main-area article :is(ul, ol)
{
padding: 0;
padding-inline-start: 1.5em;
}
[data-vertical-preview] .wiki-main-area article :is(img, video, iframe, svg)
{
writing-mode: horizontal-tb;
max-height: 100%;
max-width: none;
object-fit: contain;
}
[data-vertical-preview] .wiki-main-area article :is(pre, table, .not-prose),
[data-vertical-preview] .main-area[data-vertical-content] :is(code, time, input, select, textarea)
{
writing-mode: vertical-lr;
text-orientation: mixed;
}
[data-vertical-preview] .wiki-main-area article :is(pre, table, .not-prose)
{
display: inline-block;
max-height: 100%;
max-width: min(48rem, 80vw);
overflow: auto;
vertical-align: top;
}
[data-vertical-preview] .wiki-main-area article .not-prose
{
width: max-content;
height: 100%;
}
[data-vertical-preview] .wiki-main-area .not-prose > div
{
display: flex;
flex-direction: column;
height: 100%;
margin: 0;
}
[data-vertical-preview] .wiki-main-area .not-prose > div > div:last-child
{
flex: 1;
min-height: 0;
}
@media (min-width: 768px)
{
[data-vertical-preview].app-layout
{
flex-direction: row;
}
[data-vertical-preview] .top-nav-layout
{
display: flex;
width: max-content;
height: 100%;
}
[data-vertical-preview] .top-nav-bar
{
flex-direction: column;
flex: none;
width: 3.5rem;
height: 100%;
padding: .5rem 0;
gap: .5rem;
}
[data-vertical-preview] .top-nav-primary
{
flex-direction: column;
flex: 1;
min-height: 0;
width: 100%;
height: auto;
overflow: hidden;
}
[data-vertical-preview] .top-nav-brand-link
{
writing-mode: vertical-lr;
text-orientation: mixed;
max-height: none;
white-space: nowrap;
margin-block: .5rem;
}
[data-vertical-preview] .top-nav-desktop-menu
{
flex-direction: column;
width: 100%;
height: auto;
}
[data-vertical-preview] .top-nav-layout[data-measuring] .top-nav-primary,
[data-vertical-preview] .top-nav-layout[data-measuring] .top-nav-desktop-menu,
[data-vertical-preview] .top-nav-layout[data-measuring] .top-nav-account
{
flex: 0 0 auto;
width: 100%;
height: max-content;
max-height: none;
}
[data-vertical-preview] .top-nav-desktop-menu > div:not(.top-nav-highlight)
{
width: 100%;
}
[data-vertical-preview] .top-nav-desktop-menu .top-nav-menu-link
{
justify-content: center;
width: 100%;
min-height: 3rem;
height: auto;
padding: .5rem;
}
[data-vertical-preview] .top-nav-menu-link > :not(svg, select),
[data-vertical-preview] .top-nav-more-menu h2
{
writing-mode: vertical-lr;
text-orientation: mixed;
max-height: none;
white-space: nowrap;
}
[data-vertical-preview] .top-nav-highlight
{
inset-inline-start: 0;
}
[data-vertical-preview] .top-nav-account
{
flex-direction: column;
width: 100%;
margin: 0;
}
[data-vertical-preview] .top-nav-account .top-nav-user-desktop
{
max-width: 100%;
margin: 0;
padding: 0;
}
[data-vertical-preview] .top-nav-locale-name
{
display: inline;
writing-mode: vertical-lr;
}
[data-vertical-preview] .top-nav-desktop-submenu
{
min-width: 0;
height: 100%;
}
[data-vertical-preview] .top-nav-submenu-content
{
writing-mode: vertical-lr;
text-orientation: mixed;
width: max-content;
height: 100%;
overflow: visible;
}
[data-vertical-preview] .top-nav-submenu-content:not(.top-nav-more-menu) > div
{
height: 100%;
}
[data-vertical-preview] :is(.top-nav-submenu-items, .top-nav-more-links)
{
flex-direction: row;
flex-wrap: wrap;
align-items: stretch;
max-height: 100%;
padding-inline: .75rem;
padding-block: 0;
}
[data-vertical-preview] .top-nav-desktop-submenu .top-nav-menu-link
{
min-height: 0;
min-width: 40px;
padding-inline: .75rem;
padding-block: .5rem;
}
[data-vertical-preview] .top-nav-submenu-items .top-nav-menu-link
{
justify-content: center;
}
}
@media (max-width: 767px)
{
[data-vertical-preview] .top-nav-layout
{
max-height: 50dvh;
overflow-y: auto;
}
}
+11 -4
ファイルの表示
@@ -1,9 +1,11 @@
import { createInstance } from 'i18next' import { createInstance } from 'i18next'
import { initReactI18next } from 'react-i18next' import { initReactI18next } from 'react-i18next'
import { MONGOLIAN_LOCALE, SUPPORTED_LOCALES } from '@/lib/locales'
import type { i18n as I18n, TOptions } from 'i18next' import type { i18n as I18n, TOptions } from 'i18next'
import type { LocaleCode } from '@/lib/locales' import type { UILocaleCode } from '@/lib/locales'
// Keep Japanese placeholders editable without reporting them as completed translations. // Keep Japanese placeholders editable without reporting them as completed translations.
const translatedResource = (resource: Record<string, unknown>): Record<string, unknown> => { const translatedResource = (resource: Record<string, unknown>): Record<string, unknown> => {
@@ -34,9 +36,14 @@ for (const [path, dictionary] of Object.entries (dictionaries))
const [, , locale, filename] = path.split ('/') const [, , locale, filename] = path.split ('/')
resources[locale] ??= { } resources[locale] ??= { }
resources[locale][filename.slice (0, -5)] = resources[locale][filename.slice (0, -5)] =
locale === 'ain-Kana' ? translatedResource (dictionary) : dictionary locale === 'ja' ? dictionary : translatedResource (dictionary)
} }
const namespaces = Object.keys (resources.ja ?? { }) const namespaces = Object.keys (resources.ja ?? { })
// No Mongolian translations yet; preserve the existing fallback language metadata.
resources[MONGOLIAN_LOCALE.code] ??= { }
for (const namespace of namespaces)
resources[MONGOLIAN_LOCALE.code][namespace] ??=
translatedResource ({ _untranslated: ['*'] })
export const createUII18n = (locale: string): I18n => { export const createUII18n = (locale: string): I18n => {
@@ -44,7 +51,7 @@ export const createUII18n = (locale: string): I18n => {
void instance.init ({ void instance.init ({
lng: locale, lng: locale,
fallbackLng: 'ja', fallbackLng: 'ja',
supportedLngs: ['ja', 'ain-Kana'], supportedLngs: [...SUPPORTED_LOCALES, MONGOLIAN_LOCALE.code],
load: 'currentOnly', load: 'currentOnly',
initAsync: false, initAsync: false,
defaultNS: 'navigation', defaultNS: 'navigation',
@@ -122,7 +129,7 @@ export const languageUIMessage = (
export const untranslatedKeys = ( export const untranslatedKeys = (
locale: LocaleCode, locale: UILocaleCode,
namespace = 'navigation', namespace = 'navigation',
): string[] => { ): string[] => {
const collect = (resource: Record<string, unknown>, prefix = ''): string[] => const collect = (resource: Record<string, unknown>, prefix = ''): string[] =>
+26 -6
ファイルの表示
@@ -7,6 +7,10 @@ export const SUPPORTED_LOCALES = ['ja', 'ain-Kana'] as const
export type LocaleCode = typeof SUPPORTED_LOCALES[number] export type LocaleCode = typeof SUPPORTED_LOCALES[number]
// This UI locale uses Japanese content until the API supports Mongolian.
export const MONGOLIAN_LOCALE = { code: 'mn-Mong', name: 'ᠮᠣᠩᠭᠣᠯ' } as const
export type UILocaleCode = LocaleCode | typeof MONGOLIAN_LOCALE.code
export type AvailableLocale = { code: string; name: string } export type AvailableLocale = { code: string; name: string }
@@ -28,6 +32,19 @@ export const localeFromPath = (pathname: string): LocaleCode | null => {
} }
// Frontend layout selection must not change the API's content locale.
export const isVerticalPreviewPath = (pathname: string): boolean =>
/^\/mn-Mong(?:[/?#]|$)/.test (pathname)
export const isUILocaleCode = (value: unknown): value is UILocaleCode =>
value === MONGOLIAN_LOCALE.code || isLocaleCode (value)
export const uiLocaleFromPath = (pathname: string): UILocaleCode =>
isVerticalPreviewPath (pathname) ? MONGOLIAN_LOCALE.code : localeFromPath (pathname) ?? 'ja'
export const resolveViewingLocale = ( export const resolveViewingLocale = (
pathname: string, pathname: string,
routeLocale?: unknown, routeLocale?: unknown,
@@ -40,27 +57,29 @@ export const currentViewingLocale = (): LocaleCode =>
export const unlocalisedPath = (pathname: string): string => { export const unlocalisedPath = (pathname: string): string => {
const locale = localeFromPath (pathname) const locale = isVerticalPreviewPath (pathname) ? 'mn-Mong' : localeFromPath (pathname)
return locale == null ? pathname : pathname.slice (locale.length + 1) || '/' return locale == null ? pathname : pathname.slice (locale.length + 1) || '/'
} }
export const localiseTo = (to: To, locale: LocaleCode): To => { export const localiseTo = (to: To, locale: LocaleCode, viewingPath = ''): To => {
const pathname = typeof to === 'string' ? to : to.pathname const pathname = typeof to === 'string' ? to : to.pathname
if (pathname == null if (pathname == null
|| !(pathname.startsWith ('/')) || !(pathname.startsWith ('/'))
|| pathname.startsWith ('//') || pathname.startsWith ('//')
|| localeFromPath (pathname) != null) || localeFromPath (pathname) != null
|| isVerticalPreviewPath (pathname))
return to return to
const localised = `/${ locale }${ pathname }` const prefix = isVerticalPreviewPath (viewingPath) ? 'mn-Mong' : locale
const localised = `/${ prefix }${ pathname }`
return typeof to === 'string' ? localised : { ...to, pathname: localised } return typeof to === 'string' ? localised : { ...to, pathname: localised }
} }
export const switchLocalePath = ( export const switchLocalePath = (
location: { pathname: string; search: string; hash: string }, location: { pathname: string; search: string; hash: string },
locale: LocaleCode, locale: UILocaleCode,
): string => ): string =>
`/${ locale }${ unlocalisedPath (location.pathname) }${ location.search }${ location.hash }` `/${ locale }${ unlocalisedPath (location.pathname) }${ location.search }${ location.hash }`
@@ -73,7 +92,8 @@ export const legacyLocalePath = (
location: { pathname: string; search: string; hash: string }, location: { pathname: string; search: string; hash: string },
isPage: (pathname: string) => boolean = () => false, isPage: (pathname: string) => boolean = () => false,
): string | null => { ): string | null => {
if (localeFromPath (location.pathname) != null || !isPage (location.pathname)) if (localeFromPath (location.pathname) != null
|| isVerticalPreviewPath (location.pathname) || !isPage (location.pathname))
return null return null
return switchLocalePath (location, automaticallySelectedLocale ()) return switchLocalePath (location, automaticallySelectedLocale ())
} }
+3 -3
ファイルの表示
@@ -1,19 +1,19 @@
import { translateUIMessage } from '@/lib/i18n' import { translateUIMessage } from '@/lib/i18n'
import type navigation from '@/locales/ja/navigation.json' import type navigation from '@/locales/ja/navigation.json'
import type { LocaleCode } from '@/lib/locales' import type { UILocaleCode } from '@/lib/locales'
export type UIMessageKey = keyof typeof navigation export type UIMessageKey = keyof typeof navigation
export const uiMessage = ( export const uiMessage = (
locale: LocaleCode, locale: UILocaleCode,
key: UIMessageKey, key: UIMessageKey,
values: Record<string, string | number> = { }, values: Record<string, string | number> = { },
): string => translateUIMessage (key, 'navigation', locale, values).text ): string => translateUIMessage (key, 'navigation', locale, values).text
export const uiMessageLanguage = (locale: LocaleCode, key: UIMessageKey): 'ja' | 'ain' => export const uiMessageLanguage = (locale: UILocaleCode, key: UIMessageKey): 'ja' | 'ain' =>
translateUIMessage (key, 'navigation', locale).language === 'ain-Kana' translateUIMessage (key, 'navigation', locale).language === 'ain-Kana'
? 'ain' ? 'ain'
: 'ja' : 'ja'
-4
ファイルの表示
@@ -7,10 +7,6 @@ import type {
MaterialFilter, MaterialFilter,
WikiTagReference } from '@/types' WikiTagReference } from '@/types'
export const staticMirrorKeys = {
definition: ['static_mirror', 'definition'] as const,
job: (id: string | null) => ['static_mirror', 'jobs', id] as const }
export const localesKeys = { export const localesKeys = {
root: ['locales'] as const, root: ['locales'] as const,
index: ['locales', 'index'] as const } index: ['locales', 'index'] as const }
-59
ファイルの表示
@@ -1,59 +0,0 @@
import { readFileSync } from 'node:fs'
import { URL as NodeURL } from 'node:url'
import { fireEvent, waitFor } from '@testing-library/react'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
const script = readFileSync (new NodeURL (
'../../../backend/app/views/static_mirror/archive.js', import.meta.url), 'utf8')
const archiveWindow = window as typeof window & { archiveConfig?: { origin: string | null } }
beforeEach (() => {
const element = document.createElement ('script')
element.src = 'https://mirror.test/subdirectory/archive/assets/archive.js'
vi.spyOn (document, 'currentScript', 'get').mockReturnValue (element)
delete archiveWindow.archiveConfig
document.body.innerHTML = `
<nav><a href="ja/posts/index.html">Post</a>
<a data-original="/ja/posts/1" href="https://source.test/ja/posts/1">Source</a></nav>
<form id="archive-search"><input name="q" value="alias"></form>
<ul id="search-results"></ul>`
})
afterEach (() => {
delete archiveWindow.archiveConfig
document.body.replaceChildren ()
vi.unstubAllGlobals ()
})
describe ('Portable static mirror assets', () => {
it ('searches local JSON by aliases using safe text and relative links', async () => {
const fetcher = vi.fn ().mockResolvedValue ({ ok: true, json: async () => [
{ path: 'ja/tags/1/index.html', title: '<img src=x onerror=alert(1)>', names: ['alias'] },
{ path: 'https://outside.test/', title: 'alias' },
{ path: '../outside.html', title: 'alias' }] })
vi.stubGlobal ('fetch', fetcher)
new Function (script) ()
fireEvent.submit (document.querySelector ('form')!)
await waitFor (() => expect (document.querySelectorAll ('#search-results a')).toHaveLength (1))
const link = document.querySelector ('#search-results a')!
expect (link).toHaveAttribute ('href', 'ja/tags/1/index.html')
expect (link.textContent).toBe ('<img src=x onerror=alert(1)>')
expect (document.querySelector ('img')).toBeNull ()
expect (fetcher).toHaveBeenCalledTimes (1)
expect (fetcher.mock.calls[0][0].href)
.toBe ('https://mirror.test/subdirectory/archive/search-index.json')
})
it ('retains baked links without config and changes only source links with valid config', () => {
new Function (script) ()
const source = document.querySelector ('[data-original]')!
expect (source).toHaveAttribute ('href', 'https://source.test/ja/posts/1')
archiveWindow.archiveConfig = { origin: 'javascript:alert(1)' }
new Function (script) ()
expect (source).toHaveAttribute ('href', 'https://source.test/ja/posts/1')
archiveWindow.archiveConfig = { origin: 'https://replacement.test/base/' }
new Function (script) ()
expect (source).toHaveAttribute ('href', 'https://replacement.test/base/ja/posts/1')
expect (document.querySelector ('a:not([data-original])'))
.toHaveAttribute ('href', 'ja/posts/index.html')
})
})
+14 -4
ファイルの表示
@@ -1,11 +1,12 @@
import { useCallback } from 'react' import { useCallback } from 'react'
import { useLocation, useNavigate, useParams } from 'react-router-dom' import { useLocation, useNavigate, useParams } from 'react-router-dom'
import { localiseTo, resolveViewingLocale } from '@/lib/locales' import { isVerticalPreviewPath, localiseTo,
resolveViewingLocale, uiLocaleFromPath } from '@/lib/locales'
import type { NavigateFunction, NavigateOptions, To } from 'react-router-dom' import type { NavigateFunction, NavigateOptions, To } from 'react-router-dom'
import type { LocaleCode } from '@/lib/locales' import type { LocaleCode, UILocaleCode } from '@/lib/locales'
export const useLocale = (): LocaleCode => { export const useLocale = (): LocaleCode => {
@@ -15,13 +16,22 @@ export const useLocale = (): LocaleCode => {
} }
export const useUILocale = (): UILocaleCode =>
uiLocaleFromPath (useLocation ().pathname)
export const useLocaleNavigate = (): NavigateFunction => { export const useLocaleNavigate = (): NavigateFunction => {
const navigate = useNavigate () const navigate = useNavigate ()
const locale = useLocale () const locale = useLocale ()
const { pathname } = useLocation ()
return useCallback ((to: To | number, options?: NavigateOptions) => { return useCallback ((to: To | number, options?: NavigateOptions) => {
if (typeof to === 'number') if (typeof to === 'number')
navigate (to) navigate (to)
else else
navigate (localiseTo (to, locale), options) navigate (localiseTo (to, locale, pathname), options)
}, [locale, navigate]) }, [locale, navigate, pathname])
} }
export const useVerticalPreview = (): boolean =>
isVerticalPreviewPath (useLocation ().pathname)
+2 -2
ファイルの表示
@@ -3,11 +3,11 @@ import { useTranslation } from 'react-i18next'
import LocalisedText from '@/components/LocalisedText' import LocalisedText from '@/components/LocalisedText'
import { translateUIMessage } from '@/lib/i18n' import { translateUIMessage } from '@/lib/i18n'
import { useLocale } from '@/lib/useLocale' import { useUILocale } from '@/lib/useLocale'
export const useUITranslation = (namespace = 'common') => { export const useUITranslation = (namespace = 'common') => {
const locale = useLocale () const locale = useUILocale ()
const { i18n } = useTranslation (namespace, { lng: locale }) const { i18n } = useTranslation (namespace, { lng: locale })
const message = useCallback ((key: string, values?: Record<string, string | number>) => { const message = useCallback ((key: string, values?: Record<string, string | number>) => {
+1 -1
ファイルの表示
@@ -152,7 +152,7 @@ export const msToTime = (ms: number): string => {
export const inputClass = (invalid?: boolean, className?: string): string => export const inputClass = (invalid?: boolean, className?: string): string =>
cn ('w-full rounded border p-2', cn ('[inline-size:100%] rounded border p-2',
(invalid (invalid
? ['border-red-500 bg-red-50 text-red-900', ? ['border-red-500 bg-red-50 text-red-900',
'placeholder:text-red-300', 'placeholder:text-red-300',
-19
ファイルの表示
@@ -1,19 +0,0 @@
{
"_untranslated": ["*"],
"title": "Static Mirror 生成機能",
"generation": "スナップショット生成",
"dataAt": "データ基準時点",
"currentOnly": "今回は現在状態のみの対応",
"developmentOnly": "開発環境限定",
"limits": "出力件数の制限",
"concurrency": "同時実行数",
"exclusions": "未対応機能",
"protection": "データ保護上の制約",
"protectionDetails": "公開抑止、除票、非公開情報、認証情報、監査専用情報を ZIP に含めない。",
"externalAssets": "外部画像や動画への依存",
"externalMedia": "外部画像や動画",
"externalOmissions": "ローカルへ取り込めていない資産",
"download": "ZIP ダウンロード",
"zip": "ZIP",
"failure": "失敗時の理由"
}
-18
ファイルの表示
@@ -1,18 +0,0 @@
{
"title": "Static Mirror 生成機能",
"generation": "スナップショット生成",
"dataAt": "データ基準時点",
"currentOnly": "今回は現在状態のみの対応",
"developmentOnly": "開発環境限定",
"limits": "出力件数の制限",
"concurrency": "同時実行数",
"exclusions": "未対応機能",
"protection": "データ保護上の制約",
"protectionDetails": "公開抑止、除票、非公開情報、認証情報、監査専用情報を ZIP に含めない。",
"externalAssets": "外部画像や動画への依存",
"externalMedia": "外部画像や動画",
"externalOmissions": "ローカルへ取り込めていない資産",
"download": "ZIP ダウンロード",
"zip": "ZIP",
"failure": "失敗時の理由"
}
+2 -2
ファイルの表示
@@ -6,7 +6,7 @@ import { I18nextProvider } from 'react-i18next'
import '@/index.css' import '@/index.css'
import App, { preloadPageRoute, resolvePageRoute } from '@/App' import App, { preloadPageRoute, resolvePageRoute } from '@/App'
import { createUII18n } from '@/lib/i18n' import { createUII18n } from '@/lib/i18n'
import { currentViewingLocale } from '@/lib/locales' import { currentViewingLocale, uiLocaleFromPath } from '@/lib/locales'
import { localesKeys } from '@/lib/queryKeys' import { localesKeys } from '@/lib/queryKeys'
import { applyClientAnimationMode, getClientAnimationMode } from '@/lib/settings' import { applyClientAnimationMode, getClientAnimationMode } from '@/lib/settings'
@@ -22,7 +22,7 @@ const client = new QueryClient ({
const mount = (serverRendered: boolean) => { const mount = (serverRendered: boolean) => {
const instance = createUII18n (currentViewingLocale ()) const instance = createUII18n (uiLocaleFromPath (window.location.pathname))
const app = ( const app = (
<HelmetProvider context={helmetContext}> <HelmetProvider context={helmetContext}>
<QueryClientProvider client={client}> <QueryClientProvider client={client}>
-5
ファイルの表示
@@ -16,17 +16,12 @@ import type { User } from '@/types'
const MorePage: FC = () => { const MorePage: FC = () => {
const location = useLocation () const location = useLocation ()
const { message } = useUITranslation ('shared') const { message } = useUITranslation ('shared')
const { label: archiveLabel } = useUITranslation ('archive')
const menu = menuOutline ( const menu = menuOutline (
{ tag: null, wikiId: null, user: { } as User, pathName: location.pathname }) { tag: null, wikiId: null, user: { } as User, pathName: location.pathname })
return ( return (
<MainArea className="md:flex"> <MainArea className="md:flex">
<PageHead title={message ('labels.menu')}/> <PageHead title={message ('labels.menu')}/>
{import.meta.env.DEV && (
<PrefetchLink to="/static-mirror">
{archiveLabel ('title')}
</PrefetchLink>)}
{[...Array (Math.ceil (menu.length / 4)).keys ()].map (i => ( {[...Array (Math.ceil (menu.length / 4)).keys ()].map (i => (
<div key={i} className="flex-1 mx-16"> <div key={i} className="flex-1 mx-16">
-96
ファイルの表示
@@ -1,96 +0,0 @@
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import StaticMirrorPage from '@/pages/StaticMirrorPage'
import { staticMirrorKeys } from '@/lib/queryKeys'
import { renderWithProviders } from '@/test/render'
const api = vi.hoisted (() => ({
apiGet: vi.fn (), apiPost: vi.fn (), startAPIDownload: vi.fn () }))
vi.mock ('@/lib/api', async original => ({
...await original<typeof import ('@/lib/api')> (), ...api }))
const definition = {
resourceLimit: 100, nameLimit: 2000, maxBytes: 8388608, maxSeconds: 60,
concurrency: 1, cooldownSeconds: 60, expirySeconds: 600,
exclusions: ['historical_state', 'unversioned_resources', 'images', 'videos'] }
const ready = {
status: 'ready', dataAt: '2026-11-16T00:00:00.000000Z', processed: 2, total: 2 }
beforeEach (() => {
vi.clearAllMocks ()
api.apiGet.mockImplementation (async (path: string) =>
path === '/static_mirror' ? definition : ready)
api.apiPost.mockResolvedValue ({ job: 'opaque-job' })
api.startAPIDownload.mockReturnValue (vi.fn ())
})
const startGeneration = async () => {
const button = screen.getByRole ('button', { name: 'スナップショット生成' })
await waitFor (() => expect (button).toBeEnabled ())
fireEvent.click (button)
}
describe ('Static Mirror generation', () => {
it ('starts a current snapshot and downloads through the common API', async () => {
const view = renderWithProviders (<StaticMirrorPage/>, { route: '/ja/static-mirror' })
await startGeneration ()
expect (api.apiPost).toHaveBeenCalledWith ('/static_mirror/jobs', { }, { locale: 'ja' })
fireEvent.click (await screen.findByRole ('button', { name: 'ZIP ダウンロード' }))
expect (screen.getByText (ready.dataAt)).toBeInTheDocument ()
expect (screen.getByText ('言語別名称').parentElement).toHaveTextContent ('2000')
expect (api.startAPIDownload).toHaveBeenCalledWith (
'/static_mirror', 'opaque-job', expect.any (Function))
const release = api.startAPIDownload.mock.results[0].value
view.unmount ()
expect (release).toHaveBeenCalled ()
})
it ('shows generation progress and offers the ZIP only after readiness', async () => {
let state = { ...ready, status: 'running', processed: 1 }
api.apiGet.mockImplementation (async (path: string) =>
path === '/static_mirror' ? definition : state)
const view = renderWithProviders (<StaticMirrorPage/>)
await startGeneration ()
expect (await screen.findByText ('生成中')).toBeInTheDocument ()
expect (screen.queryByRole ('button', { name: 'ZIP ダウンロード' })).toBeNull ()
expect (screen.getByRole ('button', { name: 'スナップショット生成' })).toBeDisabled ()
state = ready
await act (async () => {
await view.queryClient.invalidateQueries ({ queryKey: staticMirrorKeys.job ('opaque-job') })
})
expect (await screen.findByRole ('button', { name: 'ZIP ダウンロード' })).toBeEnabled ()
})
it ('keeps failure reasons visible without offering a ZIP', async () => {
api.apiGet.mockImplementation (async (path: string) =>
path === '/static_mirror' ? definition : { ...ready, status: 'failed', error: 'too_large' })
renderWithProviders (<StaticMirrorPage/>)
await startGeneration ()
expect (await screen.findByRole ('alert')).toHaveTextContent ('too_large')
expect (screen.queryByRole ('button', { name: 'ZIP ダウンロード' })).toBeNull ()
})
it ('shows intake limits and revoked downloads using existing error copy', async () => {
api.apiPost.mockRejectedValueOnce ({ isAxiosError: true, response: { status: 429 } })
renderWithProviders (<StaticMirrorPage/>)
await startGeneration ()
expect (await screen.findByRole ('alert')).toHaveTextContent ('HTTP 429')
api.apiGet.mockImplementation (async (path: string) => {
if (path === '/static_mirror') return definition
throw { isAxiosError: true, response: { status: 404 } }
})
await startGeneration ()
await waitFor (() => expect (screen.getByRole ('alert')).toHaveTextContent ('有効期限'))
expect (screen.getByRole ('button', { name: 'スナップショット生成' })).toBeEnabled ()
})
it ('preserves Japanese fallback language metadata for untranslated UI', async () => {
renderWithProviders (<StaticMirrorPage/>, { route: '/ain-Kana/static-mirror' })
await startGeneration ()
expect (api.apiPost).toHaveBeenCalledWith (
'/static_mirror/jobs', { }, { locale: 'ain-Kana' })
expect (screen.getByRole ('heading', { name: 'Static Mirror 生成機能' })
.querySelector ('[lang="ja"]')).toBeInTheDocument ()
})
})
-140
ファイルの表示
@@ -1,140 +0,0 @@
import { useMutation, useQuery } from '@tanstack/react-query'
import { useEffect, useRef, useState } from 'react'
import PageHead from '@/components/common/PageHead'
import PageTitle from '@/components/common/PageTitle'
import MainArea from '@/components/layout/MainArea'
import { Button } from '@/components/ui/button'
import { apiGet, apiPost, isApiError, startAPIDownload } from '@/lib/api'
import { staticMirrorKeys } from '@/lib/queryKeys'
import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
type Definition = {
resourceLimit: number
nameLimit: number
maxBytes: number
maxSeconds: number
concurrency: number
cooldownSeconds: number
expirySeconds: number
exclusions: string[] }
type Job = {
status: 'queued' | 'running' | 'ready' | 'failed'
dataAt: string | null
processed: number
total: number | null
error?: string }
const StaticMirrorPage = () => {
const locale = useLocale ()
const { label, message } = useUITranslation ('archive')
const [job, setJob] = useState<string | null> (null)
const [downloadFailed, setDownloadFailed] = useState (false)
const downloadRef = useRef<(() => void) | null> (null)
useEffect (() => () => downloadRef.current?.(), [])
const definition = useQuery ({
queryKey: staticMirrorKeys.definition,
queryFn: () => apiGet<Definition> ('/static_mirror'), retry: false })
const { mutate: start, isPending: pending, error: creationError } = useMutation ({
mutationFn: () => apiPost<{ job: string }> ('/static_mirror/jobs', { }, { locale }),
onSuccess: result => {
downloadRef.current?.()
setDownloadFailed (false)
setJob (result.job)
} })
const status = useQuery ({
queryKey: staticMirrorKeys.job (job),
queryFn: () => apiGet<Job> (`/static_mirror/jobs/${encodeURIComponent (job!)}`),
enabled: job != null,
retry: false,
refetchInterval: query =>
(query.state.error != null
|| ['ready', 'failed'].includes (query.state.data?.status ?? ''))
? false : 1000 })
const unavailable = isApiError (status.error) && status.error.response?.status === 404
const active = job != null && !unavailable
&& !['ready', 'failed'].includes (status.data?.status ?? '')
const error = creationError ?? status.error ?? definition.error
const errorStatus = isApiError (error) ? error.response?.status : null
const metadata = definition.data
const percentage =
(status.data?.total == null || status.data.total === 0)
? 100
: Math.round (100 * status.data.processed / status.data.total)
const download = () => {
if (job == null) return
downloadRef.current?.()
setDownloadFailed (false)
downloadRef.current = startAPIDownload (
'/static_mirror', job, () => setDownloadFailed (true))
}
return (
<MainArea className="space-y-4">
<PageHead title={message ('title')}/>
<PageTitle>{label ('title')}</PageTitle>
<p>{label ('developmentOnly')} / {label ('currentOnly')}</p>
{metadata != null && (
<dl>
<dt>{label ('limits')}</dt>
<dd>
{label ('counts:resources.posts')} / {label ('counts:resources.tags')}:
{' '}{metadata.resourceLimit}
</dd>
<dd>{label ('counts:columns.names')}: {metadata.nameLimit}</dd>
<dd>{metadata.maxBytes} B / {metadata.maxSeconds} s</dd>
<dt>{label ('concurrency')}</dt>
<dd>{metadata.concurrency} / {metadata.cooldownSeconds} s</dd>
<dd>{label ('zip')}: {metadata.expirySeconds} s</dd>
<dt>{label ('exclusions')}</dt>
<dd>
{['counts:resources.tag_descriptions', 'navigation:help',
'counts:resources.materials', 'counts:resources.nico_tags',
'counts:attributes.parent_post_ids', 'counts:attributes.parent_tag_ids',
'counts:columns.sections', 'navigation:history', 'navigation:edit']
.map (key => <span key={key}>{label (key)}{' / '}</span>)}
</dd>
<dt>{label ('externalAssets')}</dt>
<dd>{label ('externalOmissions')}: {label ('externalMedia')}</dd>
<dt>{label ('protection')}</dt>
<dd>{label ('protectionDetails')}</dd>
</dl>)}
<Button onClick={() => start ()}
disabled={metadata == null || pending || active}>
{label ('generation')}
</Button>
{status.data != null && (
<div role="status">
<p>{label ('dataAt')}: <time>{status.data.dataAt ?? '—'}</time></p>
<p>
{status.data.status === 'ready'
? label ('download')
: label (`counts:exportProgress.${status.data.status}`)}
</p>
{status.data.total != null && (
<p>{label ('counts:exportProgress.measured', {
processed: status.data.processed, total: status.data.total,
percent: percentage })}</p>)}
{status.data.status === 'ready' && (
<Button onClick={download}>{label ('download')}</Button>)}
{status.data.error != null && (
<p role="alert">{label ('failure')}: <code>{status.data.error}</code></p>)}
</div>)}
{error != null && (
<p role="alert">
{errorStatus === 404
? label ('counts:downloadErrors.unavailable')
: (errorStatus != null
? label ('counts:errors.http', { status: errorStatus })
: label ('counts:errors.network'))}
</p>)}
{status.error != null && (
<Button onClick={() => status.refetch ()}>{label ('shared:actions.retry')}</Button>)}
{downloadFailed && <p role="alert">{label ('counts:downloadErrors.failed')}</p>}
</MainArea>)
}
export default StaticMirrorPage
+2 -1
ファイルの表示
@@ -359,7 +359,8 @@ const CountsResourceContent = (
</ul> </ul>
</nav> </nav>
</SidebarComponent> </SidebarComponent>
<MainArea animateLayout={false} className="flex min-h-0 min-w-0 flex-col p-2"> <MainArea animateLayout={false} verticalContent={false}
className="flex min-h-0 min-w-0 flex-col p-2">
<PageTitle className="mb-1 text-base" lang={title.language}>{title.text}</PageTitle> <PageTitle className="mb-1 text-base" lang={title.language}>{title.text}</PageTitle>
<div ref={controlsArea} className="shrink-0" <div ref={controlsArea} className="shrink-0"
style={{ minHeight: definition == null ? controlsHeight : undefined }}> style={{ minHeight: definition == null ? controlsHeight : undefined }}>
+1 -1
ファイルの表示
@@ -107,7 +107,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
{post && <TagDetailSidebar post={post} className="hidden md:block"/>} {post && <TagDetailSidebar post={post} className="hidden md:block"/>}
<MainArea className="relative"> <MainArea className="relative" verticalContent={false}>
{post {post
? ( ? (
<> <>
+4 -3
ファイルの表示
@@ -1061,7 +1061,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
<> <>
<PageHead title={message ('review.title')}/> <PageHead title={message ('review.title')}/>
<MainArea className="pb-40"> <MainArea className="post-import-review pb-40">
<div className="mx-auto max-w-6xl space-y-6"> <div className="mx-auto max-w-6xl space-y-6">
<PageTitle>{label ('review.title')}</PageTitle> <PageTitle>{label ('review.title')}</PageTitle>
@@ -1164,8 +1164,9 @@ const PostImportFooter = (
const { label } = useUITranslation ('imports') const { label } = useUITranslation ('imports')
return ( return (
<div <div
className="shrink-0 border-t bg-white/95 p-4 backdrop-blur className="post-import-footer shrink-0 border-t bg-white/95 p-4 backdrop-blur
dark:border-neutral-700 dark:bg-neutral-950/95"> text-neutral-950 dark:border-neutral-700 dark:bg-neutral-950/95
dark:text-neutral-50">
<div className="mx-auto flex max-w-6xl flex-col gap-3 md:flex-row <div className="mx-auto flex max-w-6xl flex-col gap-3 md:flex-row
md:items-center md:justify-between"> md:items-center md:justify-between">
<div className="flex flex-wrap items-center gap-2 text-sm"> <div className="flex flex-wrap items-center gap-2 text-sm">
+1 -1
ファイルの表示
@@ -130,7 +130,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
<MainArea> <MainArea>
<PageHead title={uiMessage ('source.title')}/> <PageHead title={uiMessage ('source.title')}/>
<Form className="max-w-4xl"> <Form className="post-import-source max-w-4xl">
<PageTitle>{label ('source.title')}</PageTitle> <PageTitle>{label ('source.title')}</PageTitle>
<FormField label={label ('source.urls')}> <FormField label={label ('source.urls')}>
{() => ( {() => (
+1 -1
ファイルの表示
@@ -146,7 +146,7 @@ const PostListPage: FC = () => {
JSON.stringify (statesToSave)) JSON.stringify (statesToSave))
}}/> }}/>
<MainArea> <MainArea className="posts-main-area" verticalContent>
<TabGroup <TabGroup
rightAddon={ rightAddon={
<label className="flex items-center gap-2 text-xs text-muted-foreground"> <label className="flex items-center gap-2 text-xs text-muted-foreground">
+1 -1
ファイルの表示
@@ -250,7 +250,7 @@ const PostSearchPage: FC = () => {
</label> </label>
</div> </div>
<form onSubmit={handleSearch} className="space-y-2"> <form onSubmit={handleSearch} className="post-search-form space-y-2">
{/* タイトル */} {/* タイトル */}
<FormField label={label ('shared:labels.title')}> <FormField label={label ('shared:labels.title')}>
{({ invalid }) => ( {({ invalid }) => (
+4 -4
ファイルの表示
@@ -220,10 +220,10 @@ const TagListPage: FC = () => {
}), [page, totalPages, location.search])) }), [page, totalPages, location.search]))
return ( return (
<MainArea className="min-w-0"> <MainArea className="tags-main-area min-w-0" verticalContent>
<PageHead title={message ('title')}/> <PageHead title={message ('title')}/>
<div className="max-w-xl"> <div className="tag-list-filter max-w-xl">
<div className="flex flex-wrap items-center justify-between gap-3"> <div className="flex flex-wrap items-center justify-between gap-3">
<PageTitle>{label ('title')}</PageTitle> <PageTitle>{label ('title')}</PageTitle>
<label className="flex items-center gap-2 text-xs text-muted-foreground"> <label className="flex items-center gap-2 text-xs text-muted-foreground">
@@ -358,8 +358,8 @@ const TagListPage: FC = () => {
{isError && <p role="alert">{label ('common:fetchError')}</p>} {isError && <p role="alert">{label ('common:fetchError')}</p>}
{loading ? label ('common:loading') : (results.length > 0 ? ( {loading ? label ('common:loading') : (results.length > 0 ? (
<div className="mt-4 min-w-0 max-w-full"> <div className="tag-list-results mt-4 min-w-0 max-w-full">
<div className="min-w-0 max-w-full overflow-x-auto"> <div className="tag-list-table min-w-0 max-w-full overflow-x-auto">
<table className="w-full min-w-[2000px] table-auto border-collapse"> <table className="w-full min-w-[2000px] table-auto border-collapse">
<colgroup> <colgroup>
<col className="w-72"/> <col className="w-72"/>
+1 -1
ファイルの表示
@@ -114,7 +114,7 @@ const WikiDetailPage: FC = () => {
return <NotFound/> return <NotFound/>
return ( return (
<MainArea> <MainArea className="wiki-main-area" verticalContent>
<PageHead title={{ <PageHead title={{
text: `${displayTitle}${deprecated text: `${displayTitle}${deprecated
? message ('labels.deprecatedSuffix').text : ''} Wiki`, ? message ('labels.deprecatedSuffix').text : ''} Wiki`,
+2 -1
ファイルの表示
@@ -10,7 +10,8 @@ type Transform = (source: string, id: string) => Promise<{ code: string } | null
export const transformMdx = async (source: string, suffix = '.mdx') => { export const transformMdx = async (source: string, suffix = '.mdx') => {
const plugins = viteConfig.plugins?.flat () as { name: string; transform: Transform }[] const config = viteConfig ({ command: 'serve', mode: 'test' })
const plugins = config.plugins?.flat () as { name: string; transform: Transform }[]
const plugin = plugins.find (entry => entry.name === '@mdx-js/rollup') const plugin = plugins.find (entry => entry.name === '@mdx-js/rollup')
if (plugin == null) if (plugin == null)
throw new Error ('The application MDX compiler is not registered') throw new Error ('The application MDX compiler is not registered')
+41
ファイルの表示
@@ -0,0 +1,41 @@
import { execFileSync } from 'node:child_process'
import { resolveConfig, transformWithEsbuild } from 'vite'
import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
import viteConfig from './vite.config'
vi.hoisted (() => {
vi.stubGlobal ('Uint8Array', Object.getPrototypeOf (new TextEncoder ().encode ('')).constructor)
})
afterAll (() => vi.unstubAllGlobals ())
afterEach (() => vi.unstubAllEnvs ())
describe ('JSX runtime configuration', () => {
it.each (['development', 'test', 'production']) (
'builds JSX compatible with production React under NODE_ENV=%s',
async environment => {
vi.stubEnv ('NODE_ENV', environment)
const config = await resolveConfig ({
...viteConfig ({ command: 'build', mode: 'production' }),
configFile: false, build: { ssr: true } }, 'build')
if (config.esbuild === false) throw new Error ('JSX transformation disabled')
const { code } = await transformWithEsbuild (
'export default <div>SSR</div>', 'runtime.tsx', {
jsx: config.esbuild.jsx,
jsxDev: config.esbuild.jsxDev,
jsxImportSource: config.esbuild.jsxImportSource })
expect (code).toContain ('react/jsx-runtime')
expect (code).not.toContain ('jsxDEV')
execFileSync (process.execPath, ['--input-type=module', '-e', code], {
cwd: import.meta.dirname,
env: { ...process.env, NODE_ENV: 'production' } })
})
it ('preserves development JSX for the development server', async () => {
vi.stubEnv ('NODE_ENV', 'development')
const config = await resolveConfig ({
...viteConfig ({ command: 'serve', mode: 'development' }),
configFile: false }, 'serve')
expect (config.esbuild && config.esbuild.jsxDev).toBe (true)
})
})
+3 -2
ファイルの表示
@@ -21,7 +21,8 @@ if (typeof originalTransform === 'function')
} }
} }
export default defineConfig ({ export default defineConfig (({ command }) => ({
esbuild: command === 'build' ? { jsxDev: false } : undefined,
plugins: [{ name: 'request-render-context', enforce: 'pre', plugins: [{ name: 'request-render-context', enforce: 'pre',
resolveId (id, _importer, options) { resolveId (id, _importer, options) {
const contextPath = path.resolve (__dirname, './src/lib/renderContext') const contextPath = path.resolve (__dirname, './src/lib/renderContext')
@@ -40,4 +41,4 @@ export default defineConfig ({
rewrite: requestPath => requestPath.replace (/^\/api/, ''), rewrite: requestPath => requestPath.replace (/^\/api/, ''),
secure: false } }, secure: false } },
watch: { usePolling: true, watch: { usePolling: true,
interval: 100 } } }) interval: 100 } } }))
+7 -4
ファイルの表示
@@ -1,12 +1,15 @@
import path from 'node:path'
import { defineConfig, mergeConfig } from 'vitest/config' import { defineConfig, mergeConfig } from 'vitest/config'
import viteConfig from './vite.config' import viteConfig from './vite.config'
export default mergeConfig ( export default defineConfig (configEnv => mergeConfig (
viteConfig, viteConfig (configEnv),
defineConfig ({ {
test: { environment: 'jsdom', test: { alias: {
'@/config': path.resolve (__dirname, './src/config.sample.ts') },
environment: 'jsdom',
testTimeout: 30_000, testTimeout: 30_000,
exclude: ['**/node_modules/**', '**/dist/**', 'server.ssr.test.mjs'], exclude: ['**/node_modules/**', '**/dist/**', 'server.ssr.test.mjs'],
setupFiles: './src/test/setup.ts', setupFiles: './src/test/setup.ts',