Merge pull request #545 from github0null/dev

v3.27.2 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,13 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.27.2] revision
+
+**Fix**:
+  - `Runtime compatibility`: Fixed NodeJS API deprecations (`DEP0051` and `DEP0044`). [Issue 542 543 544](https://github.com/github0null/eide/issues/542)
+
+***
+
 ### [v3.27.0] update
 
 **New**:

package.json

@@ -36,7 +36,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.27.0",
+    "version": "3.27.2",
     "preview": false,
     "engines": {
         "vscode": "^1.89.0"

src/EIDEProjectExplorer.ts

@@ -131,7 +131,6 @@ import {
     SourceFileConfigurationItem, WorkspaceBrowseConfiguration
 } from 'vscode-cpptools';
 import * as eclipseParser from './EclipseProjectParser';
-import { isArray } from 'util';
 import {
     parseIarCompilerLog, 
     CompilerDiagnostics, parseGccCompilerLog, parseArmccCompilerLog, 
@@ -2160,7 +2159,7 @@ class ProjectDataProvider implements vscode.TreeDataProvider<ProjTreeItem>, vsco
                 // copy string options
 
                 const optToString = (obj: string | string[]): string => {
-                    if (isArray(obj)) {
+                    if (Array.isArray(obj)) {
                         return obj[0];
                     } else {
                         return obj;

src/EIDEProjectModules.ts

@@ -5,7 +5,6 @@ import * as fs from 'fs';
 import * as vscode from 'vscode';
 import * as NodePath from 'path';
 import { jsonc } from 'jsonc';
-import { isNullOrUndefined } from "util";
 import * as child_process from 'child_process';
 
 import { File } from "../lib/node-utility/File";
@@ -379,7 +378,7 @@ export abstract class ConfigModel<DataType> {
 
             // set default value
             for (const key in _default) {
-                if (!isNullOrUndefined(_default[key])) {
+                if (_default[key] !== undefined && _default[key] !== null) {
                     if (typeof (<any>newConfig)[key] !== typeof _default[key]) {
                         (<any>newConfig)[key] = _default[key];
                     }

src/EclipseProjectParser.ts

@@ -4,7 +4,6 @@ import * as os from 'os';
 import * as xml2js from 'xml2js';
 import { VirtualFolder } from './EIDETypeDefine';
 import { VirtualSource, AbstractProject } from './EIDEProject';
-import { isArray } from 'util';
 import { ArrayDelRepetition } from '../lib/node-utility/Utility';
 import { File } from '../lib/node-utility/File';
 import { GlobalEvent } from './GlobalEvents';
@@ -483,7 +482,7 @@ export async function parseEclipseProject(cprojectPath: string): Promise<Eclipse
 
         for (const key in target.builldArgs) {
             const obj: any = target.builldArgs;
-            if (isArray(obj[key])) {
+            if (Array.isArray(obj[key])) {
                 obj[key] = ArrayDelRepetition(obj[key]);
             }
         }
@@ -508,10 +507,10 @@ function parseToolOption(optionObj: any, prjtype: EclipseProjectType): { type: s
 
     const makeResult = (value: string | string[], typ?: string): { type: string, val: string[] } | undefined => {
         if (value == '') return undefined;
-        if (isArray(value) && value.length == 0) return undefined;
+        if (Array.isArray(value) && value.length == 0) return undefined;
         return {
             type: typ || VALUE_TYPE || '',
-            val: isArray(value) ? value : [value]
+            val: Array.isArray(value) ? value : [value]
         };
     };
 
@@ -792,7 +791,7 @@ function parseToolOption(optionObj: any, prjtype: EclipseProjectType): { type: s
 
 function toArray(obj: any): any[] {
     if (obj == undefined || obj == null) return [];
-    if (!isArray(obj)) return [obj];
+    if (!Array.isArray(obj)) return [obj];
     return obj;
 }
 

src/IarProjectParser.ts

@@ -5,7 +5,6 @@ import * as xml2js from 'xml2js';
 import * as ini from 'ini';
 import { VirtualFolder } from './EIDETypeDefine';
 import { VirtualSource, AbstractProject } from './EIDEProject';
-import { isArray } from 'util';
 import { ArrayDelRepetition } from '../lib/node-utility/Utility';
 import { File } from '../lib/node-utility/File';
 import { GlobalEvent } from './GlobalEvents';
@@ -223,11 +222,11 @@ function parseTarget(proj: IarProjectInfo, configNodes: any) {
             });
             // builder action
             if (settingName == 'BUILDACTION') {
-                if (isArray(dataNode.prebuild)) {
+                if (Array.isArray(dataNode.prebuild)) {
                     nTarget.builderActions.prebuild =
                         formatEnvNameAndPathSep(dataNode.prebuild[0], true);
                 }
-                if (isArray(dataNode.postbuild)) {
+                if (Array.isArray(dataNode.postbuild)) {
                     nTarget.builderActions.postbuild =
                         formatEnvNameAndPathSep(dataNode.postbuild[0], true);
                 }
@@ -314,7 +313,7 @@ function isValidEnvName(name: string): boolean {
 
 function toArray(obj: any): any[] {
     if (obj == undefined || obj == null) return [];
-    if (isArray(obj)) return obj;
+    if (Array.isArray(obj)) return obj;
     return [obj];
 }
 

src/utility.ts

@@ -38,7 +38,6 @@ import { GitFileInfo } from './WebInterface/GithubInterface';
 import * as platform from './Platform';
 import { SevenZipper } from './Compress';
 import { ResManager } from './ResManager';
-import { isArray } from 'util';
 import { ExeCmd } from '../lib/node-utility/Executable';
 import { GlobalEvent } from './GlobalEvents';
 import { SettingManager } from './SettingManager';
@@ -669,7 +668,7 @@ export function newFileTooltipString(f: File | FileTooltipInfo, root?: File): vs
 
 export function toArray(obj: any): any[] {
     if (obj == undefined || obj == null) return [];
-    if (isArray(obj)) return obj;
+    if (Array.isArray(obj)) return obj;
     return [obj];
 }