ag-common 0.0.287 → 0.0.291

package/dist/ui/helpers/routes.d.ts

@@ -43,15 +43,12 @@ export interface CacheItem<T> {
 }
 export interface IInitialStateCommon {
     openApiCache?: CacheItem<any>[];
-    headerTitle?: string;
-    seed?: number;
 }
 export interface IRequestCommon {
     darkMode: boolean;
     url: LocationSubset;
-    headerTitle?: string;
-    seed?: number;
     lang: TLang;
+    userAgent: string;
 }
 export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialStateCommon {
     request: TRequest;
@@ -67,29 +64,41 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
  * @param param0
  * @returns
  */
-export declare const getClientOrServerReqHref: ({ href, query, forceServer, }: {
-    /**
-     * will use window if possible
-     */
-    href?: string | undefined;
-    /**
-     * pass in query string params
-     */
-    query?: Record<string, string> | undefined;
+export declare const getClientOrServerReqHref: ({ url: { href, query }, forceServer, userAgent, }: {
+    url: {
+        /**
+         * parse querystring keyvalues
+         */
+        query?: Record<string, string> | undefined;
+        /**
+         * full url
+         */
+        href?: string | undefined;
+    };
     /**
      * if true, wont use window location. default false
      */
     forceServer?: boolean | undefined;
-}) => LocationSubset;
+    /** will use navigator if possible */
+    userAgent?: string | undefined;
+}) => {
+    url: LocationSubset;
+    userAgent: string;
+};
 /**
  * get server side parsed url
  * @param param0 * @returns
  */
-export declare const getServerReq: ({ host, pathname, query, }: {
+export declare const getServerReq: ({ defaultHost, pathname, query, headers, }: {
     /**
-     * eg ctx?.req?.headers?.host OR (user provided host eg test.com)
+     * eg ctx?.req?.headers || {}
      */
-    host: string;
+    headers: {
+        host?: string;
+        'user-agent'?: string;
+    };
+    /** what to use if host is not available on headers */
+    defaultHost: string;
     /**
      * eg ctx.asPath || '/'
      */
@@ -98,7 +107,10 @@ export declare const getServerReq: ({ host, pathname, query, }: {
      * eg ctx.query
      */
     query: Record<string, string | string[] | undefined>;
-}) => LocationSubset;
+}) => {
+    url: LocationSubset;
+    userAgent: string;
+};
 export interface INextCtx {
     req?: {
         headers?: {

package/dist/ui/helpers/routes.js

@@ -23,15 +23,23 @@ const calculateServerHref = ({ host, pathname, }) => {
  * @param param0
  * @returns
  */
-const getClientOrServerReqHref = ({ href, query, forceServer = false, }) => {
+const getClientOrServerReqHref = ({ url: { href, query }, forceServer = false, userAgent, }) => {
     if (typeof window !== 'undefined' && !forceServer) {
         href = window.location.href;
     }
+    if (typeof navigator !== 'undefined' && !forceServer) {
+        if (navigator.userAgent) {
+            userAgent = navigator.userAgent;
+        }
+    }
+    if (!userAgent) {
+        userAgent = '?';
+    }
     if (!href) {
         throw new Error('no href');
     }
     const parsed = (0, url_1.parse)(href);
-    const ret = {
+    const url = {
         hash: parsed.hash || '',
         host: parsed.host || '',
         origin: `${parsed.protocol}//${parsed.host}`,
@@ -41,25 +49,29 @@ const getClientOrServerReqHref = ({ href, query, forceServer = false, }) => {
         protocol: parsed.protocol || '',
         query: Object.assign(Object.assign({}, query), (0, string_1.stringToObject)(parsed.query || '', '=', '&')),
     };
-    return ret;
+    return { url, userAgent };
 };
 exports.getClientOrServerReqHref = getClientOrServerReqHref;
 /**
  * get server side parsed url
  * @param param0 * @returns
  */
-const getServerReq = ({ host, pathname, query, }) => {
+const getServerReq = ({ defaultHost, pathname, query, headers, }) => {
+    var _a;
     const href = calculateServerHref({
-        host,
+        host: headers.host || defaultHost,
         pathname,
     });
     const parsedQuery = !query || Object.keys(query).length === 0
         ? undefined
         : (0, object_1.castStringlyObject)(query);
     const ret = (0, exports.getClientOrServerReqHref)({
-        href,
-        query: parsedQuery,
+        url: {
+            href,
+            query: parsedQuery,
+        },
         forceServer: true,
+        userAgent: (_a = headers['user-agent']) === null || _a === void 0 ? void 0 : _a.toLowerCase(),
     });
     return ret;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.287",
+  "version": "0.0.291",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",