@villedemontreal/general-utils 5.17.6 → 5.18.0

package/src/dateUtils.ts

@@ -1,8 +1,8 @@
-import _ from 'lodash';
 import { DateTime, Zone } from 'luxon';
-import moment from 'moment';
+import * as moment from 'moment';
 import { Moment } from 'moment';
 import { getValueDescription, utils } from '.';
+import { isDate, isNil } from 'lodash';
 
 export function isDateEqual(value: DateDefinition, expectedDate: DateDefinition) {
   const _moment: Moment = moment(value);
@@ -230,11 +230,11 @@ export function startOfDay(
   isoDate: Date | string,
   timezone: string | Zone = 'America/Montreal',
 ): Date {
-  if (_.isNil(isoDate)) {
+  if (isNil(isoDate)) {
     return isoDate;
   }
 
-  let luxonDate = DateTime.fromISO(_.isDate(isoDate) ? isoDate.toISOString() : isoDate);
+  let luxonDate = DateTime.fromISO(isDate(isoDate) ? isoDate.toISOString() : isoDate);
   if (!luxonDate.isValid) {
     throw new Error(`Invalid ISO date ${JSON.stringify(isoDate)} : ${luxonDate.invalidReason}`);
   }
@@ -261,11 +261,11 @@ export function endOfDay(
   isoDate: Date | string,
   timezone: string | Zone = 'America/Montreal',
 ): Date {
-  if (_.isNil(isoDate)) {
+  if (isNil(isoDate)) {
     return isoDate;
   }
 
-  let luxonDate = DateTime.fromISO(_.isDate(isoDate) ? isoDate.toISOString() : isoDate);
+  let luxonDate = DateTime.fromISO(isDate(isoDate) ? isoDate.toISOString() : isoDate);
   if (!luxonDate.isValid) {
     throw new Error(`Invalid ISO date ${JSON.stringify(isoDate)} : ${luxonDate.invalidReason}`);
   }

package/src/logLevel.ts

@@ -24,10 +24,20 @@ export enum LogLevel {
  * LogLevel enum value.
  */
 export const logLevelFromString = (levelStr: string): LogLevel => {
-  if (levelStr) {
-    return LogLevel[levelStr.toUpperCase()];
+  switch ((levelStr || '').toUpperCase()) {
+    case 'DEBUG':
+      return LogLevel.DEBUG;
+    case 'TRACE':
+      return LogLevel.TRACE;
+    case 'ERROR':
+      return LogLevel.ERROR;
+    case 'INFO':
+      return LogLevel.INFO;
+    case 'WARNING':
+      return LogLevel.WARNING;
+    default:
+      return LogLevel.DEBUG;
   }
-  return undefined;
 };
 
 /**

package/src/utils.ts

@@ -1,11 +1,11 @@
 import { spawn, StdioOptions } from 'child_process';
 import * as fs from 'fs';
-import getPort from 'get-port';
-import _ from 'lodash';
+import * as getPort from 'get-port';
 import * as pathUtils from 'path';
 import { rimraf } from 'rimraf';
 import * as tsconfig from 'tsconfig-extends';
 import { constants } from './config/constants';
+import { isArray, isDate, isEqual, isFunction, isNil, isObject, isString, trimEnd } from 'lodash';
 
 /**
  * General utilities
@@ -158,7 +158,7 @@ export class Utils {
     pathClean = pathUtils.normalize(pathClean);
 
     pathClean = pathClean.replace(/\\/g, '/');
-    pathClean = _.trimEnd(pathClean, '/ ');
+    pathClean = trimEnd(pathClean, '/ ');
 
     return (pathClean.match(/\//g) || []).length > 1;
   }
@@ -268,11 +268,12 @@ export class Utils {
     if (!this.tscCompilerOptionsParams) {
       this.tscCompilerOptionsParams = [];
       const compilerOptions = tsconfig.load_file_sync(constants.appRoot + '/tsconfig.json');
+
       for (const key of Object.keys(compilerOptions)) {
         // ==========================================
-        // TS6064: Option 'plugins' can only be specified in 'tsconfig.json' file.
+        // TS6064: Options 'plugins', 'composite' can only be specified in 'tsconfig.json' file.
         // ==========================================
-        if (key === 'plugins') {
+        if (['plugins', 'composite'].includes(key)) {
           continue;
         }
 
@@ -306,9 +307,8 @@ export class Utils {
     }
 
     const cmd = 'node';
-    const args = [constants.libRoot + '/node_modules/typescript/lib/tsc.js']
-      .concat(this.tscCompilerOptions)
-      .concat(files);
+    const tscCmd = constants.findModulePath('node_modules/typescript/lib/tsc.js');
+    const args = [tscCmd].concat(this.tscCompilerOptions).concat(files);
 
     await this.execPromisified(cmd, args);
   }
@@ -362,13 +362,13 @@ export class Utils {
   public dateTransformer = (value: any): Date => {
     let date: Date;
 
-    if (_.isNil(value)) {
+    if (isNil(value)) {
       return null;
     }
 
-    if (_.isDate(value)) {
+    if (isDate(value)) {
       date = value;
-    } else if (!_.isString(value) || utils.isBlank(value)) {
+    } else if (!isString(value) || utils.isBlank(value)) {
       // ==========================================
       // Makes sure it's an invalid date!
       // Because by default, true and 123 are accepted,
@@ -406,7 +406,7 @@ export class Utils {
     if (!val) {
       return false;
     }
-    return _.isObject(val) && !_.isArray(val) && !_.isDate(val) && !_.isFunction(val);
+    return isObject(val) && !isArray(val) && !isDate(val) && !isFunction(val);
   };
 
   /**
@@ -415,12 +415,12 @@ export class Utils {
    * strictly equals to the specified "value".
    */
   public arrayContainsObjectWithKeyEqualsTo = (array: any[], key: string, value: any): boolean => {
-    if (!array || !_.isArray(array) || array.length < 1) {
+    if (!array || !isArray(array) || array.length < 1) {
       return false;
     }
 
     for (const obj of array) {
-      if (this.isObjectStrict(obj) && _.isEqual(obj[key], value)) {
+      if (this.isObjectStrict(obj) && isEqual(obj[key], value)) {
         return true;
       }
     }
@@ -499,7 +499,7 @@ export class Utils {
     const optionsClean = options ?? {};
     optionsClean.useShellOption = optionsClean.useShellOption ?? true;
     optionsClean.successExitCodes = optionsClean.successExitCodes
-      ? _.isArray(optionsClean.successExitCodes)
+      ? isArray(optionsClean.successExitCodes)
         ? optionsClean.successExitCodes
         : [optionsClean.successExitCodes]
       : [0];
@@ -575,7 +575,7 @@ export function getValueDescription(value: any): string {
 }
 
 export function getValueDescriptionWithType(value: any): string {
-  const valueType = _.isObject(value) ? value.constructor.name : typeof value;
+  const valueType = isObject(value) ? value.constructor.name : typeof value;
   return getValueDescription(value) + ` (${valueType})`;
 }
 

package/dist/test-data/test_throwNotManaged/99039260-e610-4019-91c3-9ef4255a214b.d.ts

@@ -1 +0,0 @@
-export {};