@ancon/wildcat-utils 1.2.1 → 1.5.0

package/dist/api/getEndpointWithVersion.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Get a versioned endpoint URL
+ * @param endpoint Endpoint URL (ie "someEndpoint/{someId}")
+ * @param version Endpoint version (ie 1.1)
+ * @returns Versioned endpoint (ie "v1.1/someEndpoint/{someId}")
+ */
+export default function getEndpointWithVersion(endpoint: string, version?: number): string;

package/dist/api/getEndpointWithVersion.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Get a versioned endpoint URL
+ * @param endpoint Endpoint URL (ie "someEndpoint/{someId}")
+ * @param version Endpoint version (ie 1.1)
+ * @returns Versioned endpoint (ie "v1.1/someEndpoint/{someId}")
+ */
+function getEndpointWithVersion(endpoint, version = 1.0) {
+    return `v${version.toFixed(1)}/${endpoint}`;
+}
+exports.default = getEndpointWithVersion;

package/dist/api/getUrlAndParams.d.ts

@@ -0,0 +1,13 @@
+import type { APIParams } from '@ancon/wildcat-types';
+/**
+ * Get an object with URL and query parameters.
+ * If the queryParams object contains keys found in the URL string,
+ * those will be inserted into the new URL string and removed from the new params object.
+ * @param url URL
+ * @param queryParams Query parameters object
+ * @returns An object containing the URL and parameters
+ */
+export default function getUrlAndParams(url: string, queryParams?: APIParams): {
+    url: string;
+    params: APIParams;
+};

package/dist/api/getUrlAndParams.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const URL_PARAM_EXP = /(\/{.+?})/g;
+const BRACES_EXP = /[/{}]/g;
+/**
+ * Get an object with URL and query parameters.
+ * If the queryParams object contains keys found in the URL string,
+ * those will be inserted into the new URL string and removed from the new params object.
+ * @param url URL
+ * @param queryParams Query parameters object
+ * @returns An object containing the URL and parameters
+ */
+function getUrlAndParams(url, queryParams) {
+    const fallback = { url, params: queryParams !== null && queryParams !== void 0 ? queryParams : {} };
+    if (!queryParams)
+        return fallback;
+    const urlParamTemplates = url.match(URL_PARAM_EXP);
+    if (urlParamTemplates === null || urlParamTemplates === void 0 ? void 0 : urlParamTemplates.length) {
+        return urlParamTemplates.reduce((acc, paramTemplate) => {
+            const paramName = paramTemplate.replace(BRACES_EXP, '');
+            const paramValue = queryParams[paramName];
+            if (!paramValue) {
+                acc.params[paramName] = queryParams[paramName];
+            }
+            else {
+                delete acc.params[paramName];
+                acc.url = acc.url.replace(new RegExp(paramTemplate, 'g'), `/${paramValue}`);
+            }
+            return acc;
+        }, {
+            url,
+            params: Object.assign({}, queryParams),
+        });
+    }
+    return fallback;
+}
+exports.default = getUrlAndParams;

package/dist/api/index.d.ts

@@ -0,0 +1,5 @@
+import getUrlAndParams from './getUrlAndParams';
+import getEndpointWithVersion from './getEndpointWithVersion';
+export { getUrlAndParams, getEndpointWithVersion };
+declare const _default: {};
+export default _default;

package/dist/api/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEndpointWithVersion = exports.getUrlAndParams = void 0;
+const getUrlAndParams_1 = __importDefault(require("./getUrlAndParams"));
+exports.getUrlAndParams = getUrlAndParams_1.default;
+const getEndpointWithVersion_1 = __importDefault(require("./getEndpointWithVersion"));
+exports.getEndpointWithVersion = getEndpointWithVersion_1.default;
+exports.default = {};

package/dist/index.d.ts

@@ -1,2 +1,4 @@
 export * from './shared';
 export * from './outlet';
+export * from './versioning';
+export * from './api';

package/dist/index.js

