@countriesdb/widget 0.1.19 → 0.1.21

package/dist/dom-manipulation.d.ts

@@ -23,7 +23,7 @@ export declare function applyPreselectedValue(select: SelectElement, apiKey?: st
 /**
  * Handle API error by showing error message in select
  */
-export declare function handleApiError(select: SelectElement, errorMessage: string | Error): void;
+export declare function handleApiError(select: SelectElement, errorMessage: string | Error, replace?: boolean): void;
 /**
  * Parse boolean from string value
  */

package/dist/dom-manipulation.js

@@ -142,12 +142,19 @@ export function applyPreselectedValue(select, apiKey) {
 /**
  * Handle API error by showing error message in select
  */
-export function handleApiError(select, errorMessage) {
+export function handleApiError(select, errorMessage, replace = false) {
     const message = errorMessage instanceof Error ? errorMessage.message : errorMessage;
     const defaultValue = select.dataset.defaultValue ?? '';
     // Add "Error: " prefix to match old widget behavior and test expectations
     const formattedMessage = message.startsWith('Error: ') ? message : `Error: ${message}`;
-    select.innerHTML += `<option value="${defaultValue}" disabled>${formattedMessage}</option>`;
+    if (replace) {
+        select.innerHTML = `<option value="${defaultValue}" disabled>${formattedMessage}</option>`;
+    }
+    else {
+        select.innerHTML += `<option value="${defaultValue}" disabled>${formattedMessage}</option>`;
+    }
+    // Ensure select is enabled so users can see the error
+    select.disabled = false;
 }
 /**
  * Parse boolean from string value

package/dist/index.esm.js

@@ -143,12 +143,19 @@ function applyPreselectedValue(select, apiKey) {
 /**
  * Handle API error by showing error message in select
  */
-function handleApiError(select, errorMessage) {
+function handleApiError(select, errorMessage, replace = false) {
     const message = errorMessage instanceof Error ? errorMessage.message : errorMessage;
     const defaultValue = select.dataset.defaultValue ?? '';
     // Add "Error: " prefix to match old widget behavior and test expectations
     const formattedMessage = message.startsWith('Error: ') ? message : `Error: ${message}`;
-    select.innerHTML += `<option value="${defaultValue}" disabled>${formattedMessage}</option>`;
+    if (replace) {
+        select.innerHTML = `<option value="${defaultValue}" disabled>${formattedMessage}</option>`;
+    }
+    else {
+        select.innerHTML += `<option value="${defaultValue}" disabled>${formattedMessage}</option>`;
+    }
+    // Ensure select is enabled so users can see the error
+    select.disabled = false;
 }
 
 /**
@@ -458,8 +465,7 @@ async function setupSubdivisionSelection(apiKey, backendUrl, state, config) {
             : null;
         // Check if linked country select is multi-select (not allowed)
         if (linkedCountrySelect && linkedCountrySelect.hasAttribute('multiple')) {
-            const defaultValue = select.dataset.defaultValue ?? '';
-            select.innerHTML = `<option value="${defaultValue}" disabled>Error: Cannot link to multi-select country. Use data-country-code instead.</option>`;
+            handleApiError(select, 'Cannot link to multi-select country. Use data-country-code instead.', true);
             continue;
         }
         // No direct link → maybe data-country-code
@@ -469,8 +475,7 @@ async function setupSubdivisionSelection(apiKey, backendUrl, state, config) {
                 await updateSubdivisionSelect(select, apiKey, backendUrl, state, config, select.dataset.countryCode);
             }
             else {
-                const defaultValue = select.dataset.defaultValue ?? '';
-                select.innerHTML += `<option value="${defaultValue}" disabled>Error: No country select present</option>`;
+                handleApiError(select, 'No country select present');
             }
         }
         // Always dispatch an update event for user-initiated subdivision changes
@@ -516,7 +521,8 @@ async function updateSubdivisionSelect(select, apiKey, backendUrl, state, config
             // Use GeoIP only if data-preselected attribute is not set at all
             const shouldUseGeoIP = preselectedValue === undefined || preselectedValue === null;
             // Check if this subdivision select prefers official subdivisions
-            const preferOfficial = select.hasAttribute('data-prefer-official');
+            const preferOfficial = select.hasAttribute('data-prefer-official') ||
+                config.preferOfficialSubdivisions;
             const languageHeaders = CountriesDBClient.getLanguageHeaders(config.forcedLanguage, config.defaultLanguage);
             const subdivisionsResult = await CountriesDBClient.fetchSubdivisions({
                 apiKey,
@@ -613,8 +619,7 @@ async function updateSubdivisionSelect(select, apiKey, backendUrl, state, config
     }
     else if (!select.dataset.country ||
         !document.querySelector(`.country-selection[data-name="${select.dataset.country}"]`)) {
-        const defaultValue = select.dataset.defaultValue ?? '';
-        select.innerHTML += `<option value="${defaultValue}" disabled>Error: No country select present</option>`;
+        handleApiError(select, 'No country select present');
     }
 }
 /**
@@ -643,8 +648,7 @@ async function setupCountrySelection(apiKey, backendUrl, state, config, subdivis
         if (name && seenNames[name]) {
             select.removeAttribute('data-name');
             initializeSelect(select, '&mdash;');
-            const defaultValue = select.dataset.defaultValue ?? '';
-            select.innerHTML += `<option value="${defaultValue}" disabled>Error: Duplicate field</option>`;
+            handleApiError(select, 'Duplicate field');
             continue;
         }
         if (name) {
@@ -808,6 +812,7 @@ async function CountriesWidgetLoad(options = {}) {
             followUpward: config.followUpward || false,
             showSubdivisionType: config.showSubdivisionType !== false,
             allowParentSelection: config.allowParentSelection || false,
+            preferOfficialSubdivisions: config.preferOfficialSubdivisions || false,
             subdivisionRomanizationPreference: config.subdivisionRomanizationPreference,
             preferLocalVariant: config.preferLocalVariant || false,
             subdivisionNameFilter: config.subdivisionNameFilter,
@@ -817,6 +822,7 @@ async function CountriesWidgetLoad(options = {}) {
             followUpward: config.followUpward || false,
             showSubdivisionType: config.showSubdivisionType !== false,
             allowParentSelection: config.allowParentSelection || false,
+            preferOfficialSubdivisions: config.preferOfficialSubdivisions || false,
             subdivisionRomanizationPreference: config.subdivisionRomanizationPreference,
             preferLocalVariant: config.preferLocalVariant || false,
             forcedLanguage: config.forcedLanguage,
@@ -849,6 +855,10 @@ async function CountriesWidgetLoad(options = {}) {
  * Get configuration from options or script URL parameters
  */
 function getConfigFromOptionsOrScript(options) {
+    // Check for global config first (for bundled widgets that need config before auto-init)
+    const globalConfig = typeof window !== 'undefined' && window.CountriesDBConfig
+        ? window.CountriesDBConfig
+        : null;
     // Try to get config from script URL (for backward compatibility with widget.blade.php)
     let scriptUrl = null;
     try {
@@ -877,36 +887,57 @@ function getConfigFromOptionsOrScript(options) {
         // Ignore errors
     }
     const config = {
-        publicKey: options.publicKey || scriptUrl?.searchParams.get('public_key') || '',
-        backendUrl: options.backendUrl ?? scriptUrl?.searchParams.get('backend_url') ?? getBackendUrlFromScript(),
-        defaultLanguage: options.defaultLanguage || scriptUrl?.searchParams.get('default_language') || undefined,
-        forcedLanguage: options.forcedLanguage || scriptUrl?.searchParams.get('forced_language') || undefined,
+        // Priority: options > globalConfig > scriptUrl params > defaults
+        publicKey: options.publicKey ?? globalConfig?.publicKey ?? scriptUrl?.searchParams.get('public_key') ?? '',
+        backendUrl: options.backendUrl ?? globalConfig?.backendUrl ?? scriptUrl?.searchParams.get('backend_url') ?? getBackendUrlFromScript(),
+        defaultLanguage: options.defaultLanguage ?? globalConfig?.defaultLanguage ?? scriptUrl?.searchParams.get('default_language') ?? undefined,
+        forcedLanguage: options.forcedLanguage ?? globalConfig?.forcedLanguage ?? scriptUrl?.searchParams.get('forced_language') ?? undefined,
         showSubdivisionType: options.showSubdivisionType !== undefined
             ? options.showSubdivisionType
-            : parseBoolean(scriptUrl?.searchParams.get('show_subdivision_type') ?? '1'),
+            : globalConfig?.showSubdivisionType !== undefined
+                ? globalConfig.showSubdivisionType
+                : parseBoolean(scriptUrl?.searchParams.get('show_subdivision_type') ?? '1'),
         followRelated: options.followRelated !== undefined
             ? options.followRelated
-            : parseBoolean(scriptUrl?.searchParams.get('follow_related') ?? 'false'),
+            : globalConfig?.followRelated !== undefined
+                ? globalConfig.followRelated
+                : parseBoolean(scriptUrl?.searchParams.get('follow_related') ?? 'false'),
         followUpward: options.followUpward !== undefined
             ? options.followUpward
-            : parseBoolean(scriptUrl?.searchParams.get('follow_upward') ?? 'false'),
+            : globalConfig?.followUpward !== undefined
+                ? globalConfig.followUpward
+                : parseBoolean(scriptUrl?.searchParams.get('follow_upward') ?? 'false'),
         allowParentSelection: options.allowParentSelection !== undefined
             ? options.allowParentSelection
-            : parseBoolean(scriptUrl?.searchParams.get('allow_parent_selection') ?? 'false'),
+            : globalConfig?.allowParentSelection !== undefined
+                ? globalConfig.allowParentSelection
+                : parseBoolean(scriptUrl?.searchParams.get('allow_parent_selection') ?? 'false'),
         isoCountryNames: options.isoCountryNames !== undefined
             ? options.isoCountryNames
-            : parseBoolean(scriptUrl?.searchParams.get('iso_country_names') ?? 'false'),
+            : globalConfig?.isoCountryNames !== undefined
+                ? globalConfig.isoCountryNames
+                : parseBoolean(scriptUrl?.searchParams.get('iso_country_names') ?? 'false'),
+        preferOfficialSubdivisions: options.preferOfficialSubdivisions !== undefined
+            ? options.preferOfficialSubdivisions
+            : globalConfig?.preferOfficialSubdivisions !== undefined
+                ? globalConfig.preferOfficialSubdivisions
+                : parseBoolean(scriptUrl?.searchParams.get('prefer_official') ?? 'false'),
         subdivisionRomanizationPreference: options.subdivisionRomanizationPreference ||
+            globalConfig?.subdivisionRomanizationPreference ||
             scriptUrl?.searchParams.get('subdivision_romanization_preference') ||
             undefined,
         preferLocalVariant: options.preferLocalVariant !== undefined
             ? options.preferLocalVariant
-            : parseBoolean(scriptUrl?.searchParams.get('prefer_local_variant') ?? 'false'),
-        countryNameFilter: options.countryNameFilter,
-        subdivisionNameFilter: options.subdivisionNameFilter,
+            : globalConfig?.preferLocalVariant !== undefined
+                ? globalConfig.preferLocalVariant
+                : parseBoolean(scriptUrl?.searchParams.get('prefer_local_variant') ?? 'false'),
+        countryNameFilter: options.countryNameFilter ?? globalConfig?.countryNameFilter,
+        subdivisionNameFilter: options.subdivisionNameFilter ?? globalConfig?.subdivisionNameFilter,
         autoInit: options.autoInit !== undefined
             ? options.autoInit
-            : parseBoolean(scriptUrl?.searchParams.get('auto_init') ?? 'true'),
+            : globalConfig?.autoInit !== undefined
+                ? globalConfig.autoInit
+                : parseBoolean(scriptUrl?.searchParams.get('auto_init') ?? 'true'),
     };
     // Resolve filter functions from global scope if specified by name
     if (scriptUrl) {
@@ -1006,14 +1037,14 @@ function parseBoolean(value) {
  * Show error when both follow_related and follow_upward are enabled
  */
 function showParamConflictError() {
-    const errorMessage = 'Error: Cannot enable both follow_related and follow_upward';
+    const errorMessage = 'Cannot enable both follow_related and follow_upward';
     const countrySelects = Array.from(document.querySelectorAll('.country-selection'));
     for (const select of countrySelects) {
-        select.innerHTML = `<option value="${select.dataset.defaultValue ?? ''}" disabled>${errorMessage}</option>`;
+        handleApiError(select, errorMessage, true);
     }
     const subdivisionSelects = Array.from(document.querySelectorAll('.subdivision-selection'));
     for (const select of subdivisionSelects) {
-        select.innerHTML = `<option value="${select.dataset.defaultValue ?? ''}" disabled>${errorMessage}</option>`;
+        handleApiError(select, errorMessage, true);
     }
 }
 // Expose public loader