@jskit-ai/http-web 0.1.92 → 0.1.93

package/src/client/composables/runtime/addEditUiRuntime.js

@@ -1,24 +1,11 @@
-import { computed, unref } from "vue";
+import { computed } from "vue";
 import { asPlainObject } from "../support/scopeHelpers.js";
 import {
+  createRouteTemplateResolver,
   normalizeRouteParamName,
-  resolveRouteParamsSource,
-  resolveScopedRoutePathname,
-  resolveRouteTemplateLocation,
   toRouteParamValue
 } from "../support/routeTemplateHelpers.js";
 
-function toResolvedRecordId({ routeParams, recordIdParam, routeRecordId }) {
-  const explicitRecordId = toRouteParamValue(
-    typeof routeRecordId === "function" ? routeRecordId() : unref(routeRecordId)
-  );
-  if (explicitRecordId) {
-    return explicitRecordId;
-  }
-
-  return toRouteParamValue(routeParams[recordIdParam]);
-}
-
 function resolveSavedRecordId(payload, saveRecordIdSelector) {
   const sourcePayload = asPlainObject(payload);
   if (typeof saveRecordIdSelector === "function") {
@@ -46,56 +33,21 @@ function createAddEditUiRuntime({
   const normalizedViewUrlTemplate = String(viewUrlTemplate || "").trim();
   const normalizedListUrlTemplate = String(listUrlTemplate || "").trim();
 
-  function resolveTemplatePath(urlTemplate = "", extraParams = {}) {
-    const normalizedTemplate = String(urlTemplate || "").trim();
-    if (!normalizedTemplate) {
-      return "";
-    }
-
-    const currentRouteParams = resolveRouteParamsSource(routeParams);
-    const sourceParams = {
-      ...currentRouteParams,
-      ...asPlainObject(extraParams)
-    };
-    const currentRouteRecordId = toResolvedRecordId({
-      routeParams: currentRouteParams,
-      recordIdParam: normalizedRecordIdParam,
-      routeRecordId
-    });
-    const resolvedRecordId = toRouteParamValue(sourceParams[normalizedRecordIdParam]) ||
-      currentRouteRecordId;
-    sourceParams[normalizedRecordIdParam] = resolvedRecordId;
-    const currentPathname = resolveScopedRoutePathname({
-      currentPathname: routePath,
-      params: currentRouteParams,
-      orderedParamNames: routeParamNames,
-      anchorParamName: normalizedRecordIdParam,
-      anchorParamValue: currentRouteRecordId,
-      anchorMode: "after"
-    });
-
-    return resolveRouteTemplateLocation(normalizedTemplate, {
-      params: sourceParams,
-      currentPathname
-    });
-  }
+  const { resolveRecordId, resolveTemplatePath } = createRouteTemplateResolver({
+    recordIdParam: normalizedRecordIdParam,
+    routeParams,
+    routeParamNames,
+    routePath,
+    routeRecordId,
+    anchorMode: "after"
+  });
 
-  const recordId = computed(() =>
-    toResolvedRecordId({
-      routeParams: resolveRouteParamsSource(routeParams),
-      recordIdParam: normalizedRecordIdParam,
-      routeRecordId
-    })
-  );
+  const recordId = computed(() => resolveRecordId());
 
   const apiSuffix = computed(() => resolveTemplatePath(normalizedApiUrlTemplate));
   const listUrl = computed(() => resolveTemplatePath(normalizedListUrlTemplate));
   const cancelUrl = computed(() => resolveTemplatePath(normalizedViewUrlTemplate) || listUrl.value);
 
-  function resolveParams(urlTemplate = "", extraParams = {}) {
-    return resolveTemplatePath(urlTemplate, extraParams);
-  }
-
   function resolveViewUrl(recordIdLike = "") {
     const targetRecordId = toRouteParamValue(recordIdLike);
     if (!targetRecordId) {
@@ -121,7 +73,7 @@ function createAddEditUiRuntime({
     apiSuffix,
     listUrl,
     cancelUrl,
-    resolveParams,
+    resolveParams: resolveTemplatePath,
     resolveViewUrl,
     resolveSavedViewUrl
   });

package/src/client/composables/runtime/listUiRuntime.js

@@ -1,11 +1,9 @@
 import { computed } from "vue";
 import { asPlainObject } from "../support/scopeHelpers.js";
 import {
+  createRouteTemplateResolver,
   normalizeRouteParamName,
-  toRouteParamValue,
-  resolveRouteParamsSource,
-  resolveScopedRoutePathname,
-  resolveRouteTemplateLocation
+  toRouteParamValue
 } from "../support/routeTemplateHelpers.js";
 
 function resolveRecordId(record, recordIdSelector) {
@@ -35,39 +33,17 @@ function createListUiRuntime({
   const normalizedEditUrlTemplate = String(editUrlTemplate || "").trim();
   const hasViewUrl = Boolean(normalizedViewUrlTemplate);
   const hasEditUrl = Boolean(normalizedEditUrlTemplate);
-  const actionColumnCount = (hasViewUrl ? 1 : 0) + (hasEditUrl ? 1 : 0);
   const normalizedItems = computed(() => (Array.isArray(items?.value) ? items.value : []));
   const showListSkeleton = computed(() => Boolean(isInitialLoading?.value && normalizedItems.value.length < 1));
 
-  function resolveTemplatePath(urlTemplate = "", extraParams = {}) {
-    const normalizedTemplate = String(urlTemplate || "").trim();
-    if (!normalizedTemplate) {
-      return "";
-    }
-
-    const currentRouteParams = resolveRouteParamsSource(routeParams);
-    const sourceParams = {
-      ...currentRouteParams,
-      ...asPlainObject(extraParams)
-    };
-    const currentPathname = resolveScopedRoutePathname({
-      currentPathname: routePath,
-      params: currentRouteParams,
-      orderedParamNames: routeParamNames,
-      anchorParamName: normalizedRecordIdParam,
-      anchorParamValue: currentRouteParams[normalizedRecordIdParam],
-      anchorMode: "before"
-    });
-
-    return resolveRouteTemplateLocation(normalizedTemplate, {
-      params: sourceParams,
-      currentPathname
-    });
-  }
-
-  function resolveParams(urlTemplate = "", extraParams = {}) {
-    return resolveTemplatePath(urlTemplate, extraParams);
-  }
+  const { resolveTemplatePath } = createRouteTemplateResolver({
+    recordIdParam: normalizedRecordIdParam,
+    routeParams,
+    routeParamNames,
+    routePath,
+    anchorMode: "before",
+    fillRecordId: false
+  });
 
   function resolveRowKey(record, index) {
     const recordId = resolveRecordId(record, recordIdSelector);
@@ -111,9 +87,8 @@ function createListUiRuntime({
   return Object.freeze({
     hasViewUrl,
     hasEditUrl,
-    actionColumnCount,
     showListSkeleton,
-    resolveParams,
+    resolveParams: resolveTemplatePath,
     resolveRowKey,
     resolveViewUrl,
     resolveEditUrl

package/src/client/composables/runtime/useFieldErrorBag.js

@@ -1,13 +1,13 @@
 import { reactive } from "vue";
 
-function normalizeKeys(keys) {
+function normalizeFieldErrorKeys(keys) {
   return Array.isArray(keys)
     ? keys.map((entry) => String(entry || "").trim()).filter(Boolean)
     : [];
 }
 
 function useFieldErrorBag(keys = []) {
-  const normalizedKeys = normalizeKeys(keys);
+  const normalizedKeys = normalizeFieldErrorKeys(keys);
   const hasFixedKeys = normalizedKeys.length > 0;
   const errors = reactive(
     Object.fromEntries(normalizedKeys.map((key) => [key, ""]))
@@ -58,4 +58,4 @@ function useFieldErrorBag(keys = []) {
   });
 }
 
-export { useFieldErrorBag };
+export { normalizeFieldErrorKeys, useFieldErrorBag };

package/src/client/composables/runtime/viewUiRuntime.js

@@ -1,24 +1,9 @@
-import { computed, unref } from "vue";
-import { asPlainObject } from "../support/scopeHelpers.js";
+import { computed } from "vue";
 import {
-  normalizeRouteParamName,
-  resolveRouteParamsSource,
-  resolveScopedRoutePathname,
-  resolveRouteTemplateLocation,
-  toRouteParamValue
+  createRouteTemplateResolver,
+  normalizeRouteParamName
 } from "../support/routeTemplateHelpers.js";
 
-function resolveRecordId({ routeParams, recordIdParam, routeRecordId }) {
-  const explicitRecordId = toRouteParamValue(
-    typeof routeRecordId === "function" ? routeRecordId() : unref(routeRecordId)
-  );
-  if (explicitRecordId) {
-    return explicitRecordId;
-  }
-
-  return toRouteParamValue(routeParams[recordIdParam]);
-}
-
 function createViewUiRuntime({
   recordIdParam = "recordId",
   routeParams = null,
@@ -36,60 +21,27 @@ function createViewUiRuntime({
   const normalizedListUrlTemplate = String(listUrlTemplate || "").trim();
   const normalizedEditUrlTemplate = String(editUrlTemplate || "").trim();
 
-  function resolveTemplatePath(urlTemplate = "", extraParams = {}) {
-    const normalizedTemplate = String(urlTemplate || "").trim();
-    if (!normalizedTemplate) {
-      return "";
-    }
-
-    const currentRouteParams = resolveRouteParamsSource(routeParams);
-    const sourceParams = {
-      ...currentRouteParams,
-      ...asPlainObject(extraParams)
-    };
-    const resolvedRecordId = toRouteParamValue(sourceParams[normalizedRecordIdParam]) ||
-      resolveRecordId({
-        routeParams: currentRouteParams,
-        recordIdParam: normalizedRecordIdParam,
-        routeRecordId
-      });
-    sourceParams[normalizedRecordIdParam] = resolvedRecordId;
-    const currentPathname = resolveScopedRoutePathname({
-      currentPathname: routePath,
-      params: currentRouteParams,
-      orderedParamNames: routeParamNames,
-      anchorParamName: normalizedRecordIdParam,
-      anchorParamValue: resolvedRecordId,
-      anchorMode: "at"
-    });
-
-    return resolveRouteTemplateLocation(normalizedTemplate, {
-      params: sourceParams,
-      currentPathname
-    });
-  }
+  const { resolveRecordId, resolveTemplatePath } = createRouteTemplateResolver({
+    recordIdParam: normalizedRecordIdParam,
+    routeParams,
+    routeParamNames,
+    routePath,
+    routeRecordId,
+    anchorMode: "at",
+    anchorOnTargetRecord: true
+  });
 
-  const recordId = computed(() =>
-    resolveRecordId({
-      routeParams: resolveRouteParamsSource(routeParams),
-      recordIdParam: normalizedRecordIdParam,
-      routeRecordId
-    })
-  );
+  const recordId = computed(() => resolveRecordId());
   const apiSuffix = computed(() => resolveTemplatePath(normalizedApiUrlTemplate));
   const listUrl = computed(() => resolveTemplatePath(normalizedListUrlTemplate));
   const editUrl = computed(() => resolveTemplatePath(normalizedEditUrlTemplate));
 
-  function resolveParams(urlTemplate = "", extraParams = {}) {
-    return resolveTemplatePath(urlTemplate, extraParams);
-  }
-
   return Object.freeze({
     recordId,
     apiSuffix,
     listUrl,
     editUrl,
-    resolveParams
+    resolveParams: resolveTemplatePath
   });
 }
 

package/src/client/composables/support/errorMessageHelpers.js

@@ -1,55 +1,9 @@
-function normalizeErrorStatus(error) {
-  if (error == null || typeof error !== "object") {
-    return null;
-  }
-
-  const hasStatus = Object.prototype.hasOwnProperty.call(error, "status");
-  const hasStatusCode = Object.prototype.hasOwnProperty.call(error, "statusCode");
-  if (!hasStatus && !hasStatusCode) {
-    return null;
-  }
-
-  const status = Number(hasStatus ? error.status : error.statusCode);
-  return Number.isInteger(status) ? status : null;
-}
-
-function isGenericTransportMessage(error) {
-  const normalizedMessage = String(error?.message || "").trim();
-  if (!normalizedMessage) {
-    return false;
-  }
-
-  const status = normalizeErrorStatus(error);
-  if (status === 0) {
-    return true;
-  }
-
-  return status != null && status >= 400 && normalizedMessage === `Request failed with status ${status}.`;
-}
-
-function toQueryErrorMessage(error, fallbackMessage = "", defaultMessage = "Request failed.") {
-  if (!error) {
-    return "";
-  }
-
-  const normalizedFallback = String(fallbackMessage || "").trim();
-  const normalizedMessage = String(error?.message || "").trim();
-  if (normalizedMessage && !isGenericTransportMessage(error)) {
-    return normalizedMessage;
-  }
-  if (normalizedFallback) {
-    return normalizedFallback;
-  }
-  if (normalizedMessage) {
-    return normalizedMessage;
-  }
-  return String(defaultMessage || "Request failed.").trim();
-}
+import { isGenericHttpErrorMessage } from "@jskit-ai/http-runtime/client";
 
 function toUiErrorMessage(error, fallbackMessage = "", defaultMessage = "Request failed.") {
   const normalizedFallback = String(fallbackMessage || "").trim();
   const normalizedMessage = String(error?.message || "").trim();
-  if (normalizedMessage && !isGenericTransportMessage(error)) {
+  if (normalizedMessage && !isGenericHttpErrorMessage(error)) {
     return normalizedMessage;
   }
   if (normalizedFallback) {
@@ -62,6 +16,10 @@ function toUiErrorMessage(error, fallbackMessage = "", defaultMessage = "Request
   return String(defaultMessage || "Request failed.").trim();
 }
 
+function toQueryErrorMessage(error, fallbackMessage = "", defaultMessage = "Request failed.") {
+  return error ? toUiErrorMessage(error, fallbackMessage, defaultMessage) : "";
+}
+
 export {
   toQueryErrorMessage,
   toUiErrorMessage

package/src/client/composables/support/resourceLoadStateHelpers.js

@@ -1,4 +1,5 @@
 import { unref } from "vue";
+import { hasValue, isRecord, normalizeText } from "@jskit-ai/kernel/shared/support/normalize";
 
 function hasResolvedQueryData({ query = null, data = null } = {}) {
   const querySucceeded = Boolean(unref(query?.isSuccess));
@@ -8,20 +9,8 @@ function hasResolvedQueryData({ query = null, data = null } = {}) {
 }
 
 function mergeQueryMeta(queryOptions = null, meta = {}) {
-  const sourceOptions =
-    queryOptions && typeof queryOptions === "object" && !Array.isArray(queryOptions) ? queryOptions : {};
-  const sourceMeta =
-    sourceOptions.meta && typeof sourceOptions.meta === "object" && !Array.isArray(sourceOptions.meta)
-      ? sourceOptions.meta
-      : {};
-  const sourceJskitMeta =
-    sourceMeta.jskit && typeof sourceMeta.jskit === "object" && !Array.isArray(sourceMeta.jskit)
-      ? sourceMeta.jskit
-      : {};
-  const nextJskitMeta =
-    meta.jskit && typeof meta.jskit === "object" && !Array.isArray(meta.jskit)
-      ? meta.jskit
-      : {};
+  const sourceOptions = isRecord(queryOptions) ? queryOptions : {};
+  const sourceMeta = isRecord(sourceOptions.meta) ? sourceOptions.meta : {};
 
   return {
     ...sourceOptions,
@@ -29,175 +18,97 @@ function mergeQueryMeta(queryOptions = null, meta = {}) {
       ...sourceMeta,
       ...meta,
       jskit: {
-        ...sourceJskitMeta,
-        ...nextJskitMeta
+        ...(isRecord(sourceMeta.jskit) ? sourceMeta.jskit : {}),
+        ...(isRecord(meta.jskit) ? meta.jskit : {})
       }
     }
   };
 }
 
-function normalizeText(value = "") {
-  return String(value || "").trim();
-}
+// Each requestRecovery option and the query meta key shell-web's request
+// recovery reads for it.
+const REQUEST_RECOVERY_META_KEYS = Object.freeze({
+  label: "requestRecoveryLabel",
+  source: "requestRecoverySource",
+  dedupeKey: "requestRecoveryDedupeKey",
+  method: "requestRecoveryMethod",
+  dedupeWindowMs: "requestRecoveryDedupeWindowMs"
+});
+const DISABLED_REQUEST_RECOVERY_META = Object.freeze({
+  jskit: Object.freeze({ requestRecovery: false })
+});
 
-function firstNormalizedText(...values) {
-  for (const value of values) {
-    const normalized = normalizeText(value);
-    if (normalized) {
-      return normalized;
-    }
+function normalizeRequestRecoveryInput(requestRecovery = null) {
+  if (typeof requestRecovery === "string") {
+    return { label: requestRecovery };
   }
-  return "";
-}
-
-function firstNonNegativeFiniteNumber(...values) {
-  for (const value of values) {
-    const numberValue = Number(value);
-    if (Number.isFinite(numberValue)) {
-      return Math.max(0, numberValue);
+  const source = isRecord(requestRecovery) ? requestRecovery : {};
+  for (const key of Object.keys(source)) {
+    if (key !== "enabled" && !Object.hasOwn(REQUEST_RECOVERY_META_KEYS, key)) {
+      throw new TypeError(
+        `requestRecovery.${key} is not supported; use ${Object.keys(REQUEST_RECOVERY_META_KEYS).join(", ")} or enabled.`
+      );
     }
   }
-  return null;
-}
-
-function normalizePlainObject(value = null) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+  return source;
 }
 
-function normalizeRequestRecoveryInput(requestRecovery = null) {
-  if (typeof requestRecovery === "string") {
-    return {
-      label: requestRecovery
-    };
+function normalizeRequestRecoveryValue(name, value) {
+  if (name === "dedupeWindowMs") {
+    const numberValue = value == null || value === "" ? Number.NaN : Number(value);
+    return Number.isFinite(numberValue) ? Math.max(0, numberValue) : null;
   }
-  return normalizePlainObject(requestRecovery);
-}
-
-function normalizeRequestRecoveryMethod(value = "") {
-  return normalizeText(value).toUpperCase();
-}
-
-function isRequestRecoveryMetaDisabled(sourceJskitMeta = {}) {
-  return sourceJskitMeta.requestRecovery === false;
-}
-
-function hasUsableMetaValue(source = {}, key = "") {
-  return Object.hasOwn(source, key) && source[key] !== undefined && source[key] !== null && source[key] !== "";
+  const text = normalizeText(value);
+  if (!text) {
+    return null;
+  }
+  return name === "method" ? text.toUpperCase() : text;
 }
 
+// requestRecovery is `false`, a label string, or an object of the short option
+// names above (plus `enabled: false`); missing values come from `defaults`.
 function buildRequestRecoveryMeta(requestRecovery = null, defaults = {}) {
   if (requestRecovery === false) {
-    return {
-      jskit: {
-        requestRecovery: false
-      }
-    };
+    return DISABLED_REQUEST_RECOVERY_META;
   }
-
-  const fallback = normalizePlainObject(defaults);
   const source = normalizeRequestRecoveryInput(requestRecovery);
-  if (source.requestRecovery === false || source.enabled === false) {
-    return {
-      jskit: {
-        requestRecovery: false
-      }
-    };
+  if (source.enabled === false) {
+    return DISABLED_REQUEST_RECOVERY_META;
   }
 
-  const label = firstNormalizedText(
-    source.requestRecoveryLabel,
-    source.label,
-    fallback.requestRecoveryLabel,
-    fallback.label
-  );
-  const recoverySource = firstNormalizedText(
-    source.requestRecoverySource,
-    source.source,
-    fallback.requestRecoverySource,
-    fallback.source
-  );
-  const dedupeKey = firstNormalizedText(
-    source.requestRecoveryDedupeKey,
-    source.dedupeKey,
-    fallback.requestRecoveryDedupeKey,
-    fallback.dedupeKey
-  );
-  const method = normalizeRequestRecoveryMethod(
-    firstNormalizedText(
-      source.requestRecoveryMethod,
-      source.method,
-      fallback.requestRecoveryMethod,
-      fallback.method
-    )
-  );
-  const dedupeWindowMs = firstNonNegativeFiniteNumber(
-    source.requestRecoveryDedupeWindowMs,
-    source.dedupeWindowMs,
-    fallback.requestRecoveryDedupeWindowMs,
-    fallback.dedupeWindowMs
-  );
-
+  const fallback = isRecord(defaults) ? defaults : {};
   const jskit = {};
-  if (label) {
-    jskit.requestRecoveryLabel = label;
-  }
-  if (recoverySource) {
-    jskit.requestRecoverySource = recoverySource;
-  }
-  if (dedupeKey) {
-    jskit.requestRecoveryDedupeKey = dedupeKey;
-  }
-  if (method) {
-    jskit.requestRecoveryMethod = method;
-  }
-  if (dedupeWindowMs !== null) {
-    jskit.requestRecoveryDedupeWindowMs = dedupeWindowMs;
+  for (const [name, metaKey] of Object.entries(REQUEST_RECOVERY_META_KEYS)) {
+    const value = normalizeRequestRecoveryValue(name, source[name]) ??
+      normalizeRequestRecoveryValue(name, fallback[name]);
+    if (value !== null) {
+      jskit[metaKey] = value;
+    }
   }
-
   return Object.keys(jskit).length > 0 ? { jskit } : {};
 }
 
-function resolveRequestRecoveryDefaults(queryOptions = null, defaults = {}) {
-  const sourceOptions = normalizePlainObject(queryOptions);
-  const sourceMeta = normalizePlainObject(sourceOptions.meta);
-  const sourceJskitMeta = normalizePlainObject(sourceMeta.jskit);
-  const fallback = normalizePlainObject(defaults);
-  if (isRequestRecoveryMetaDisabled(sourceJskitMeta)) {
-    return {};
-  }
-
-  const hasExplicitLabel = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryLabel");
-  const hasExplicitSource = hasUsableMetaValue(sourceJskitMeta, "requestRecoverySource");
-  const hasExplicitDedupeKey = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryDedupeKey");
-  const hasExplicitDedupeWindowMs = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryDedupeWindowMs");
-  const hasExplicitMethod = hasUsableMetaValue(sourceJskitMeta, "requestRecoveryMethod");
-
-  return {
-    ...fallback,
-    requestRecoveryLabel: hasExplicitLabel ? "" : fallback.requestRecoveryLabel,
-    label: hasExplicitLabel ? "" : fallback.label,
-    requestRecoverySource: hasExplicitSource ? "" : fallback.requestRecoverySource,
-    source: hasExplicitSource ? "" : fallback.source,
-    requestRecoveryDedupeKey: hasExplicitDedupeKey ? "" : fallback.requestRecoveryDedupeKey,
-    dedupeKey: hasExplicitDedupeKey ? "" : fallback.dedupeKey,
-    requestRecoveryDedupeWindowMs: hasExplicitDedupeWindowMs ? "" : fallback.requestRecoveryDedupeWindowMs,
-    dedupeWindowMs: hasExplicitDedupeWindowMs ? "" : fallback.dedupeWindowMs,
-    requestRecoveryMethod: hasExplicitMethod ? "" : fallback.requestRecoveryMethod,
-    method: hasExplicitMethod ? "" : fallback.method
-  };
-}
-
 function mergeRequestRecoveryQueryMeta(queryOptions = null, requestRecovery = null, defaults = {}) {
-  const sourceOptions = normalizePlainObject(queryOptions);
-  const effectiveDefaults =
-    requestRecovery == null
-      ? resolveRequestRecoveryDefaults(sourceOptions, defaults)
-      : normalizePlainObject(defaults);
-  const meta = buildRequestRecoveryMeta(requestRecovery, effectiveDefaults);
-  if (Object.keys(meta).length < 1) {
-    return sourceOptions;
+  const sourceOptions = isRecord(queryOptions) ? queryOptions : {};
+  let meta;
+  if (requestRecovery == null) {
+    const presetMeta = isRecord(sourceOptions.meta?.jskit) ? sourceOptions.meta.jskit : {};
+    if (presetMeta.requestRecovery === false) {
+      return sourceOptions;
+    }
+    // Composable defaults never replace a hint the query options already set.
+    const fallback = isRecord(defaults) ? defaults : {};
+    const unsetDefaults = {};
+    for (const [name, metaKey] of Object.entries(REQUEST_RECOVERY_META_KEYS)) {
+      if (!hasValue(presetMeta[metaKey])) {
+        unsetDefaults[name] = fallback[name];
+      }
+    }
+    meta = buildRequestRecoveryMeta(null, unsetDefaults);
+  } else {
+    meta = buildRequestRecoveryMeta(requestRecovery, defaults);
   }
-  return mergeQueryMeta(sourceOptions, meta);
+  return Object.keys(meta).length > 0 ? mergeQueryMeta(sourceOptions, meta) : sourceOptions;
 }
 
 export {