ag-common 0.0.145 → 0.0.149

package/dist/common/helpers/object.d.ts

@@ -36,3 +36,17 @@ export declare function paramsToObject(entries: any): Record<string, string>;
  * @returns
  */
 export declare function objectToString(obj: Record<string, string>, joinKeyValue: string, joinKeys: string): string;
+/**
+ * run func over values in object. can be used to cast value type string[]|string to string
+ * @param orig
+ * @param castF
+ * @returns
+ */
+export declare const castObject: <TIn, TOut>(orig: Record<string, TIn>, castF: (t: TIn) => TOut) => Record<string, TOut>;
+export declare const removeUndefValuesFromObject: <T>(orig: Record<string, T>) => Record<string, T>;
+/**
+ * cast Record<string,string[]|string> to Record<string,string>. can be used for querystring params
+ * @param orig
+ * @returns
+ */
+export declare const castStringlyObject: (orig: Record<string, string | string[] | undefined>) => Record<string, string>;

package/dist/common/helpers/object.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.objectToString = exports.paramsToObject = exports.objectAlphaSort = exports.objectToArray = exports.getObjectKeysAsNumber = exports.objectKeysToLowerCase = exports.isJson = exports.tryJsonParse = void 0;
+exports.castStringlyObject = exports.removeUndefValuesFromObject = exports.castObject = exports.objectToString = exports.paramsToObject = exports.objectAlphaSort = exports.objectToArray = exports.getObjectKeysAsNumber = exports.objectKeysToLowerCase = exports.isJson = exports.tryJsonParse = void 0;
 const _1 = require(".");
 const tryJsonParse = (str, defaultValue) => {
     if (!str) {
@@ -114,3 +114,42 @@ function objectToString(obj, joinKeyValue, joinKeys) {
     return ret;
 }
 exports.objectToString = objectToString;
+/**
+ * run func over values in object. can be used to cast value type string[]|string to string
+ * @param orig
+ * @param castF
+ * @returns
+ */
+const castObject = (orig, castF) => {
+    const ret = {};
+    Object.entries(orig).forEach(([k, v]) => {
+        ret[k] = castF(v);
+    });
+    return ret;
+};
+exports.castObject = castObject;
+const removeUndefValuesFromObject = (orig) => {
+    const ret = {};
+    Object.entries(orig).forEach(([k, v]) => {
+        if (v !== null && v !== undefined) {
+            ret[k] = v;
+        }
+    });
+    return ret;
+};
+exports.removeUndefValuesFromObject = removeUndefValuesFromObject;
+/**
+ * cast Record<string,string[]|string> to Record<string,string>. can be used for querystring params
+ * @param orig
+ * @returns
+ */
+const castStringlyObject = (orig) => {
+    const noundef = (0, exports.removeUndefValuesFromObject)(orig);
+    return (0, exports.castObject)(noundef, (s) => {
+        if (Array.isArray(s)) {
+            return s.join(',');
+        }
+        return s;
+    });
+};
+exports.castStringlyObject = castStringlyObject;

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

@@ -63,14 +63,45 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
     cookieDocument: string | undefined;
 }
 /**
- * get parsed url. will use window if possible
+ * 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 declare const getServerReq: ({ host, pathname, }: {
-    pathname: string;
+/**
+ * get server side parsed url
+ * @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 interface INextCtx {
+    req?: {
+        headers?: {
+            host?: string;
+        };
+    };
+    asPath?: string;
+    query: Record<string, string | string[] | undefined>;
+}
+export declare const getServerReqNextJs: (ctx: INextCtx) => LocationSubset | null;

package/dist/ui/helpers/routes.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServerReq = exports.getClientOrServerReqHref = void 0;
+exports.getServerReqNextJs = exports.getServerReq = exports.getClientOrServerReqHref = void 0;
 const url_1 = require("url");
 const string_1 = require("../../common/helpers/string");
+const object_1 = require("../../common/helpers/object");
 const calculateServerHref = ({ host, pathname, }) => {
     if (!host) {
         return undefined;
@@ -18,11 +19,11 @@ const calculateServerHref = ({ host, pathname, }) => {
     return decodeURIComponent(href);
 };
 /**
- * get parsed url. will use window if possible
+ * 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;
     }
@@ -38,16 +39,34 @@ 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;
-const getServerReq = ({ host, pathname, }) => {
+/**
+ * get server side parsed url
+ * @param param0 * @returns
+ */
+const getServerReq = ({ host, pathname, query, }) => {
     const href = calculateServerHref({
         host,
         pathname,
     });
-    return (0, exports.getClientOrServerReqHref)({ href });
+    const parsedQuery = !query || Object.keys(query).length === 0
+        ? undefined
+        : (0, object_1.castStringlyObject)(query);
+    const ret = (0, exports.getClientOrServerReqHref)({ href, query: parsedQuery });
+    return ret;
 };
 exports.getServerReq = getServerReq;
+const getServerReqNextJs = (ctx) => {
+    var _a, _b;
+    const host = (_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;
+    const pathname = ctx === null || ctx === void 0 ? void 0 : ctx.asPath;
+    if (!host || !pathname) {
+        return null;
+    }
+    return (0, exports.getServerReq)({ host, pathname, query: ctx.query });
+};
+exports.getServerReqNextJs = getServerReqNextJs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.145",
+  "version": "0.0.149",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "aws-cdk-lib": "2.x",
-    "aws-sdk": "2.1072.0",
-    "axios": "0.25.0",
+    "aws-sdk": "2.1073.0",
+    "axios": "0.26.0",
     "constructs": "10.x",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",