@villedemontreal/general-utils 5.17.6 → 5.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@villedemontreal/general-utils",
-  "version": "5.17.6",
+  "version": "5.18.1",
   "description": "General utilities library",
   "main": "dist/src/index.js",
   "engines": {
@@ -24,9 +24,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/villedemontreal/node-general-utils.git"
+    "url": "https://github.com/villedemontreal/node-core-libs.git",
+    "directory": "packages/node-general-utils"
   },
-  "homepage": "https://github.com/villedemontreal/node-general-utils",
+  "homepage": "https://github.com/villedemontreal/node-core-libs",
   "keywords": [
     "montreal",
     "utils",
@@ -42,7 +43,7 @@
     "@types/luxon": "3.4.2",
     "app-root-path": "3.1.0",
     "get-port": "5.1.1",
-    "globby": "14.0.2",
+    "globby": "14.1.0",
     "http-status-codes": "2.3.0",
     "lodash": "4.17.21",
     "luxon": "3.5.0",
@@ -56,21 +57,21 @@
     "@types/mocha": "10.0.10",
     "@types/node": "20.x",
     "@types/sinon": "17.0.4",
-    "@typescript-eslint/eslint-plugin": "5.39.0",
-    "@typescript-eslint/parser": "5.39.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
     "@types/uuid": "10.0.0",
     "chai": "4.5.0",
-    "eslint": "8.24.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-prettier": "5.2.3",
-    "fs-extra": "11.2.0",
-    "mocha": "10.7.3",
+    "eslint": "8.57.1",
+    "eslint-config-prettier": "8.10.0",
+    "eslint-plugin-prettier": "5.2.4",
+    "fs-extra": "11.3.0",
+    "mocha": "10.8.2",
     "nyc": "17.1.0",
-    "prettier": "3.1.1",
-    "sinon": "19.0.2",
+    "prettier": "3.5.3",
+    "sinon": "19.0.5",
     "source-map-support": "0.5.21",
     "ts-node": "^10.9.2",
-    "typescript": "5.6.3",
+    "typescript": "5.8.2",
     "uuid": "10.0.0"
   }
 }

package/src/collectionUtils.ts

@@ -130,7 +130,7 @@ export function toDictionary<T, C extends T[]>(
     collection,
     (accumulator, value, index) => {
       const key = mapper(value, index);
-      accumulator[key] = value;
+      (accumulator as any)[key] = value;
       return accumulator;
     },
     {},

package/src/config/constants.ts

@@ -1,5 +1,6 @@
-import { path as appRoot } from 'app-root-path';
+import * as fs from 'fs';
 import * as path from 'path';
+import { path as appRoot } from 'app-root-path';
 
 /**
  * Library constants
@@ -32,6 +33,20 @@ export class Constants {
   get testDataDirPath() {
     return this.libRoot + '/test-data';
   }
+
+  public findModulePath(subPath: string): string {
+    let current = this.libRoot;
+    let counter = 0;
+    while (counter < 10 && current !== '/' && fs.existsSync(current)) {
+      const p = path.join(current, subPath);
+      if (fs.existsSync(p)) {
+        return path.normalize(p);
+      }
+      current = path.normalize(path.join(current, '..'));
+      counter += 1;
+    }
+    throw new Error(`Could not find module "${subPath}"`);
+  }
 }
 
 export const constants: Constants = new Constants();

package/src/dateUtils.test.ts

@@ -1,6 +1,6 @@
 import { assert } from 'chai';
-import _ from 'lodash';
-import moment from 'moment';
+import * as _ from 'lodash';
+import * as moment from 'moment';
 import { getValueDescription, getValueDescriptionWithType, utils } from '.';
 import { getCartesianProduct } from './collectionUtils';
 import {

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.test.ts

@@ -0,0 +1,26 @@
+import { assert } from 'chai';
+import { LogLevel, logLevelFromString, logLevelToString } from './logLevel';
+
+describe('logLevel', () => {
+  it('logLevelFromString success', () => {
+    assert.equal(logLevelFromString('debug'), LogLevel.DEBUG);
+    assert.equal(logLevelFromString('Debug'), LogLevel.DEBUG);
+    assert.equal(logLevelFromString('DEBUG'), LogLevel.DEBUG);
+    assert.equal(logLevelFromString('info'), LogLevel.INFO);
+    assert.equal(logLevelFromString('error'), LogLevel.ERROR);
+    assert.equal(logLevelFromString('trace'), LogLevel.TRACE);
+    assert.equal(logLevelFromString('warning'), LogLevel.WARNING);
+  });
+
+  it('logLevelFromString failure', () => {
+    assert.isUndefined(logLevelFromString('zorg'));
+  });
+
+  it('logLevelFromString success', () => {
+    assert.equal(logLevelToString(LogLevel.DEBUG), 'DEBUG');
+    assert.equal(logLevelToString(LogLevel.ERROR), 'ERROR');
+    assert.equal(logLevelToString(LogLevel.INFO), 'INFO');
+    assert.equal(logLevelToString(LogLevel.TRACE), 'TRACE');
+    assert.equal(logLevelToString(LogLevel.WARNING), 'WARNING');
+  });
+});

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 undefined;
   }
-  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 {};