asv-hlps 1.3.35 → 1.3.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/cjs/npms/typeorm.js +30 -18
  2. package/lib/cjs/utils.d.ts +1 -0
  3. package/lib/cjs/utils.js +19 -2
  4. package/lib/esm/npms/typeorm.js +30 -18
  5. package/lib/esm/utils.d.ts +1 -0
  6. package/lib/esm/utils.js +16 -0
  7. package/package.json +4 -4
package/lib/cjs/npms/typeorm.js CHANGED
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.getModelArrayRefs = exports.tormDateParams = void 0;
13
+ const utils_1 = require("../utils");
13
14
  /**
14
15
  *
15
16
  * @param qb typeorm queryselectoer
@@ -39,29 +40,40 @@ const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
39
40
  break;
40
41
  }
41
42
  if (dates) {
42
- console.log("------ dates ------");
43
- console.log(dates);
44
- console.log(datesBy);
45
- console.log("------ dates ------");
46
43
  if (!datesBy) {
47
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
48
- fromDate: dates.fromDate,
49
- toDate: dates.toDate,
44
+ // qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
45
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN :fromDate AND :toDate`, {
46
+ /* fromDate: dates.fromDate,
47
+ toDate: dates.toDate, */
48
+ fromDate: (0, utils_1.dateFormatter)(dates.fromDate, "ymd", "-"),
49
+ toDate: (0, utils_1.dateFormatter)(dates.toDate, "ymd", "-"),
50
50
  });
51
51
  }
52
52
  else {
53
- switch (datesBy) {
54
- case "month":
55
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
56
- fromDate: dates.fromDate,
57
- toDate: dates.toDate,
58
- });
59
- case "year":
60
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
61
- fromDate: dates.fromDate,
62
- toDate: dates.toDate,
63
- });
53
+ if (datesBy === "month") {
54
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y-%m") BETWEEN :fromDate AND :toDate `, {
55
+ fromDate: (0, utils_1.dateFormatter)(dates.fromDate, "ym", "-"),
56
+ toDate: (0, utils_1.dateFormatter)(dates.toDate, "ym", "-"),
57
+ });
64
58
  }
59
+ if (datesBy === "year") {
60
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y") BETWEEN :fromDate AND :toDate `, {
61
+ fromDate: (0, utils_1.dateFormatter)(dates.fromDate, "y"),
62
+ toDate: (0, utils_1.dateFormatter)(dates.toDate, "y"),
63
+ });
64
+ }
65
+ /* switch (datesBy) {
66
+ case "month":
67
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
68
+ fromDate: dates.fromDate,
69
+ toDate: dates.toDate,
70
+ });
71
+ case "year":
72
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
73
+ fromDate: dates.fromDate,
74
+ toDate: dates.toDate,
75
+ });
76
+ } */
65
77
  }
66
78
  }
67
79
  };
package/lib/cjs/utils.d.ts CHANGED
@@ -37,6 +37,7 @@ export declare const removeBackSlashOccurences: (text: string, toChar: string) =
37
37
  export declare const genSequenceRef: (refs: any[], startChars: string, zeroFillWidth: number, dateFormat?: string) => string;
38
38
  export declare const sesStorageSet: (key: string, val: any) => void;
39
39
  export declare const sesStorageGet: (key: string) => any;
40
+ export declare const toPlural: (word: string) => string;
40
41
  export declare const replaceAllIn: (text: string, regex?: RegExp, toChar?: string) => string;
41
42
  export declare const replaceSpacesWith: (text: string, toChar?: string) => string;
42
43
  export declare const dateFormatter: (date: Date | string, format?: "y" | "ym" | "ymd" | "dmy" | "ago" | "md" | "dmy-hm" | "dmyfr" | "myfr" | "mfr-short" | "mfr-long", separator?: "/" | "" | "-") => string;
