ag-common 0.0.289 → 0.0.293

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

@@ -49,6 +49,7 @@ export interface IRequestCommon {
     url: LocationSubset;
     lang: TLang;
     userAgent: string;
+    defaultHost: string;
 }
 export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialStateCommon {
     request: TRequest;
@@ -64,24 +65,32 @@ export interface IStateCommon<TRequest extends IRequestCommon> extends IInitialS
  * @param param0
  * @returns
  */
-export declare const getClientOrServerReqHref: ({ href, query, forceServer, userAgent, }: {
-    /**
-     * 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, darkMode, defaultHost, }: {
+    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;
     /** will use navigator if possible */
     userAgent?: string | undefined;
+    /** will use window.matchMedia  */
+    darkMode?: boolean | undefined;
+    defaultHost: string;
 }) => {
     url: LocationSubset;
     userAgent: string;
+    darkMode: boolean;
+    lang: TLang;
+    defaultHost: string;
 };
 /**
  * get server side parsed url
@@ -108,6 +117,9 @@ export declare const getServerReq: ({ defaultHost, pathname, query, headers, }:
 }) => {
     url: LocationSubset;
     userAgent: string;
+    darkMode: boolean;
+    lang: TLang;
+    defaultHost: string;
 };
 export interface INextCtx {
     req?: {

package/dist/ui/helpers/routes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServerReq = exports.getClientOrServerReqHref = void 0;
+const i18n_1 = require("../../common/helpers/i18n");
 const string_1 = require("../../common/helpers/string");
 const object_1 = require("../../common/helpers/object");
 const url_1 = require("url");
@@ -18,22 +19,32 @@ const calculateServerHref = ({ host, pathname, }) => {
     href += host + pathname;
     return decodeURIComponent(href);
 };
+const getRenderLanguage = ({ defaultHost, url, }) => {
+    var _a, _b, _c, _d;
+    const prefixReg = new RegExp(`(.*?).(local|${defaultHost.toLowerCase()})`, 'gim');
+    const host = (_c = (_b = (_a = url.host) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : '';
+    const prefix = host.trim().length !== 0 && ((_d = prefixReg.exec(host)) === null || _d === void 0 ? void 0 : _d[1]);
+    if (!prefix) {
+        return 'en';
+    }
+    return (0, i18n_1.getValidatedLang)(prefix);
+};
 /**
  * get parsed url. use on client/SSR. defaults to window location if possible
  * @param param0
  * @returns
  */
-const getClientOrServerReqHref = ({ 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;
+const getClientOrServerReqHref = ({ url: { href, query }, forceServer = false, userAgent, darkMode, defaultHost, }) => {
+    if (typeof window !== 'undefined') {
+        if (!forceServer) {
+            href = window.location.href;
         }
+        darkMode =
+            window.matchMedia &&
+                window.matchMedia('(prefers-color-scheme: dark)').matches;
     }
-    if (!userAgent) {
-        userAgent = '?';
+    if (typeof navigator !== 'undefined') {
+        userAgent = navigator.userAgent;
     }
     if (!href) {
         throw new Error('no href');
@@ -49,7 +60,13 @@ const getClientOrServerReqHref = ({ href, query, forceServer = false, userAgent,
         protocol: parsed.protocol || '',
         query: Object.assign(Object.assign({}, query), (0, string_1.stringToObject)(parsed.query || '', '=', '&')),
     };
-    return { url, userAgent };
+    return {
+        url,
+        userAgent: userAgent !== null && userAgent !== void 0 ? userAgent : '?',
+        darkMode: darkMode !== null && darkMode !== void 0 ? darkMode : false,
+        lang: getRenderLanguage({ url, defaultHost }),
+        defaultHost,
+    };
 };
 exports.getClientOrServerReqHref = getClientOrServerReqHref;
 /**
@@ -66,10 +83,13 @@ const getServerReq = ({ defaultHost, pathname, query, headers, }) => {
         ? 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(),
+        defaultHost,
     });
     return ret;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.289",
+  "version": "0.0.293",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -32,7 +32,7 @@
     "styled-components": ">=5"
   },
   "devDependencies": {
-    "@babel/core": "7.18.6",
+    "@babel/core": "7.18.9",
     "@storybook/addon-actions": "6.5.9",
     "@storybook/addon-docs": "6.5.9",
     "@storybook/addon-essentials": "6.5.9",
@@ -42,14 +42,14 @@
     "@storybook/react": "6.5.9",
     "@storybook/theming": "6.5.9",
     "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "18.0.3",
+    "@types/node": "18.0.6",
     "@types/react": "18.0.15",
     "@types/react-dom": "18.0.6",
     "@types/styled-components": "5.1.25",
-    "@typescript-eslint/eslint-plugin": "5.30.6",
-    "@typescript-eslint/parser": "5.30.6",
+    "@typescript-eslint/eslint-plugin": "5.30.7",
+    "@typescript-eslint/parser": "5.30.7",
     "cross-env": "7.0.3",
-    "eslint": "8.19.0",
+    "eslint": "8.20.0",
     "eslint-config-airbnb-typescript": "17.0.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",