@@ -12,3 +12,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./shared"), exports);
 __exportStar(require("./outlet"), exports);
+__exportStar(require("./versioning"), exports);
+__exportStar(require("./api"), exports);

package/dist/outlet/getListOutletOpeningHoursTable.js

@@ -4,12 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const moment_1 = __importDefault(require("moment"));
-const __1 = require("..");
+const enums_1 = require("../shared/enums");
+const shared_1 = require("../shared");
 const ORDER_FORMATS = [
-    { id: __1.OrderFormat.EatIn, name: 'eatIn' },
-    { id: __1.OrderFormat.Takeaway, name: 'takeaway' },
-    { id: __1.OrderFormat.TableOrder, name: 'tableOrder' },
-    { id: __1.OrderFormat.Delivery, name: 'delivery' },
+    { id: enums_1.OrderFormat.EatIn, name: 'eatIn' },
+    { id: enums_1.OrderFormat.Takeaway, name: 'takeaway' },
+    { id: enums_1.OrderFormat.TableOrder, name: 'tableOrder' },
+    { id: enums_1.OrderFormat.Delivery, name: 'delivery' },
 ];
 function generateWeekFromToday(nowISOString) {
     const today = moment_1.default.utc(nowISOString).subtract(1, 'day').startOf('day');
@@ -29,7 +30,7 @@ function getIntervalTimestampAsNumbers(timestamp) {
 function formatInterval(interval, weekdayMoment) {
     const [startHour, startMinute] = getIntervalTimestampAsNumbers(interval.start);
     const [durationHour, durationMinute] = getIntervalTimestampAsNumbers(interval.duration);
-    if (interval.type === __1.IntervalType.Interval) {
+    if (interval.type === enums_1.IntervalType.Interval) {
         const startMoment = weekdayMoment
             .clone()
             .add(startHour, 'hour')
@@ -44,7 +45,7 @@ function formatInterval(interval, weekdayMoment) {
             end: endMoment.toISOString(),
         };
     }
-    if (interval.type === __1.IntervalType.Exception) {
+    if (interval.type === enums_1.IntervalType.Exception) {
         const fromDateMoment = (0, moment_1.default)(interval.fromDate);
         const toDateMoment = (0, moment_1.default)(interval.toDate);
         if (weekdayMoment.isBetween(fromDateMoment, toDateMoment, undefined, '[]')) {
@@ -70,13 +71,13 @@ function formatInterval(interval, weekdayMoment) {
 function collectReadableInterval(interval, week, collector) {
     var _a;
     const weekdayIsoMap = {
-        [__1.DayOfWeek.Monday]: 1,
-        [__1.DayOfWeek.Tuesday]: 2,
-        [__1.DayOfWeek.Wednesday]: 3,
-        [__1.DayOfWeek.Thursday]: 4,
-        [__1.DayOfWeek.Friday]: 5,
-        [__1.DayOfWeek.Saturday]: 6,
-        [__1.DayOfWeek.Sunday]: 7,
+        [enums_1.DayOfWeek.Monday]: 1,
+        [enums_1.DayOfWeek.Tuesday]: 2,
+        [enums_1.DayOfWeek.Wednesday]: 3,
+        [enums_1.DayOfWeek.Thursday]: 4,
+        [enums_1.DayOfWeek.Friday]: 5,
+        [enums_1.DayOfWeek.Saturday]: 6,
+        [enums_1.DayOfWeek.Sunday]: 7,
     };
     for (let i = 0; i < week.length; i += 1) {
         const weekdayMoment = week[i];
@@ -84,7 +85,7 @@ function collectReadableInterval(interval, week, collector) {
         const intervalWeekdayEnum = interval.dayOfWeek;
         const intervalIsoWeekday = (_a = weekdayIsoMap[intervalWeekdayEnum]) !== null && _a !== void 0 ? _a : null;
         const intervalIsApplicableToday = intervalIsoWeekday === momentIsoWeekday ||
-            intervalWeekdayEnum === __1.DayOfWeek.Everyday;
+            intervalWeekdayEnum === enums_1.DayOfWeek.Everyday;
         if (!collector[momentIsoWeekday]) {
             // eslint-disable-next-line no-param-reassign
             collector[momentIsoWeekday] = {
@@ -100,20 +101,20 @@ function collectReadableInterval(interval, week, collector) {
             if (formattedInterval) {
                 // eslint-disable-next-line no-param-reassign
                 collector[momentIsoWeekday].key += formattedInterval.id;
-                if (interval.type === __1.IntervalType.Interval &&
-                    interval.state === __1.IntervalState.Open) {
+                if (interval.type === enums_1.IntervalType.Interval &&
+                    interval.state === enums_1.IntervalState.Open) {
                     collector[momentIsoWeekday].open.push(formattedInterval);
                 }
-                else if (interval.type === __1.IntervalType.Interval &&
-                    interval.state === __1.IntervalState.Closed) {
+                else if (interval.type === enums_1.IntervalType.Interval &&
+                    interval.state === enums_1.IntervalState.Closed) {
                     collector[momentIsoWeekday].closed.push(formattedInterval);
                 }
-                else if (interval.type === __1.IntervalType.Exception &&
-                    interval.state === __1.IntervalState.Open) {
+                else if (interval.type === enums_1.IntervalType.Exception &&
+                    interval.state === enums_1.IntervalState.Open) {
                     collector[momentIsoWeekday].adjusted.push(formattedInterval);
                 }
-                else if (interval.type === __1.IntervalType.Exception &&
-                    interval.state === __1.IntervalState.Closed) {
+                else if (interval.type === enums_1.IntervalType.Exception &&
+                    interval.state === enums_1.IntervalState.Closed) {
                     collector[momentIsoWeekday].closed.push(formattedInterval);
                 }
             }
@@ -122,18 +123,18 @@ function collectReadableInterval(interval, week, collector) {
 }
 function generateIntervalId(interval) {
     switch (interval.type) {
-        case __1.IntervalType.Exception:
-            return (0, __1.generateId)('interval-exception');
-        case __1.IntervalType.Interval:
-            return (0, __1.generateId)('interval-normal');
+        case enums_1.IntervalType.Exception:
+            return (0, shared_1.generateId)('interval-exception');
+        case enums_1.IntervalType.Interval:
+            return (0, shared_1.generateId)('interval-normal');
         default:
-            return (0, __1.generateId)('interval-unknown');
+            return (0, shared_1.generateId)('interval-unknown');
     }
 }
 function splitServiceDateTimes(serviceDateTimes) {
     const flattenedMap = serviceDateTimes.reduce((acc, serviceDateTime) => {
         ORDER_FORMATS.forEach(readableOrderFormat => {
-            if ((0, __1.isWithinFlag)(readableOrderFormat.id, serviceDateTime.orderFormats)) {
+            if ((0, shared_1.isWithinFlag)(readableOrderFormat.id, serviceDateTime.orderFormats)) {
                 if (!acc[readableOrderFormat.id]) {
                     acc[readableOrderFormat.id] = {
                         orderFormat: readableOrderFormat,
@@ -189,10 +190,10 @@ function getListOutletOpeningHoursTable(outlet, nowISOString) {
         return acc;
     }, {});
     const readableOrderFormatMap = {
-        [__1.OrderFormat.EatIn]: ORDER_FORMATS[0],
-        [__1.OrderFormat.Takeaway]: ORDER_FORMATS[1],
-        [__1.OrderFormat.TableOrder]: ORDER_FORMATS[2],
-        [__1.OrderFormat.Delivery]: ORDER_FORMATS[3],
+        [enums_1.OrderFormat.EatIn]: ORDER_FORMATS[0],
+        [enums_1.OrderFormat.Takeaway]: ORDER_FORMATS[1],
+        [enums_1.OrderFormat.TableOrder]: ORDER_FORMATS[2],
+        [enums_1.OrderFormat.Delivery]: ORDER_FORMATS[3],
     };
     const openingHoursTable = Object.entries(intervalsOrderFormatMap).map(([orderFormatId, intervals]) => ({
         orderFormats: [readableOrderFormatMap[Number(orderFormatId)]],

package/dist/outlet/types.d.ts

@@ -1,4 +1,4 @@
-import { DayOfWeek, IntervalState, IntervalType, OrderFormat } from '..';
+import { DayOfWeek, IntervalState, IntervalType, OrderFormat } from '../shared';
 /** HH:mm:ss */
 export declare type IntervalTimestamp = string;
 export declare type Interval = {

package/dist/versioning/cleanVersionString.d.ts

@@ -0,0 +1 @@
+export default function cleanVersionString(version: string): string;

package/dist/versioning/cleanVersionString.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function cleanVersionString(version) {
+    // Transform to lowercase
+    const lowercase = version.toLowerCase();
+    // Remove anything after `-` for example -beta.2
+    const versionPart = lowercase.split('-')[0];
+    // Remove starting `v` if needed
+    const removedV = versionPart.charAt(0) === 'v' ? versionPart.substring(1) : versionPart;
+    return removedV;
+}
+exports.default = cleanVersionString;

package/dist/versioning/index.d.ts

@@ -0,0 +1,2 @@
+export { default as isVersionALessThanB } from './isVersionALessThanB';
+export { default as cleanVersionString } from './cleanVersionString';

package/dist/versioning/index.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanVersionString = exports.isVersionALessThanB = void 0;
+var isVersionALessThanB_1 = require("./isVersionALessThanB");
+Object.defineProperty(exports, "isVersionALessThanB", { enumerable: true, get: function () { return __importDefault(isVersionALessThanB_1).default; } });
+var cleanVersionString_1 = require("./cleanVersionString");
+Object.defineProperty(exports, "cleanVersionString", { enumerable: true, get: function () { return __importDefault(cleanVersionString_1).default; } });

package/dist/versioning/isVersionALessThanB.d.ts

@@ -0,0 +1 @@
+export default function isVersionALessThanB(versionA: string, versionB: string): boolean;

package/dist/versioning/isVersionALessThanB.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const compare_versions_1 = __importDefault(require("compare-versions"));
+const cleanVersionString_1 = __importDefault(require("./cleanVersionString"));
+function isVersionALessThanB(versionA, versionB) {
+    const cleanedVersionA = (0, cleanVersionString_1.default)(versionA);
+    const cleanedVersionB = (0, cleanVersionString_1.default)(versionB);
+    return compare_versions_1.default.compare(cleanedVersionA, cleanedVersionB, '<');
+}
+exports.default = isVersionALessThanB;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.2.1",
+  "version": "1.5.0",
   "description": "",
-  "repository": "git@bitbucket.org:anconab/wildcat.utils.git",
+  "repository": "git@bitbucket.org:anconab/wildcat.client.utils.git",
   "main": "dist/index.js",
   "private": false,
   "publishConfig": {
@@ -17,6 +17,7 @@
     "dev": "tsc -w"
   },
   "devDependencies": {
+    "@ancon/wildcat-types": "^1.17.0",
     "@babel/core": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
     "@babel/preset-typescript": "^7.16.5",
@@ -29,7 +30,9 @@
     "@types/jest": "^27.0.3",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
+    "axios": "^0.27.2",
     "babel-jest": "^27.4.5",
+    "compare-versions": "^4.1.3",
     "eslint": "^8.5.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^16.1.0",
@@ -44,6 +47,8 @@
     "typescript": "^4.5.4"
   },
   "peerDependencies": {
+    "@ancon/wildcat-types": "*",
+    "compare-versions": "^4.1.0",
     "moment": "^2.29.0"
   },
   "commitlint": {
@@ -93,5 +98,6 @@
         }
       ]
     ]
-  }
+  },
+  "dependencies": {}
 }