package/lib/cjs/utils.js CHANGED
@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.padEndWithZero = exports.padStartWithZero = exports.formatMonthYearToLocaleString = exports.calculPercent = exports.validEmail = exports.convertToCfa = exports.packAndUnit = exports.unCheckedAll = exports.inputChecked = exports.arrayMultiChecked = exports.getPeriodDateColor = exports.getColorAccordingToDate = exports.genRandomColour = exports.formatNgbDate = exports.getNbOfDaysBetweenTwoDates = exports.displayDateRangeFr = exports.reformatDates = exports.dateToString = exports.dateDiff = exports.dateFormatter = exports.replaceSpacesWith = exports.replaceAllIn = exports.sesStorageGet = exports.sesStorageSet = exports.genSequenceRef = exports.removeBackSlashOccurences = exports.removeString = exports.diffArraysByProp = exports.diffArraysByFunc = exports.deepClone = exports.findFirstSequenceMissing = exports.fillNumWithZero = exports.findSequencesMissing = exports.sequencesToNumbers = exports.notInSequence = exports.currencyFormatterCfa = exports.formatToStringCfa = exports.currencyFormatter = exports.formatToString = exports.wakeUp = exports.sleep = exports.limitTo = exports.titleCase = exports.toObjectDate = exports.duplicateObjects = exports.removeDuplicateObjects = exports.getRandomColor = exports.calPercent = exports.percentOf = exports.genDateMinutesStep = void 0;
7
- exports.toggleProp = exports.roundLastNDigits = exports.removeParamKeyName = exports.countryIsoToFlag = exports.monthStringName = exports.returnBool = exports.formatAmountToString = exports.reduceSum = exports.sumAmount = exports.fillEndWithZero = exports.fillStartWithZero = exports.absFromSequence = exports.returnDates = exports.displayFrDatePeriode = exports.getArrayOfRandomColor = exports.randomHslColor = exports.randomHexColor = exports.randomRgbColor = exports.randomInteger = exports.insertAtInArray = exports.isBirthday = void 0;
6
+ exports.padStartWithZero = exports.formatMonthYearToLocaleString = exports.calculPercent = exports.validEmail = exports.convertToCfa = exports.packAndUnit = exports.unCheckedAll = exports.inputChecked = exports.arrayMultiChecked = exports.getPeriodDateColor = exports.getColorAccordingToDate = exports.genRandomColour = exports.formatNgbDate = exports.getNbOfDaysBetweenTwoDates = exports.displayDateRangeFr = exports.reformatDates = exports.dateToString = exports.dateDiff = exports.dateFormatter = exports.replaceSpacesWith = exports.replaceAllIn = exports.toPlural = exports.sesStorageGet = exports.sesStorageSet = exports.genSequenceRef = exports.removeBackSlashOccurences = exports.removeString = exports.diffArraysByProp = exports.diffArraysByFunc = exports.deepClone = exports.findFirstSequenceMissing = exports.fillNumWithZero = exports.findSequencesMissing = exports.sequencesToNumbers = exports.notInSequence = exports.currencyFormatterCfa = exports.formatToStringCfa = exports.currencyFormatter = exports.formatToString = exports.wakeUp = exports.sleep = exports.limitTo = exports.titleCase = exports.toObjectDate = exports.duplicateObjects = exports.removeDuplicateObjects = exports.getRandomColor = exports.calPercent = exports.percentOf = exports.genDateMinutesStep = void 0;
7
+ exports.toggleProp = exports.roundLastNDigits = exports.removeParamKeyName = exports.countryIsoToFlag = exports.monthStringName = exports.returnBool = exports.formatAmountToString = exports.reduceSum = exports.sumAmount = exports.fillEndWithZero = exports.fillStartWithZero = exports.absFromSequence = exports.returnDates = exports.displayFrDatePeriode = exports.getArrayOfRandomColor = exports.randomHslColor = exports.randomHexColor = exports.randomRgbColor = exports.randomInteger = exports.insertAtInArray = exports.isBirthday = exports.padEndWithZero = void 0;
8
8
  const dayjs_1 = __importDefault(require("dayjs"));
9
9
  const relativeTime_1 = __importDefault(require("dayjs/plugin/relativeTime"));
10
10
  const lodash_1 = __importDefault(require("lodash"));
@@ -274,6 +274,22 @@ const sesStorageGet = (key) => {
274
274
  return JSON.parse(sessionStorage.getItem(key));
275
275
  };
276
276
  exports.sesStorageGet = sesStorageGet;
277
+ /* start: string -------------------------------------- */
278
+ const toPlural = (word) => {
279
+ word = word.trimEnd();
280
+ if (["s", "x"].includes(word.slice(-1).toLocaleLowerCase())) {
281
+ return word;
282
+ }
283
+ else {
284
+ if (["hopital", "hôpital", "medical", "médical"].includes(word)) {
285
+ // return word.substring(0, word.lastIndexOf("l")) + "ux";
286
+ return word.replace(/.$/, "") + "ux";
287
+ }
288
+ }
289
+ return word + "s";
290
+ // if(word.lastIndexOf())
291
+ };
292
+ exports.toPlural = toPlural;
277
293
  const replaceAllIn = (text, regex = / /g, toChar = "_") => {
278
294
  return text.replace(regex, toChar) || text;
279
295
  };
@@ -282,6 +298,7 @@ const replaceSpacesWith = (text, toChar = "_") => {
282
298
  return text.replace(/\s/g, toChar) || text;
283
299
  };
284
300
  exports.replaceSpacesWith = replaceSpacesWith;
301
+ /* end: string ---------------------------------------- */
285
302
  /* start: dates -------------------------------------- */
286
303
  const dateFormatter = (date, format = "dmy", separator = "/") => {
287
304
  switch (format) {
package/lib/esm/npms/typeorm.js CHANGED
@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
+ import { dateFormatter } from "../utils";
10
11
  /**
11
12
  *
12
13
  * @param qb typeorm queryselectoer
@@ -36,29 +37,40 @@ export const tormDateParams = (qb, propColumn, opDates, dates, datesBy) => {
36
37
  break;
37
38
  }
38
39
  if (dates) {
39
- console.log("------ dates ------");
40
- console.log(dates);
41
- console.log(datesBy);
42
- console.log("------ dates ------");
43
40
  if (!datesBy) {
44
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
45
- fromDate: dates.fromDate,
46
- toDate: dates.toDate,
41
+ // qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
42
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m-%d') BETWEEN :fromDate AND :toDate`, {
43
+ /* fromDate: dates.fromDate,
44
+ toDate: dates.toDate, */
45
+ fromDate: dateFormatter(dates.fromDate, "ymd", "-"),
46
+ toDate: dateFormatter(dates.toDate, "ymd", "-"),
47
47
  });
