haori 0.4.4 → 0.4.6

package/dist/index.d.ts

@@ -992,6 +992,6 @@ declare class TextFragment extends Fragment {
     evaluate(): Promise<void>;
 }
 
-export declare const version = "0.4.3";
+export declare const version = "0.4.6";
 
 export { }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "haori",
-    "version": "0.4.4",
+    "version": "0.4.6",
     "description": "A lightweight HTML-first UI engine powered by declarative data bindings and expressions.",
     "scripts": {
         "dev": "vite",

package/dist/src/event_dispatcher.d.ts

@@ -1,12 +1,14 @@
 /**
  * @fileoverview イベント振り分け機能
  *
- * クリック/変更/ロードイベントを検出し Procedure に委譲します。
+ * クリック/変更/ロード/ポップステートイベントを検出し Procedure に委譲します。
  */
 /**
  * イベントの振り分けを行うクラスです。
  */
 export default class EventDispatcher {
+    /** Haori が history.state に埋め込む状態キー */
+    private static readonly HISTORY_STATE_KEY;
     /** ルート要素 */
     private readonly root;
     /** クリックデリゲータ */
@@ -17,6 +19,12 @@ export default class EventDispatcher {
     private readonly onLoadCapture;
     /** ページ全体のロード完了時の処理 */
     private readonly onWindowLoad;
+    /**
+     * popstate デリゲータ（Haori が管理する履歴に戻った場合だけページをリロード）。
+     *
+     * @param event popstate イベント
+     */
+    private readonly onPopstate;
     /**
      * コンストラクタ。
      *
@@ -25,7 +33,7 @@ export default class EventDispatcher {
     constructor(root?: Document | HTMLElement);
     /**
      * イベントリスナーの登録を開始します。
-     * クリック、変更、ロードイベントを監視し、対応するProcedureを実行します。
+     * クリック、変更、ロード、popstate イベントを監視し、対応するProcedureを実行します。
      */
     start(): void;
     /**

package/dist/src/event_dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event_dispatcher.d.ts","sourceRoot":"","sources":["../../src/event_dispatcher.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAE9C,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmD;IAE3E,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAE7E,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CACC;IAE/B,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAO3B;IAEF;;;;OAIG;gBACS,IAAI,GAAE,QAAQ,GAAG,WAAsB;IAInD;;;OAGG;IACH,KAAK,IAAI,IAAI;IASb;;OAEG;IACH,IAAI,IAAI,IAAI;IAOZ;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAoBhB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CAY7B"}
+{"version":3,"file":"event_dispatcher.d.ts","sourceRoot":"","sources":["../../src/event_dispatcher.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,sCAAsC;IACtC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAA2B;IAEpE,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAyB;IAE9C,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmD;IAE3E,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoD;IAE7E,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CACC;IAE/B,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAO3B;IAEF;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAMzB;IAEF;;;;OAIG;gBACS,IAAI,GAAE,QAAQ,GAAG,WAAsB;IAInD;;;OAGG;IACH,KAAK,IAAI,IAAI;IAWb;;OAEG;IACH,IAAI,IAAI,IAAI;IAQZ;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAoBhB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;CAY7B"}

package/dist/src/event_dispatcher.js

@@ -1,7 +1,7 @@
 /**
  * @fileoverview イベント振り分け機能
  *
- * クリック/変更/ロードイベントを検出し Procedure に委譲します。
+ * クリック/変更/ロード/ポップステートイベントを検出し Procedure に委譲します。
  */
 import Fragment, { ElementFragment } from './fragment';
 import Procedure from './procedure';
@@ -9,7 +9,7 @@ import Log from './log';
 /**
  * イベントの振り分けを行うクラスです。
  */
-export default class EventDispatcher {
+class EventDispatcher {
     /**
      * コンストラクタ。
      *
@@ -31,11 +31,23 @@ export default class EventDispatcher {
                 void new Procedure(fragment, 'load').run();
             }
         };
+        /**
+         * popstate デリゲータ（Haori が管理する履歴に戻った場合だけページをリロード）。
+         *
+         * @param event popstate イベント
+         */
+        this.onPopstate = (event) => {
+            const state = event.state;
+            if (!state || state[EventDispatcher.HISTORY_STATE_KEY] !== true) {
+                return;
+            }
+            location.reload();
+        };
         this.root = root;
     }
     /**
      * イベントリスナーの登録を開始します。
-     * クリック、変更、ロードイベントを監視し、対応するProcedureを実行します。
+     * クリック、変更、ロード、popstate イベントを監視し、対応するProcedureを実行します。
      */
     start() {
         this.root.addEventListener('click', this.onClick);
@@ -44,6 +56,8 @@ export default class EventDispatcher {
         this.root.addEventListener('load', this.onLoadCapture, true);
         // ページ全体のロード
         window.addEventListener('load', this.onWindowLoad, { once: true });
+        // ブラウザの戻る・進む操作
+        window.addEventListener('popstate', this.onPopstate);
     }
     /**
      * イベントリスナーの登録を停止します。
@@ -53,6 +67,7 @@ export default class EventDispatcher {
         this.root.removeEventListener('change', this.onChange);
         this.root.removeEventListener('load', this.onLoadCapture, true);
         window.removeEventListener('load', this.onWindowLoad);
+        window.removeEventListener('popstate', this.onPopstate);
     }
     /**
      * イベントを処理し、対応するProcedureを実行します。
@@ -96,4 +111,7 @@ export default class EventDispatcher {
         return null;
     }
 }
+/** Haori が history.state に埋め込む状態キー */
+EventDispatcher.HISTORY_STATE_KEY = '__haoriHistoryState__';
+export default EventDispatcher;
 //# sourceMappingURL=event_dispatcher.js.map

package/dist/src/event_dispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"event_dispatcher.js","sourceRoot":"","sources":["../../src/event_dispatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"event_dispatcher.js","sourceRoot":"","sources":["../../src/event_dispatcher.ts"],"names":[],"mappings":"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"}

package/dist/src/expression.d.ts

@@ -22,6 +22,8 @@ export default class Expression {
     private static getForbiddenBindingValues;
     /** プロパティアクセスで拒否する名前 */
     private static readonly FORBIDDEN_PROPERTY_NAMES;
+    /** object literal のプロパティ定義で前置修飾子として扱う識別子 */
+    private static readonly OBJECT_PROPERTY_MODIFIERS;
     /** 式構文として許可しない予約語 */
     private static readonly DISALLOWED_KEYWORDS;
     /** 式 → 評価関数のグローバルキャッシュ */
@@ -92,6 +94,14 @@ export default class Expression {
      * @returns メンバーアクセスであればtrue
      */
     private static startsMemberAccess;
+    /**
+     * object literal 内で次のトークンがキー位置かどうかを判定します。
+     *
+     * @param activeGroup 現在のグループ種別
+     * @param previous 直前のトークン
+     * @returns object literal のキー位置であれば true
+     */
+    private static startsObjectKey;
     /**
      * 文字列リテラルをプレーン文字列へ変換します。
      *

package/dist/src/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../src/expression.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAcH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,0DAA0D;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAgCrC;IAEF,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAEvE,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAyB;IAE3E,wBAAwB;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAQ5C;IAEH;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiCxC,uBAAuB;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAI7C;IAEH,qBAAqB;IACrB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAkCxC;IAEH,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAGpC;IAEJ;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAO/B;;;;;OAKG;WACW,QAAQ,CACpB,UAAU,EAAE,MAAM,EAClB,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACzC,OAAO;IAiEV;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAYvE;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAuF/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAiGjC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IA6B9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAwB9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAqBlC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IA+BlC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAa9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IA4E7B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAe9B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiCxC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAc7D;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,8BAA8B,CAC7C,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,OAAO,CAAC,MAAM,CAAyB,GAC5C,OAAO;CAgCX"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../src/expression.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAcH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,0DAA0D;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAgCrC;IAEF,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAEvE,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CAAyB;IAE3E,wBAAwB;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAQ5C;IAEH;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiCxC,uBAAuB;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAI7C;IAEH,4CAA4C;IAC5C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAI9C;IAEH,qBAAqB;IACrB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAkCxC;IAEH,0BAA0B;IAC1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAGpC;IAEJ;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAO/B;;;;;OAKG;WACW,QAAQ,CACpB,UAAU,EAAE,MAAM,EAClB,YAAY,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACzC,OAAO;IAiEV;;;;;OAKG;IACH,SAAS,CAAC,MAAM,CAAC,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAYvE;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IA8H/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAmGjC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IA6B9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAwB9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAqBlC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAoC9B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAkClC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAa9B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IA4E7B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAe9B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAiCxC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAQ7B;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAc7D;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,8BAA8B,CAC7C,GAAG,EAAE,OAAO,EACZ,IAAI,GAAE,OAAO,CAAC,MAAM,CAAyB,GAC5C,OAAO;CAgCX"}

package/dist/src/expression.js

@@ -141,6 +141,21 @@ class Expression {
             const token = tokens[index];
             const next = tokens[index + 1] || null;
             const activeGroup = groups[groups.length - 1] || null;
+            const beforePrevious = tokens[index - 2] || null;
+            const thirdPrevious = tokens[index - 3] || null;
+            if (this.startsObjectKey(activeGroup, previous, beforePrevious, thirdPrevious)) {
+                if (token.value === '[') {
+                    return false;
+                }
+                if (token.type === 'identifier' &&
+                    this.FORBIDDEN_PROPERTY_NAMES.has(token.value)) {
+                    return false;
+                }
+                if (token.type === 'string' &&
+                    this.FORBIDDEN_PROPERTY_NAMES.has(this.decodeStringLiteral(token.value))) {
+                    return false;
+                }
+            }
             if (token.type === 'identifier') {
                 if (this.DISALLOWED_KEYWORDS.has(token.value)) {
                     return false;
@@ -186,6 +201,9 @@ class Expression {
                     groups.push(group);
                     break;
                 }
+                case '{':
+                    groups.push('object');
+                    break;
                 case ']': {
                     const group = groups.pop();
                     if (group === undefined) {
@@ -193,6 +211,13 @@ class Expression {
                     }
                     break;
                 }
+                case '}': {
+                    const group = groups.pop();
+                    if (group !== 'object') {
+                        return false;
+                    }
+                    break;
+                }
             }
             previous = token;
         }
@@ -222,6 +247,8 @@ class Expression {
         const singleCharacters = new Set([
             '(',
             ')',
+            '{',
+            '}',
             '[',
             ']',
             '.',
@@ -380,6 +407,35 @@ class Expression {
             previous.value === ']' ||
             previous.value === '?.');
     }
+    /**
+     * object literal 内で次のトークンがキー位置かどうかを判定します。
+     *
+     * @param activeGroup 現在のグループ種別
+     * @param previous 直前のトークン
+     * @returns object literal のキー位置であれば true
+     */
+    static startsObjectKey(activeGroup, previous, beforePrevious, thirdPrevious) {
+        if (activeGroup !== 'object') {
+            return false;
+        }
+        if (previous?.value === '{' || previous?.value === ',') {
+            return true;
+        }
+        if (previous?.type === 'identifier' &&
+            this.OBJECT_PROPERTY_MODIFIERS.has(previous.value) &&
+            (beforePrevious?.value === '{' || beforePrevious?.value === ',')) {
+            return true;
+        }
+        if (previous?.value !== '*') {
+            return false;
+        }
+        if (beforePrevious?.value === '{' || beforePrevious?.value === ',') {
+            return true;
+        }
+        return (beforePrevious?.type === 'identifier' &&
+            beforePrevious.value === 'async' &&
+            (thirdPrevious?.value === '{' || thirdPrevious?.value === ','));
+    }
     /**
      * 文字列リテラルをプレーン文字列へ変換します。
      *
@@ -389,6 +445,7 @@ class Expression {
     static decodeStringLiteral(literal) {
         return literal
             .slice(1, -1)
+            .replace(/\\u\{([0-9a-fA-F]+)\}/g, (_, code) => String.fromCodePoint(parseInt(code, 16)))
             .replace(/\\u([0-9a-fA-F]{4})/g, (_, code) => String.fromCharCode(parseInt(code, 16)))
             .replace(/\\x([0-9a-fA-F]{2})/g, (_, code) => String.fromCharCode(parseInt(code, 16)))
             .replace(/\\(["'\\bfnrtv0])/g, (_, escaped) => {
@@ -652,6 +709,12 @@ Expression.FORBIDDEN_PROPERTY_NAMES = new Set([
     '__proto__',
     'prototype',
 ]);
+/** object literal のプロパティ定義で前置修飾子として扱う識別子 */
+Expression.OBJECT_PROPERTY_MODIFIERS = new Set([
+    'get',
+    'set',
+    'async',
+]);
 /** 式構文として許可しない予約語 */
 Expression.DISALLOWED_KEYWORDS = new Set([
     'await',

package/dist/src/expression.js.map

@@ -1 +1 @@
-{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../src/expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expression.js","sourceRoot":"","sources":["../../src/expression.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -14,5 +14,5 @@ import './observer';
 export { Core, Env, Fragment, Form, Haori, Log, Queue };
 export type { HaoriRuntime } from './env';
 export default Haori;
-export declare const version = "0.4.3";
+export declare const version = "0.4.6";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.js

@@ -17,5 +17,5 @@ export { Core, Env, Fragment, Form, Haori, Log, Queue };
 // デフォルトエクスポート（Haoriをメインとして提供）
 export default Haori;
 // バージョン情報
-export const version = '0.4.3';
+export const version = '0.4.6';
 //# sourceMappingURL=index.js.map

package/dist/src/procedure.d.ts

@@ -94,6 +94,10 @@ export interface ProcedureOptions {
     historyFormFragment?: ElementFragment | null;
     /** リダイレクトURL */
     redirectUrl?: string | null;
+    /** エラー時に最初のエラー要素へスクロールするかどうか */
+    scrollOnError?: boolean | null;
+    /** 成功時にスクロールする要素のCSSセレクター */
+    scrollTarget?: string | null;
 }
 /**
  * 手続き的処理管理クラスです。
@@ -230,12 +234,21 @@ export default class Procedure {
      */
     validate(fragment: ElementFragment): boolean;
     /**
-     * 対象のフラグメントに対してバリデーションを実行します。
+     * 対象フラグメント以下で DOM 順の最上部にある invalid 要素を返します。
+     * 副作用のない checkValidity のみを使用し、検出のみを行います。
      *
      * @param fragment 対象のフラグメント
-     * @returns バリデーション結果（true: 成功, false: 失敗）
+     * @returns 最初の invalid 要素、なければ null
+     */
+    private findFirstInvalid;
+    /**
+     * 対象のフラグメントに対して、副作用なく有効性を検査します。
+     * reportValidity は使わず checkValidity のみ呼び出します。
+     *
+     * @param fragment 対象のフラグメント
+     * @returns 有効なら true、無効なら false
      */
-    private validateOne;
+    private checkOne;
     /**
      * 確認メッセージを表示し、ユーザーの確認を求めます。
      * メッセージが設定されていない場合は、即座に成功とみなします。

package/dist/src/procedure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"procedure.d.ts","sourceRoot":"","sources":["../../src/procedure.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAiB,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAuGrD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,sBAAsB;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,mBAAmB;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,qBAAqB;IACrB,YAAY,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,sBAAsB;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,sBAAsB;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB;IAClB,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC,qBAAqB;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,cAAc;IACd,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B,kBAAkB;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAEtC,mBAAmB;IACnB,cAAc,CAAC,EAAE,CACf,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,YAAY,EAAE,WAAW,GAAG,IAAI,KAC7B,oBAAoB,GAAG,OAAO,GAAG,IAAI,CAAC;IAE3C,mBAAmB;IACnB,YAAY,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAEtC,cAAc;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEzB,gBAAgB;IAChB,YAAY,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAElC,mBAAmB;IACnB,aAAa,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAEzC,+BAA+B;IAC/B,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,qCAAqC;IACrC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAEnC,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAExB,mBAAmB;IACnB,aAAa,CAAC,EAAE,CACd,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzC,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAC;IAE1C,mBAAmB;IACnB,eAAe,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAE3C,gBAAgB;IAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,aAAa;IACb,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAExB,aAAa;IACb,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE3B,mBAAmB;IACnB,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE7B,mBAAmB;IACnB,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAE7B,mBAAmB;IACnB,cAAc,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAE1C,oBAAoB;IACpB,gBAAgB,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAE5C,mBAAmB;IACnB,cAAc,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAE1C,qBAAqB;IACrB,aAAa,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAEzC,sBAAsB;IACtB,cAAc,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAE1C,iBAAiB;IACjB,aAAa,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAEzC,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAE7B,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE9B,gBAAgB;IAChB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7B,cAAc;IACd,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IAE7D,kCAAkC;IAClC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3B,4CAA4C;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE7C,8CAA8C;IAC9C,mBAAmB,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAE7C,gBAAgB;IAChB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,8BAA8B;IAC9B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CACC;IAE/C,+BAA+B;IAC/B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CACF;IAE9C;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ;IAavB;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IA0BrC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAoBlC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAYzC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kCAAkC;IAWjD;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAuBpC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAiCnC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IA0gB3B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAWhC,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAE3C;;;;OAIG;gBACS,OAAO,EAAE,gBAAgB;IAErC;;;;;OAKG;gBACS,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB3D;;;;OAIG;IACH,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpB;;;;OAIG;IACH,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC;;;;OAIG;YACW,OAAO;IAmMrB;;OAEG;YACW,iBAAiB;IAyH/B;;;;;;OAMG;IACH,OAAO,CAAC,WAAW;IA+DnB;;OAEG;YACW,gBAAgB;IA2F9B;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO;IAmB5C;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAcnB;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IAQf;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAwElB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAwB9B;;OAEG;IACH,OAAO,CAAC,IAAI;IAoBZ;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAU7B;;OAEG;IACH,OAAO,CAAC,YAAY;IAgBpB;;OAEG;IACH,OAAO,CAAC,MAAM;IA4Bd;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAetB;;;;OAIG;IACH,OAAO,CAAC,MAAM;IAmBd;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAyBjB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAmBnB;;;;OAIG;IACH,OAAO,CAAC,WAAW;CAkBpB"}
+{"version":3,"file":"procedure.d.ts","sourceRoot":"","sources":["../../src/procedure.ts"],"names":[],"mappings":"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"}

package/dist/src/procedure.js

@@ -19,6 +19,7 @@ const PROCEDURE_HAORI_METHOD_NAMES = [
     'openDialog',
     'toast',
 ];
+const PROCEDURE_HISTORY_STATE_KEY = '__haoriHistoryState__';
 /**
  * Procedure から利用する Haori API を解決します。
  * window.Haori が差し替えられている場合はそちらを優先します。
@@ -537,6 +538,12 @@ ${body}
             if (fragment.hasAttribute(Procedure.attrName(event, 'redirect'))) {
                 options.redirectUrl = fragment.getAttribute(Procedure.attrName(event, 'redirect'));
             }
+            if (fragment.hasAttribute(Procedure.attrName(event, 'scroll-error'))) {
+                options.scrollOnError = true;
+            }
+            if (fragment.hasAttribute(Procedure.attrName(event, 'scroll'))) {
+                options.scrollTarget = fragment.getAttribute(Procedure.attrName(event, 'scroll'));
+            }
             // history（data-{event}-history / history-data / history-form）
             if (fragment.hasAttribute(Procedure.attrName(event, 'history'))) {
                 options.historyUrl = fragment.getAttribute(Procedure.attrName(event, 'history'));
@@ -945,6 +952,10 @@ ${body}
             await activeHaori.toast(this.options.toastMessage, this.options.toastLevel ?? 'info');
         }
         this.pushHistory();
+        if (this.options.scrollTarget) {
+            const el = document.querySelector(this.options.scrollTarget);
+            el?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+        }
         if (this.options.redirectUrl) {
             window.location.href = this.options.redirectUrl;
         }
@@ -999,7 +1010,7 @@ ${body}
             if (hasHistoryForm) {
                 appendParams(Form.getValues(this.options.historyFormFragment));
             }
-            history.pushState({}, '', url.toString());
+            history.pushState({ [PROCEDURE_HISTORY_STATE_KEY]: true }, '', url.toString());
         }
         catch (e) {
             Log.error('Haori', `history.pushState failed: ${e}`);
@@ -1023,6 +1034,20 @@ ${body}
             const targetEl = baseFragment ? baseFragment.getTarget() : document.body;
             await resolveProcedureHaoriApi().addErrorMessage(targetEl, message);
         };
+        const scrollToFirstError = () => {
+            if (!this.options.scrollOnError) {
+                return;
+            }
+            const root = baseFragment ? baseFragment.getTarget() : document.body;
+            // addErrorMessage はフォーム以外の target に対して parentElement へエラーを付与するため、
+            // root 自身・parentElement・root 配下の順で探索する
+            const errorTarget = root.getAttribute('data-message-level') === 'error'
+                ? root
+                : root.parentElement?.getAttribute('data-message-level') === 'error'
+                    ? root.parentElement
+                    : root.querySelector('[data-message-level="error"]');
+            errorTarget?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+        };
         // コンテンツタイプに応じて解析
         const contentType = response.headers.get('Content-Type') || '';
         if (contentType.includes('application/json')) {
@@ -1072,6 +1097,7 @@ ${body}
                 if (entries.length === 0) {
                     // 汎用メッセージ
                     await addGeneralMessage(`${response.status} ${response.statusText}`);
+                    scrollToFirstError();
                     return false;
                 }
                 // メッセージを反映
@@ -1083,6 +1109,7 @@ ${body}
                         await addGeneralMessage(e.message);
                     }
                 }
+                scrollToFirstError();
                 return false;
             }
             catch {
@@ -1102,6 +1129,7 @@ ${body}
         catch {
             await addGeneralMessage(`${response.status} ${response.statusText}`);
         }
+        scrollToFirstError();
         return false;
     }
     /**
@@ -1115,36 +1143,55 @@ ${body}
         if (this.options.valid !== true) {
             return true;
         }
-        const target = fragment.getTarget();
-        let result = this.validateOne(fragment);
-        if (!result) {
-            target.focus();
-        }
-        // エラー要素のフォーカスを最上部に移動するため、子要素は逆順で処理
-        fragment
-            .getChildElementFragments()
-            .reverse()
-            .forEach(child => {
-            result && (result = this.validate(child));
-        });
-        return result;
+        const firstInvalid = this.findFirstInvalid(fragment);
+        if (firstInvalid === null) {
+            return true;
+        }
+        // 検出フェーズ（findFirstInvalid）は checkValidity で副作用なく走査済み。
+        // reportValidity と focus は確定した 1 要素にだけ呼び出す。
+        firstInvalid.reportValidity();
+        firstInvalid.focus();
+        if (this.options.scrollOnError) {
+            firstInvalid.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+        }
+        return false;
     }
     /**
-     * 対象のフラグメントに対してバリデーションを実行します。
+     * 対象フラグメント以下で DOM 順の最上部にある invalid 要素を返します。
+     * 副作用のない checkValidity のみを使用し、検出のみを行います。
      *
      * @param fragment 対象のフラグメント
-     * @returns バリデーション結果（true: 成功, false: 失敗）
+     * @returns 最初の invalid 要素、なければ null
      */
-    validateOne(fragment) {
-        const target = fragment.getTarget();
-        if (target instanceof HTMLInputElement) {
-            return target.reportValidity();
+    findFirstInvalid(fragment) {
+        // 子要素を逆順に処理することで、DOM 順の先頭要素が最後に found を上書きし、
+        // 最終的に最上部の invalid 要素が返る
+        let found = null;
+        for (const child of fragment.getChildElementFragments().reverse()) {
+            const result = this.findFirstInvalid(child);
+            if (result !== null) {
+                found = result;
+            }
         }
-        if (target instanceof HTMLSelectElement) {
-            return target.reportValidity();
+        // 自身は子より DOM 上位にあるため、invalid なら子の結果を上書きする
+        if (!this.checkOne(fragment)) {
+            return fragment.getTarget();
         }
-        if (target instanceof HTMLTextAreaElement) {
-            return target.reportValidity();
+        return found;
+    }
+    /**
+     * 対象のフラグメントに対して、副作用なく有効性を検査します。
+     * reportValidity は使わず checkValidity のみ呼び出します。
+     *
+     * @param fragment 対象のフラグメント
+     * @returns 有効なら true、無効なら false
+     */
+    checkOne(fragment) {
+        const target = fragment.getTarget();
+        if (target instanceof HTMLInputElement ||
+            target instanceof HTMLSelectElement ||
+            target instanceof HTMLTextAreaElement) {
+            return target.checkValidity();
         }
         return true;
     }