@verbb/formie-browser 1.0.16 → 1.0.17-next.6.ge714580bc362

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"create-formie-client.d.ts","sourceRoot":"","sources":["../../../src/js/core/create-formie-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,YAAY,EAGf,MAAM,mBAAmB,CAAC;AAq3B3B,wBAAgB,kBAAkB,IAAI,YAAY,CAuuBjD"}
1
+ {"version":3,"file":"create-formie-client.d.ts","sourceRoot":"","sources":["../../../src/js/core/create-formie-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,YAAY,EAGf,MAAM,mBAAmB,CAAC;AA63B3B,wBAAgB,kBAAkB,IAAI,YAAY,CA2uBjD"}
@@ -1 +1 @@
1
- {"version":3,"file":"submit-result-ui.d.ts","sourceRoot":"","sources":["../../../src/js/core/submit-result-ui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAuK1D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CA6B5D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAmB3D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CA6B5D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAI5D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAqDpG;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAclF;AAYD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAY7E;AAgBD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,IAAI,CA0CpH;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAoDzF"}
1
+ {"version":3,"file":"submit-result-ui.d.ts","sourceRoot":"","sources":["../../../src/js/core/submit-result-ui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAyK1D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CA6B5D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAmB3D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CA8B5D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAI5D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,CAqDpG;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAalF;AAYD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAY7E;AAgBD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,IAAI,CA2CpH;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAoDzF"}
@@ -1 +1 @@
1
- {"version":3,"file":"hcaptcha.d.ts","sourceRoot":"","sources":["../../../../src/js/modules/captchas/hcaptcha.ts"],"names":[],"mappings":"AAmEA,eAAO,MAAM,cAAc,4CAqFzB,CAAC"}
1
+ {"version":3,"file":"hcaptcha.d.ts","sourceRoot":"","sources":["../../../../src/js/modules/captchas/hcaptcha.ts"],"names":[],"mappings":"AAoEA,eAAO,MAAM,cAAc,4CAqFzB,CAAC"}
@@ -0,0 +1,4 @@
1
+ type MessageKey = 'messageError' | 'messageSuccess';
2
+ export declare function applyMessageAttributes(target: Element, form: HTMLFormElement, key: MessageKey, remove?: boolean): void;
3
+ export {};
4
+ //# sourceMappingURL=message-attributes.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"message-attributes.d.ts","sourceRoot":"","sources":["../../../src/js/theme/message-attributes.ts"],"names":[],"mappings":"AAAA,KAAK,UAAU,GAAG,cAAc,GAAG,gBAAgB,CAAC;AAEpD,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,eAAe,EACrB,GAAG,EAAE,UAAU,EACf,MAAM,UAAQ,GACf,IAAI,CA8CN"}
@@ -2,7 +2,7 @@ import { type BrowserRequestOptions } from '@verbb/formie-core';
2
2
  import type { FormEndpointPayload, FormSubmitResult } from '#contracts/schema';
3
3
  export declare function requestRender(endpoint: string, handle: string, renderOptions?: Record<string, unknown>, requestOptions?: BrowserRequestOptions): Promise<FormEndpointPayload>;
4
4
  export declare function requestGraphqlRender(endpoint: string, handle: string, renderOptions?: Record<string, unknown>, requestOptions?: BrowserRequestOptions): Promise<FormEndpointPayload>;
5
- export declare function requestRefreshTokens(endpoint: string, handle: string, renderId?: string, requestOptions?: BrowserRequestOptions, requestToken?: string): Promise<FormEndpointPayload['refreshTokens']>;
5
+ export declare function requestRefreshTokens(endpoint: string, handle: string, renderId?: string, requestOptions?: BrowserRequestOptions, requestToken?: string, siteId?: string | number): Promise<FormEndpointPayload['refreshTokens']>;
6
6
  export declare function requestSetPage(url: string, form?: HTMLFormElement, pageId?: string): Promise<{
7
7
  success?: boolean;
8
8
  pageId?: string | number;
@@ -1 +1 @@
1
- {"version":3,"file":"forms-api.d.ts","sourceRoot":"","sources":["../../../src/js/transport/forms-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AA6G/E,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAAE,cAAc,GAAE,qBAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmB3L;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAAE,cAAc,GAAE,qBAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuClM;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,cAAc,GAAE,qBAA0B,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAqBhN;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACrC,CAAC,CAkDD;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI,CAoCrF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuDrG"}
1
+ {"version":3,"file":"forms-api.d.ts","sourceRoot":"","sources":["../../../src/js/transport/forms-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AA6G/E,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAAE,cAAc,GAAE,qBAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmB3L;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAAE,cAAc,GAAE,qBAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuClM;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,cAAc,GAAE,qBAA0B,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CA0B1O;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAChG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CACrC,CAAC,CAkDD;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,IAAI,CAoCrF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAuDrG"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@verbb/formie-browser",
3
- "version": "1.0.16",
3
+ "version": "1.0.17-next.6.ge714580bc362",
4
4
  "type": "module",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.js",
@@ -84,7 +84,8 @@
84
84
  "./vite-dev": "./vite-dev.mjs"
85
85
  },
86
86
  "publishConfig": {
87
- "access": "public"
87
+ "access": "public",
88
+ "tag": "next"
88
89
  },
89
90
  "scripts": {
90
91
  "prebuild": "node ../../scripts/generate-browser-theme-state.mjs",
@@ -101,7 +102,7 @@
101
102
  "@placekit/autocomplete-js": "^2.2.1",
102
103
  "@uppy/core": "^5.2.0",
103
104
  "@uppy/xhr-upload": "^5.2.0",
104
- "@verbb/formie-core": "1.0.16",
105
+ "@verbb/formie-core": "1.0.17-next.6.ge714580bc362",
105
106
  "expression-language": "^2.5.4",
106
107
  "flatpickr": "^4.6.13",
107
108
  "friendly-challenge": "^0.9.19",
@@ -110,5 +111,6 @@
110
111
  "pell": "^1.0.6",
111
112
  "signature_pad": "^5.1.3",
112
113
  "tom-select": "^2.6.1"
113
- }
114
+ },
115
+ "gitHead": "e714580bc3622204e739731c894b55897ccf2268"
114
116
  }
@@ -548,7 +548,11 @@ async function refreshTokensAfterSubmitIfNeeded(target: Element, options: FormMo
548
548
  const endpoint = resolveRefreshTokensEndpoint(options, target);
549
549
  const renderIdInput = form.querySelector('input[name="renderId"]') as HTMLInputElement | null;
550
550
  const renderId = renderIdInput?.value || undefined;
551
- const refreshTokens = await requestRefreshTokens(endpoint, formHandle, renderId, options, form?.querySelector<HTMLInputElement>('input[name="requestToken"]')?.value);
551
+ const refreshTokens = await requestRefreshTokens(
552
+ endpoint, formHandle, renderId, options,
553
+ form.querySelector<HTMLInputElement>('input[name="requestToken"]')?.value,
554
+ form.querySelector<HTMLInputElement>('input[name="siteId"]')?.value || options.siteId,
555
+ );
552
556
  applyRefreshTokensToForm(form, refreshTokens);
553
557
  dispatchFormieDomEvent(target, 'formie:refresh-tokens:refreshed', refreshTokens);
554
558
  }
@@ -878,7 +882,11 @@ async function refreshTokensIfNeeded(target: Element, options: FormMountOptions,
878
882
 
879
883
  // Refresh-tokens-before-ready is the cache-safe path: forms can render from SSR/cache
880
884
  // and still receive fresh transport tokens before the user submits anything.
881
- const refreshTokens = await requestRefreshTokens(endpoint, formHandle, renderId, options, form?.querySelector<HTMLInputElement>('input[name="requestToken"]')?.value);
885
+ const refreshTokens = await requestRefreshTokens(
886
+ endpoint, formHandle, renderId, options,
887
+ form?.querySelector<HTMLInputElement>('input[name="requestToken"]')?.value,
888
+ form?.querySelector<HTMLInputElement>('input[name="siteId"]')?.value || options.siteId,
889
+ );
882
890
 
883
891
  if (!refreshTokens || !form) {
884
892
  return;
@@ -1483,7 +1491,11 @@ export function createFormieClient(): FormieClient {
1483
1491
  return;
1484
1492
  }
1485
1493
 
1486
- const refreshTokens = await requestRefreshTokens(endpoint, formHandle, renderId, options, form?.querySelector<HTMLInputElement>('input[name="requestToken"]')?.value);
1494
+ const refreshTokens = await requestRefreshTokens(
1495
+ endpoint, formHandle, renderId, options,
1496
+ form.querySelector<HTMLInputElement>('input[name="requestToken"]')?.value,
1497
+ form.querySelector<HTMLInputElement>('input[name="siteId"]')?.value || options.siteId,
1498
+ );
1487
1499
 
1488
1500
  if (!refreshTokens) {
1489
1501
  return;
@@ -10,6 +10,7 @@ import { syncPageTabErrors } from '#core/page-tab-errors';
10
10
  import { focusFirstValidationError } from '#core/validation-focus';
11
11
  import { setFormHiddenState } from '#core/submit-result-state';
12
12
  import { addThemeClasses, removeThemeClasses } from '#theme/theme-classes';
13
+ import { applyMessageAttributes } from '#theme/message-attributes';
13
14
 
14
15
  const successHideTimers = new WeakMap<HTMLFormElement, number>();
15
16
 
@@ -124,6 +125,7 @@ function ensureFormErrorMessageContainer(form: HTMLFormElement, container: HTMLE
124
125
  container.appendChild(messageContainer);
125
126
  }
126
127
 
128
+ applyMessageAttributes(messageContainer, form, 'messageError');
127
129
  messageContainer.setAttribute('data-formie-message', 'true');
128
130
  messageContainer.setAttribute('data-formie-message-error', 'true');
129
131
  addThemeClasses(messageContainer, form, 'message', 'messageError');
@@ -231,6 +233,7 @@ export function clearFormSuccess(form: HTMLFormElement): void {
231
233
  successNode.remove();
232
234
  });
233
235
 
236
+ applyMessageAttributes(container, form, 'messageSuccess', true);
234
237
  removeThemeClasses(container, form, 'message', 'messageSuccess');
235
238
  container.removeAttribute('data-formie-message');
236
239
  container.removeAttribute('data-formie-message-success');
@@ -318,7 +321,6 @@ export function renderFormErrors(form: HTMLFormElement, formErrors: string[]): v
318
321
  formErrors.forEach((error) => {
319
322
  const errorNode = document.createElement('div');
320
323
  errorNode.setAttribute('data-formie-error', 'true');
321
- errorNode.setAttribute('role', 'alert');
322
324
  addThemeClasses(errorNode, form, 'error');
323
325
  errorNode.innerHTML = error;
324
326
  messageContainer.appendChild(errorNode);
@@ -372,6 +374,7 @@ export function renderFormSuccess(form: HTMLFormElement, message: string, option
372
374
 
373
375
  const container = ensureFormSuccessContainer(form, position);
374
376
 
377
+ applyMessageAttributes(container, form, 'messageSuccess');
375
378
  addThemeClasses(container, form, 'message', 'messageSuccess');
376
379
  container.setAttribute('data-formie-message', 'true');
377
380
  container.setAttribute('data-formie-message-success', 'true');
@@ -2,6 +2,7 @@ import {
2
2
  defineCaptchaModule,
3
3
  } from '#modules/captchas/api';
4
4
  import {
5
+ CAPTCHA_EXECUTE_WAIT_FOR_VALUE_MS,
5
6
  CAPTCHA_PROVIDER_LOAD_TIMEOUT_MS,
6
7
  } from '#modules/captchas/constants';
7
8
  import { ensureGlobal, loadExternalScript } from '#utils/scripts';
@@ -131,8 +132,8 @@ export const hcaptchaModule = defineCaptchaModule<HcaptchaProviderOptions, Hcapt
131
132
 
132
133
  // After execute(), the token will arrive asynchronously via the widget
133
134
  // callback configured in `mount()`. We therefore wait on the shared
134
- // token transport layer, not on a provider-specific promise chain.
135
- return services.tokens.wait().then((hasToken) => {
135
+ // token transport layer, allowing time for an interactive challenge.
136
+ return services.tokens.wait(CAPTCHA_EXECUTE_WAIT_FOR_VALUE_MS).then((hasToken) => {
136
137
  if (!hasToken) {
137
138
  // If the callback never produced a token in time, surface a
138
139
  // normal themed error and abort the submit pipeline's `screen`
@@ -0,0 +1,54 @@
1
+ type MessageKey = 'messageError' | 'messageSuccess';
2
+
3
+ export function applyMessageAttributes(
4
+ target: Element,
5
+ form: HTMLFormElement,
6
+ key: MessageKey,
7
+ remove = false,
8
+ ): void {
9
+ const raw = form.getAttribute('data-formie-message-attributes');
10
+
11
+ if (!raw) {
12
+ return;
13
+ }
14
+
15
+ let messages: unknown;
16
+
17
+ try {
18
+ messages = JSON.parse(raw);
19
+ } catch {
20
+ return;
21
+ }
22
+
23
+ if (!messages || typeof messages !== 'object' || Array.isArray(messages)) {
24
+ return;
25
+ }
26
+
27
+ const attributes: unknown = (messages as Record<string, unknown>)[key];
28
+
29
+ if (
30
+ !attributes ||
31
+ typeof attributes !== 'object' ||
32
+ Array.isArray(attributes)
33
+ ) {
34
+ return;
35
+ }
36
+
37
+ // These values are resolved by PHP using the same theme rules as server output.
38
+ // Classes and structural/live-region attributes remain owned by the caller.
39
+ Object.entries(attributes).forEach(([name, value]) => {
40
+ if (
41
+ name === 'class' ||
42
+ !/^[^\s"'<>/=]+$/.test(name) ||
43
+ (typeof value !== 'string' && value !== true)
44
+ ) {
45
+ return;
46
+ }
47
+
48
+ if (remove) {
49
+ target.removeAttribute(name);
50
+ } else {
51
+ target.setAttribute(name, value === true ? '' : value);
52
+ }
53
+ });
54
+ }
@@ -170,10 +170,15 @@ query FormieHtmlForm($handle: String!, $input: ServerRenderPayloadInput) {
170
170
  return payload;
171
171
  }
172
172
 
173
- export async function requestRefreshTokens(endpoint: string, handle: string, renderId?: string, requestOptions: BrowserRequestOptions = {}, requestToken?: string): Promise<FormEndpointPayload['refreshTokens']> {
173
+ export async function requestRefreshTokens(endpoint: string, handle: string, renderId?: string, requestOptions: BrowserRequestOptions = {}, requestToken?: string, siteId?: string | number): Promise<FormEndpointPayload['refreshTokens']> {
174
174
  const url = new URL(endpoint, window.location.origin);
175
175
  url.searchParams.set('handle', handle);
176
176
 
177
+ // Root-level action URLs cannot identify sites that share a domain and use path prefixes.
178
+ if (siteId !== undefined && siteId !== '') {
179
+ url.searchParams.set('siteId', String(siteId));
180
+ }
181
+
177
182
  if (renderId) {
178
183
  url.searchParams.set('renderId', renderId);
179
184
  }