48
48
  }
49
49
  else {
50
- switch (datesBy) {
51
- case "month":
52
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
53
- fromDate: dates.fromDate,
54
- toDate: dates.toDate,
55
- });
56
- case "year":
57
- qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
58
- fromDate: dates.fromDate,
59
- toDate: dates.toDate,
60
- });
50
+ if (datesBy === "month") {
51
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y-%m") BETWEEN :fromDate AND :toDate `, {
52
+ fromDate: dateFormatter(dates.fromDate, "ym", "-"),
53
+ toDate: dateFormatter(dates.toDate, "ym", "-"),
54
+ });
61
55
  }
56
+ if (datesBy === "year") {
57
+ qb.andWhere(`DATE_FORMAT(${propColumn}, "%Y") BETWEEN :fromDate AND :toDate `, {
58
+ fromDate: dateFormatter(dates.fromDate, "y"),
59
+ toDate: dateFormatter(dates.toDate, "y"),
60
+ });
61
+ }
62
+ /* switch (datesBy) {
63
+ case "month":
64
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y-%m') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
65
+ fromDate: dates.fromDate,
66
+ toDate: dates.toDate,
67
+ });
68
+ case "year":
69
+ qb.andWhere(`DATE_FORMAT(${propColumn}, '%Y') BETWEEN CAST(:fromDate as date) AND CAST(:toDate as date)`, {
70
+ fromDate: dates.fromDate,
71
+ toDate: dates.toDate,
72
+ });
73
+ } */
62
74
  }
63
75
  }
64
76
  };
package/lib/esm/utils.d.ts CHANGED
@@ -37,6 +37,7 @@ export declare const removeBackSlashOccurences: (text: string, toChar: string) =
37
37
  export declare const genSequenceRef: (refs: any[], startChars: string, zeroFillWidth: number, dateFormat?: string) => string;
38
38
  export declare const sesStorageSet: (key: string, val: any) => void;
39
39
  export declare const sesStorageGet: (key: string) => any;
40
+ export declare const toPlural: (word: string) => string;
40
41
  export declare const replaceAllIn: (text: string, regex?: RegExp, toChar?: string) => string;
41
42
  export declare const replaceSpacesWith: (text: string, toChar?: string) => string;
42
43
  export declare const dateFormatter: (date: Date | string, format?: "y" | "ym" | "ymd" | "dmy" | "ago" | "md" | "dmy-hm" | "dmyfr" | "myfr" | "mfr-short" | "mfr-long", separator?: "/" | "" | "-") => string;
package/lib/esm/utils.js CHANGED
@@ -239,12 +239,28 @@ export const sesStorageSet = (key, val) => {
239
239
  export const sesStorageGet = (key) => {
240
240
  return JSON.parse(sessionStorage.getItem(key));
241
241
  };
242
+ /* start: string -------------------------------------- */
243
+ export const toPlural = (word) => {
244
+ word = word.trimEnd();
245
+ if (["s", "x"].includes(word.slice(-1).toLocaleLowerCase())) {
246
+ return word;
247
+ }
248
+ else {
249
+ if (["hopital", "hôpital", "medical", "médical"].includes(word)) {
250
+ // return word.substring(0, word.lastIndexOf("l")) + "ux";
251
+ return word.replace(/.$/, "") + "ux";
252
+ }
253
+ }
254
+ return word + "s";
255
+ // if(word.lastIndexOf())
256
+ };
242
257
  export const replaceAllIn = (text, regex = / /g, toChar = "_") => {
243
258
  return text.replace(regex, toChar) || text;
244
259
  };
245
260
  export const replaceSpacesWith = (text, toChar = "_") => {
246
261
  return text.replace(/\s/g, toChar) || text;
247
262
  };
263
+ /* end: string ---------------------------------------- */
248
264
  /* start: dates -------------------------------------- */
249
265
  export const dateFormatter = (date, format = "dmy", separator = "/") => {
250
266
  switch (format) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asv-hlps",
3
- "version": "1.3.35",
3
+ "version": "1.3.37",
4
4
  "description": "helpers",
5
5
  "main": "./lib/cjs/index.js",
6
6
  "module": "./lib/esm/index.js",
@@ -18,9 +18,9 @@
18
18
  "devDependencies": {
19
19
  "@types/bcryptjs": "^2.4.5",
20
20
  "@types/lodash": "^4.14.200",
21
- "@types/pdfmake": "^0.2.5",
22
- "@types/randomatic": "^3.1.3",
23
- "@types/react": "^18.2.28",
21
+ "@types/pdfmake": "^0.2.7",
22
+ "@types/randomatic": "^3.1.4",
23
+ "@types/react": "^18.2.31",
24
24
  "typescript": "^5.2.2"
25
25
  },
26
26
  "dependencies": {