haori 0.4.8 → 0.4.9

package/dist/index.d.ts

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

package/dist/package.json

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

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.8";
+export declare const version = "0.4.9";
 //# 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.8';
+export const version = '0.4.9';
 //# sourceMappingURL=index.js.map

package/dist/src/procedure.d.ts

@@ -107,6 +107,10 @@ export default class Procedure {
     private static readonly DATA_PLACEHOLDER_REGEX;
     /** 属性全体が単一テンプレート式かを判定する正規表現 */
     private static readonly SINGLE_PLACEHOLDER_REGEX;
+    /** click 手続きの再入を防ぐ対象要素の集合 */
+    private static readonly RUNNING_CLICK_TARGETS;
+    /** この Procedure が扱うイベント種別 */
+    private readonly eventType;
     /**
      * イベント属性名を正しく生成します。
      * 例: ("click", "fetch") => "data-click-fetch"
@@ -209,6 +213,19 @@ export default class Procedure {
      * @returns 実行成功時は true、停止や失敗時は false
      */
     private execute;
+    /**
+     * click 手続きの重複実行を防ぐためのロックを取得します。
+     *
+     * @returns ロック情報。取得不要なら null、取得失敗なら false。
+     */
+    private acquireExecutionLock;
+    /**
+     * 取得済みの実行ロックを解放します。
+     *
+     * @param executionLock 解放対象のロック情報。
+     * @returns 戻り値はありません。
+     */
+    private releaseExecutionLock;
     /**
      * フェッチ後の処理を実行します。
      */

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

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

package/dist/src/procedure.js

@@ -676,9 +676,11 @@ ${body}
     constructor(arg1, arg2 = null) {
         if (Procedure.isElementFragment(arg1)) {
             this.options = Procedure.buildOptions(arg1, arg2);
+            this.eventType = arg2;
         }
         else {
             this.options = arg1;
+            this.eventType = null;
         }
     }
     /**
@@ -703,164 +705,209 @@ ${body}
      * @returns 実行成功時は true、停止や失敗時は false
      */
     async execute() {
-        if (Object.keys(this.options).length === 0) {
+        const executionLock = this.acquireExecutionLock();
+        if (executionLock === false) {
             return false;
         }
-        if (this.options.formFragment &&
-            this.validate(this.options.formFragment) === false) {
-            return false;
-        }
-        const confirmed = await this.confirm();
-        if (!confirmed) {
-            return false;
-        }
-        let fetchUrl = this.options.fetchUrl;
-        let fetchOptions = this.options.fetchOptions;
-        if (this.options.beforeCallback) {
-            const result = this.options.beforeCallback(fetchUrl || null, fetchOptions || null);
-            if (result !== undefined && result !== null) {
-                if (result === false || (typeof result === 'object' && result.stop)) {
-                    return false;
-                }
-                if (typeof result === 'object') {
-                    fetchUrl = ('fetchUrl' in result ? result.fetchUrl : fetchUrl);
-                    fetchOptions = ('fetchOptions' in result ? result.fetchOptions : fetchOptions);
-                }
+        try {
+            if (Object.keys(this.options).length === 0) {
+                return false;
             }
-        }
-        // フォーム値と data を統合してペイロードを作成
-        const payload = {};
-        if (this.options.formFragment) {
-            const formValues = Form.getValues(this.options.formFragment);
-            Object.assign(payload, formValues);
-        }
-        if (this.options.data && typeof this.options.data === 'object') {
-            Object.assign(payload, this.options.data);
-        }
-        const hasPayload = Object.keys(payload).length > 0;
-        if (fetchUrl) {
-            const finalOptions = { ...(fetchOptions || {}) };
-            const headers = new Headers(finalOptions.headers || undefined);
-            const requestedMethod = (finalOptions.method || 'GET').toUpperCase();
-            const isDemoQueryNormalization = Env.runtime === 'demo' && !isQueryTransportMethod(requestedMethod);
-            const method = isDemoQueryNormalization ? 'GET' : requestedMethod;
-            finalOptions.method = method;
-            if (method === 'GET' || method === 'HEAD' || method === 'OPTIONS') {
-                if (hasPayload) {
-                    fetchUrl = appendPayloadToUrl(fetchUrl, payload);
+            if (this.options.formFragment &&
+                this.validate(this.options.formFragment) === false) {
+                return false;
+            }
+            const confirmed = await this.confirm();
+            if (!confirmed) {
+                return false;
+            }
+            let fetchUrl = this.options.fetchUrl;
+            let fetchOptions = this.options.fetchOptions;
+            if (this.options.beforeCallback) {
+                const result = this.options.beforeCallback(fetchUrl || null, fetchOptions || null);
+                if (result !== undefined && result !== null) {
+                    if (result === false || (typeof result === 'object' && result.stop)) {
+                        return false;
+                    }
+                    if (typeof result === 'object') {
+                        fetchUrl = ('fetchUrl' in result ? result.fetchUrl : fetchUrl);
+                        fetchOptions = ('fetchOptions' in result ? result.fetchOptions : fetchOptions);
+                    }
                 }
             }
-            else if (hasPayload) {
-                const contentType = headers.get('Content-Type') || '';
-                if (/multipart\/form-data/i.test(contentType)) {
-                    headers.delete('Content-Type');
-                    const formData = new FormData();
-                    for (const [k, v] of Object.entries(payload)) {
-                        if (v === undefined || v === null) {
-                            formData.append(k, '');
-                        }
-                        else if (v instanceof Blob) {
-                            formData.append(k, v);
-                        }
-                        else if (Array.isArray(v)) {
-                            v.forEach(item => formData.append(k, String(item)));
-                        }
-                        else if (typeof v === 'object') {
-                            formData.append(k, JSON.stringify(v));
-                        }
-                        else {
-                            formData.append(k, String(v));
-                        }
+            // フォーム値と data を統合してペイロードを作成
+            const payload = {};
+            if (this.options.formFragment) {
+                const formValues = Form.getValues(this.options.formFragment);
+                Object.assign(payload, formValues);
+            }
+            if (this.options.data && typeof this.options.data === 'object') {
+                Object.assign(payload, this.options.data);
+            }
+            const hasPayload = Object.keys(payload).length > 0;
+            if (fetchUrl) {
+                const finalOptions = { ...(fetchOptions || {}) };
+                const headers = new Headers(finalOptions.headers || undefined);
+                const requestedMethod = (finalOptions.method || 'GET').toUpperCase();
+                const isDemoQueryNormalization = Env.runtime === 'demo' && !isQueryTransportMethod(requestedMethod);
+                const method = isDemoQueryNormalization ? 'GET' : requestedMethod;
+                finalOptions.method = method;
+                if (method === 'GET' || method === 'HEAD' || method === 'OPTIONS') {
+                    if (hasPayload) {
+                        fetchUrl = appendPayloadToUrl(fetchUrl, payload);
                     }
-                    finalOptions.body = formData;
                 }
-                else if (/application\/x-www-form-urlencoded/i.test(contentType)) {
-                    const params = new URLSearchParams();
-                    for (const [k, v] of Object.entries(payload)) {
-                        if (v === undefined) {
-                            continue;
-                        }
-                        if (v === null) {
-                            params.append(k, '');
-                        }
-                        else if (Array.isArray(v)) {
-                            v.forEach(item => params.append(k, String(item)));
-                        }
-                        else if (typeof v === 'object') {
-                            params.append(k, JSON.stringify(v));
+                else if (hasPayload) {
+                    const contentType = headers.get('Content-Type') || '';
+                    if (/multipart\/form-data/i.test(contentType)) {
+                        headers.delete('Content-Type');
+                        const formData = new FormData();
+                        for (const [k, v] of Object.entries(payload)) {
+                            if (v === undefined || v === null) {
+                                formData.append(k, '');
+                            }
+                            else if (v instanceof Blob) {
+                                formData.append(k, v);
+                            }
+                            else if (Array.isArray(v)) {
+                                v.forEach(item => formData.append(k, String(item)));
+                            }
+                            else if (typeof v === 'object') {
+                                formData.append(k, JSON.stringify(v));
+                            }
+                            else {
+                                formData.append(k, String(v));
+                            }
                         }
-                        else {
-                            params.append(k, String(v));
+                        finalOptions.body = formData;
+                    }
+                    else if (/application\/x-www-form-urlencoded/i.test(contentType)) {
+                        const params = new URLSearchParams();
+                        for (const [k, v] of Object.entries(payload)) {
+                            if (v === undefined) {
+                                continue;
+                            }
+                            if (v === null) {
+                                params.append(k, '');
+                            }
+                            else if (Array.isArray(v)) {
+                                v.forEach(item => params.append(k, String(item)));
+                            }
+                            else if (typeof v === 'object') {
+                                params.append(k, JSON.stringify(v));
+                            }
+                            else {
+                                params.append(k, String(v));
+                            }
                         }
+                        finalOptions.body = params;
+                    }
+                    else {
+                        headers.set('Content-Type', 'application/json');
+                        finalOptions.body = JSON.stringify(payload);
                     }
-                    finalOptions.body = params;
                 }
-                else {
-                    headers.set('Content-Type', 'application/json');
-                    finalOptions.body = JSON.stringify(payload);
+                finalOptions.headers = headers;
+                let queryString;
+                if (isDemoQueryNormalization) {
+                    queryString = fetchUrl
+                        ? new URL(fetchUrl, window.location.href).search || undefined
+                        : undefined;
+                    headers.delete('Content-Type');
+                    Log.info('Haori demo fetch normalization', {
+                        runtime: Env.runtime,
+                        requestedMethod,
+                        effectiveMethod: method,
+                        transportMode: 'query-get',
+                        url: fetchUrl,
+                        payload: hasPayload ? payload : undefined,
+                        queryString,
+                    });
                 }
-            }
-            finalOptions.headers = headers;
-            let queryString;
-            if (isDemoQueryNormalization) {
-                queryString = fetchUrl
-                    ? new URL(fetchUrl, window.location.href).search || undefined
-                    : undefined;
-                headers.delete('Content-Type');
-                Log.info('Haori demo fetch normalization', {
-                    runtime: Env.runtime,
-                    requestedMethod,
-                    effectiveMethod: method,
-                    transportMode: 'query-get',
-                    url: fetchUrl,
-                    payload: hasPayload ? payload : undefined,
-                    queryString,
-                });
-            }
-            // fetchstartイベントを発火
-            if (this.options.targetFragment && fetchUrl) {
-                const startedAt = performance.now();
-                const fetchStartMetadata = {
-                    runtime: Env.runtime,
-                    requestedMethod,
-                    effectiveMethod: method,
-                    transportMode: isDemoQueryNormalization ? 'query-get' : 'http',
-                    ...(isDemoQueryNormalization ? { queryString } : {}),
-                };
-                HaoriEvent.fetchStart(this.options.targetFragment.getTarget(), fetchUrl, finalOptions, hasPayload ? payload : undefined, fetchStartMetadata);
-                return fetch(fetchUrl, finalOptions)
-                    .then(response => {
-                    return this.handleFetchResult(response, fetchUrl || undefined, startedAt);
-                })
-                    .catch(error => {
-                    if (fetchUrl) {
-                        HaoriEvent.fetchError(this.options.targetFragment.getTarget(), fetchUrl, error);
-                    }
-                    throw error;
+                // fetchstartイベントを発火
+                if (this.options.targetFragment && fetchUrl) {
+                    const startedAt = performance.now();
+                    const fetchStartMetadata = {
+                        runtime: Env.runtime,
+                        requestedMethod,
+                        effectiveMethod: method,
+                        transportMode: isDemoQueryNormalization ? 'query-get' : 'http',
+                        ...(isDemoQueryNormalization ? { queryString } : {}),
+                    };
+                    HaoriEvent.fetchStart(this.options.targetFragment.getTarget(), fetchUrl, finalOptions, hasPayload ? payload : undefined, fetchStartMetadata);
+                    return fetch(fetchUrl, finalOptions)
+                        .then(response => {
+                        return this.handleFetchResult(response, fetchUrl || undefined, startedAt);
+                    })
+                        .catch(error => {
+                        if (fetchUrl) {
+                            HaoriEvent.fetchError(this.options.targetFragment.getTarget(), fetchUrl, error);
+                        }
+                        throw error;
+                    });
+                }
+                return fetch(fetchUrl, finalOptions).then(response => {
+                    return this.handleFetchResult(response, fetchUrl || undefined);
                 });
             }
-            return fetch(fetchUrl, finalOptions).then(response => {
-                return this.handleFetchResult(response, fetchUrl || undefined);
+            // fetchUrlが無い場合(changeイベント等)、bindFragmentsが無ければformFragmentにバインド
+            if ((!this.options.bindFragments ||
+                this.options.bindFragments.length === 0) &&
+                this.options.formFragment &&
+                hasPayload) {
+                // 双方向バインディング: フォーム値を自動的にバインディングデータに反映
+                const formFragment = this.options.formFragment;
+                const formElement = formFragment.getTarget();
+                formElement.setAttribute(`${Env.prefix}bind`, JSON.stringify(payload));
+                const bindingData = formFragment.getBindingData();
+                Object.assign(bindingData, payload);
+                await Core.setBindingData(formElement, bindingData);
+            }
+            const merged = hasPayload ? payload : {};
+            const response = new Response(JSON.stringify(merged), {
+                headers: { 'Content-Type': 'application/json' },
             });
+            return this.handleFetchResult(response);
+        }
+        finally {
+            this.releaseExecutionLock(executionLock);
+        }
+    }
+    /**
+     * click 手続きの重複実行を防ぐためのロックを取得します。
+     *
+     * @returns ロック情報。取得不要なら null、取得失敗なら false。
+     */
+    acquireExecutionLock() {
+        if (this.eventType !== 'click' || !this.options.targetFragment) {
+            return null;
+        }
+        const target = this.options.targetFragment.getTarget();
+        if (Procedure.RUNNING_CLICK_TARGETS.has(target) ||
+            target.hasAttribute('disabled')) {
+            return false;
+        }
+        Procedure.RUNNING_CLICK_TARGETS.add(target);
+        target.setAttribute('disabled', '');
+        return {
+            target,
+            appliedDisabledAttribute: true,
+        };
+    }
+    /**
+     * 取得済みの実行ロックを解放します。
+     *
+     * @param executionLock 解放対象のロック情報。
+     * @returns 戻り値はありません。
+     */
+    releaseExecutionLock(executionLock) {
+        if (!executionLock) {
+            return;
+        }
+        Procedure.RUNNING_CLICK_TARGETS.delete(executionLock.target);
+        if (executionLock.appliedDisabledAttribute) {
+            executionLock.target.removeAttribute('disabled');
         }
-        // fetchUrlが無い場合(changeイベント等)、bindFragmentsが無ければformFragmentにバインド
-        if ((!this.options.bindFragments ||
-            this.options.bindFragments.length === 0) &&
-            this.options.formFragment &&
-            hasPayload) {
-            // 双方向バインディング: フォーム値を自動的にバインディングデータに反映
-            const formFragment = this.options.formFragment;
-            const formElement = formFragment.getTarget();
-            formElement.setAttribute(`${Env.prefix}bind`, JSON.stringify(payload));
-            const bindingData = formFragment.getBindingData();
-            Object.assign(bindingData, payload);
-            await Core.setBindingData(formElement, bindingData);
-        }
-        const merged = hasPayload ? payload : {};
-        const response = new Response(JSON.stringify(merged), {
-            headers: { 'Content-Type': 'application/json' },
-        });
-        return this.handleFetchResult(response);
     }
     /**
      * フェッチ後の処理を実行します。
@@ -1475,5 +1522,7 @@ ${body}
 Procedure.DATA_PLACEHOLDER_REGEX = /\{\{\{([\s\S]+?)\}\}\}|\{\{([\s\S]+?)\}\}/g;
 /** 属性全体が単一テンプレート式かを判定する正規表現 */
 Procedure.SINGLE_PLACEHOLDER_REGEX = /^(\{\{\{[\s\S]+?\}\}\}|\{\{[\s\S]+?\}\})$/;
+/** click 手続きの再入を防ぐ対象要素の集合 */
+Procedure.RUNNING_CLICK_TARGETS = new WeakSet();
 export default Procedure;
 //# sourceMappingURL=procedure.js.map