ag-common 0.0.147 → 0.0.148

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

@@ -63,31 +63,31 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
     cookieDocument: string | undefined;
 }
 /**
- * get parsed url.
+ * get parsed url. use on client/SSR. defaults to window location if possible
  * @param param0
  * @returns
  */
-export declare const getClientOrServerReqHref: ({ href, }: {
+export declare const getClientOrServerReqHref: ({ href, query, }: {
     /**
      * will use window if possible
      */
     href?: string | undefined;
+    /**
+     * pass in query string params
+     */
+    query?: Record<string, string> | undefined;
 }) => LocationSubset;
+export interface INextCtx {
+    req?: {
+        headers?: {
+            host?: string;
+        };
+    };
+    asPath?: string;
+    query: Record<string, string | string[] | undefined>;
+}
 /**
- * get parsed url from nextjs server host,pathname
+ * get parsed url from nextjs server host/pathname/query
  * @param param0 * @returns
  */
-export declare const getServerReq: ({ host, pathname, query, }: {
-    /**
-     * eg ctx?.req?.headers?.host
-     */
-    host: string;
-    /**
-     * eg ctx.asPath || '/'
-     */
-    pathname: string;
-    /**
-     * eg ctx.query
-     */
-    query: Record<string, string | string[] | undefined>;
-}) => LocationSubset;
+export declare const getServerReq: (ctx: INextCtx) => LocationSubset | null;

package/dist/ui/helpers/routes.js

@@ -19,11 +19,11 @@ const calculateServerHref = ({ host, pathname, }) => {
     return decodeURIComponent(href);
 };
 /**
- * get parsed url.
+ * get parsed url. use on client/SSR. defaults to window location if possible
  * @param param0
  * @returns
  */
-const getClientOrServerReqHref = ({ href, }) => {
+const getClientOrServerReqHref = ({ href, query, }) => {
     if (typeof window !== 'undefined') {
         href = window.location.href;
     }
@@ -39,24 +39,28 @@ const getClientOrServerReqHref = ({ href, }) => {
         path: `${parsed.path}${parsed.hash || ''}`,
         pathname: parsed.pathname || '',
         protocol: parsed.protocol || '',
-        query: (0, string_1.stringToObject)(parsed.query || '', '=', '&'),
+        query: Object.assign(Object.assign({}, query), (0, string_1.stringToObject)(parsed.query || '', '=', '&')),
     };
     return ret;
 };
 exports.getClientOrServerReqHref = getClientOrServerReqHref;
 /**
- * get parsed url from nextjs server host,pathname
+ * get parsed url from nextjs server host/pathname/query
  * @param param0 * @returns
  */
-const getServerReq = ({ host, pathname, query, }) => {
+const getServerReq = (ctx) => {
+    var _a, _b;
+    if (!((_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.req) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.host) || !(ctx === null || ctx === void 0 ? void 0 : ctx.asPath)) {
+        return null;
+    }
     const href = calculateServerHref({
-        host,
-        pathname,
+        host: ctx.req.headers.host,
+        pathname: ctx.asPath,
     });
-    const ret = (0, exports.getClientOrServerReqHref)({ href });
-    if (query && Object.keys(query).length > 0) {
-        ret.query = Object.assign(Object.assign({}, ret.query), (0, object_1.castStringlyObject)(query));
-    }
+    const parsedQuery = !ctx.query || Object.keys(ctx.query).length === 0
+        ? undefined
+        : (0, object_1.castStringlyObject)(ctx.query);
+    const ret = (0, exports.getClientOrServerReqHref)({ href, query: parsedQuery });
     return ret;
 };
 exports.getServerReq = getServerReq;

package/package.json

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