From 4c5cff9bb82d0fec842b2ca140722490079b2da9 Mon Sep 17 00:00:00 2001 From: shenchunping Date: Fri, 11 Oct 2024 09:44:16 +0800 Subject: [PATCH] fix code check of 5.0.1 release Signed-off-by: shenchunping --- src/cli/cmake2gn/src/src/tool.js | 2 +- src/cli/dts2cpp/src/gen/cmd_gen.js | 6 +- src/cli/dts2cpp/src/gen/generate.js | 6 +- .../src/gen/generate/function_async.js | 2 +- .../src/gen/generate/function_direct.js | 2 +- .../src/gen/generate/function_onoff.js | 2 +- .../dts2cpp/src/gen/generate/function_sync.js | 2 +- .../src/gen/generate/return_generate.js | 2 +- src/cli/dts2cpp/src/gen/main.js | 2 +- src/cli/dts2cpp/src/gen/tools/FileRW.js | 8 ++- src/cli/dts2cpp/src/gen/tools/NapiLog.js | 6 +- src/cli/dts2cpp/src/gen/tools/common.js | 6 +- src/cli/dts2cpp/src/gen/tools/tool.js | 2 +- .../dts2ets/appCodeGen/src/app_code_gen.js | 2 +- src/cli/dts2ets/appCodeGen/src/generate.js | 10 ++-- src/cli/dts2ets/appCodeGen/src/main.js | 2 +- .../dts2ets/appCodeGen/src/tools/FileRW.js | 8 ++- .../dts2ets/appCodeGen/src/tools/NapiLog.js | 6 +- .../dts2ets/appCodeGen/src/tools/common.js | 6 +- src/cli/dts2ets/appCodeGen/src/tools/tool.js | 2 +- src/cli/h2dts/src/tsGen/cmd_gen.js | 4 +- src/cli/h2dts/src/tsGen/tools/FileRW.js | 8 ++- src/cli/h2dts/src/tsGen/tools/NapiLog.js | 6 +- src/cli/h2dts/src/tsGen/tsMain.js | 34 +++++------ src/cli/h2dtscpp/src/src/tools/NapiLog.js | 6 +- src/cli/h2dtscpp/src/src/tools/common.js | 4 +- src/cli/h2dtscpp/src/src/tsGen/tsMain.js | 32 +++++----- src/cli/h2sa/src/src/gen/analyze.js | 6 +- src/cli/h2sa/src/src/gen/generate.js | 6 +- src/cli/h2sa/src/src/gen/main.js | 2 +- src/cli/h2sa/src/src/tools/FileRW.js | 8 ++- src/cli/h2sa/src/src/tools/NapiLog.js | 6 +- src/cli/h2sa/src/src/tools/tool.js | 4 +- .../src/gen/tools/VsPluginLog.js | 6 +- .../src/gen/tools/VsPluginTool.js | 8 ++- .../src/vs_plugin_view.html | 20 +++---- .../src/util/VsPluginTool.js | 8 ++- .../src/vs_plugin_view.html | 30 +++++----- .../gn_vs_plugin/src/gen/tools/VsPluginLog.js | 6 +- .../src/gen/tools/VsPluginTool.js | 8 ++- .../gn_vs_plugin/src/vs_plugin_view.html | 60 +++++++++---------- .../src/gen/tools/VsPluginLog.js | 6 +- .../src/gen/tools/VsPluginTool.js | 8 ++- .../napi_vs_plugin/src/vs_config_view.html | 6 +- .../napi_vs_plugin/src/vs_plugin_view.html | 28 ++++----- .../napi_vs_plugin/src/vs_showInfo_view.html | 2 +- .../ts_vs_plugin/src/gen/tools/VsPluginLog.js | 6 +- .../src/gen/tools/VsPluginTool.js | 7 ++- .../ts_vs_plugin/src/vs_plugin_view.html | 22 +++---- .../src/gen/tools/VsPluginLog.js | 6 +- .../src/gen/tools/VsPluginTool.js | 8 ++- .../service_vs_plugin/src/vs_plugin_view.html | 44 +++++++------- 52 files changed, 269 insertions(+), 230 deletions(-) diff --git a/src/cli/cmake2gn/src/src/tool.js b/src/cli/cmake2gn/src/src/tool.js index 930a7b2a..08fab4c4 100644 --- a/src/cli/cmake2gn/src/src/tool.js +++ b/src/cli/cmake2gn/src/src/tool.js @@ -206,7 +206,7 @@ class Tool { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); diff --git a/src/cli/dts2cpp/src/gen/cmd_gen.js b/src/cli/dts2cpp/src/gen/cmd_gen.js index c8b4c4ca..b593b8ac 100644 --- a/src/cli/dts2cpp/src/gen/cmd_gen.js +++ b/src/cli/dts2cpp/src/gen/cmd_gen.js @@ -18,7 +18,7 @@ const { checkFileError } = require('./tools/common'); const { NapiLog } = require('./tools/NapiLog'); const path = require('path'); const stdio = require('stdio'); -var fs = require('fs'); +let fs = require('fs'); const { print } = require('./tools/tool'); let ops = stdio.getopt({ @@ -43,8 +43,8 @@ let ops = stdio.getopt({ NapiLog.init(ops.loglevel, path.join('' + ops.out, 'napi_gen.log')); let fileNames = ops.filename; -var pathDir = ops.directory; -var imports = ops.imports; +let pathDir = ops.directory; +let imports = ops.imports; if (fileNames === null && pathDir === null) { NapiLog.logInfo('fileNames and pathDir both cannot be empty at the same time'); } else if (pathDir !== '') { diff --git a/src/cli/dts2cpp/src/gen/generate.js b/src/cli/dts2cpp/src/gen/generate.js index 7ec8f3aa..598bd62e 100644 --- a/src/cli/dts2cpp/src/gen/generate.js +++ b/src/cli/dts2cpp/src/gen/generate.js @@ -25,7 +25,7 @@ const { NumberIncrease, jsonCfgList } = require('./tools/common'); const os = require('os'); const path = require('path'); const { NapiLog } = require('./tools/NapiLog'); -var fs = require('fs'); +let fs = require('fs'); let moduleHTemplete = `\ #ifndef IMPL_[impl_name_upper]_H @@ -154,7 +154,7 @@ let implCppTemplete = `\ [include_configure_hCode] [implCpp_detail] `; -var genFileList = []; +let genFileList = []; function deleteFolder(folderPath) { if (fs.existsSync(folderPath)) { @@ -255,7 +255,7 @@ function generateAll(structOfTs, destDir, moduleName, numberType, jsonCfg) { jsonCfgList.pop(); let numberUsing = ''; - var numbertype = 'uint32_t'; + let numbertype = 'uint32_t'; if (numberType !== '' && (numberType !== undefined && numberType !== null)) { numbertype = numberType; } diff --git a/src/cli/dts2cpp/src/gen/generate/function_async.js b/src/cli/dts2cpp/src/gen/generate/function_async.js index 7d622273..58795c4b 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_async.js +++ b/src/cli/dts2cpp/src/gen/generate/function_async.js @@ -89,7 +89,7 @@ void %s%sSetCbValue(%s) `; function removeEndlineEnter(value) { - for (var i = value.length; i > 0; i--) { + for (let i = value.length; i > 0; i--) { let len = value.length; if (value.substring(len - 1, len) === '\n' || value.substring(len - 1, len) === ' ') { value = value.substring(0, len - 1); diff --git a/src/cli/dts2cpp/src/gen/generate/function_direct.js b/src/cli/dts2cpp/src/gen/generate/function_direct.js index 816595eb..700d3c08 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_direct.js +++ b/src/cli/dts2cpp/src/gen/generate/function_direct.js @@ -59,7 +59,7 @@ bool %s%s(%s) `; function removeEndlineEnter(value) { - for (var i = value.length; i > 0; i--) { + for (let i = value.length; i > 0; i--) { let len = value.length; if (value.substring(len - 1, len) === '\n' || value.substring(len - 1, len) === ' ') { value = value.substring(0, len - 1); diff --git a/src/cli/dts2cpp/src/gen/generate/function_onoff.js b/src/cli/dts2cpp/src/gen/generate/function_onoff.js index 9585fb0c..c8766e9b 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_onoff.js +++ b/src/cli/dts2cpp/src/gen/generate/function_onoff.js @@ -111,7 +111,7 @@ function isOnTypeExist(onTypeList, newType) { return false; } - for (var i in onTypeList) { + for (let i in onTypeList) { if (onTypeList[i] === newType) { return true; } diff --git a/src/cli/dts2cpp/src/gen/generate/function_sync.js b/src/cli/dts2cpp/src/gen/generate/function_sync.js index 42bbc9f2..acf2a1ba 100644 --- a/src/cli/dts2cpp/src/gen/generate/function_sync.js +++ b/src/cli/dts2cpp/src/gen/generate/function_sync.js @@ -83,7 +83,7 @@ bool %s%sReturn(%s) `; function removeEndlineEnter(value) { - for (var i = value.length; i > 0; i--) { + for (let i = value.length; i > 0; i--) { let len = value.length; if (value.substring(len - 1, len) === '\n' || value.substring(len - 1, len) === ' ') { value = value.substring(0, len - 1); diff --git a/src/cli/dts2cpp/src/gen/generate/return_generate.js b/src/cli/dts2cpp/src/gen/generate/return_generate.js index b50f0650..04f007ef 100644 --- a/src/cli/dts2cpp/src/gen/generate/return_generate.js +++ b/src/cli/dts2cpp/src/gen/generate/return_generate.js @@ -134,7 +134,7 @@ function c2JsForEnum(deep, type, value, dest, propertyName) { } function cToJs(value, type, dest, deep = 1, optional, enumType = 0) { - var propertyName = delPrefix(value); + let propertyName = delPrefix(value); if (checkRetIsUndefined(type)) { NapiLog.logError('type is invalid!'); return undefined; diff --git a/src/cli/dts2cpp/src/gen/main.js b/src/cli/dts2cpp/src/gen/main.js index 5fcd479b..18fda545 100644 --- a/src/cli/dts2cpp/src/gen/main.js +++ b/src/cli/dts2cpp/src/gen/main.js @@ -17,7 +17,7 @@ const { analyzeFileRaw } = require('./analyzeRaw'); const { generateAll } = require('./generate'); const { NapiLog } = require('./tools/NapiLog'); const re = require('./tools/re'); -var fs = require('fs'); +let fs = require('fs'); function doGenerate(ifname, destdir, imports, numberType, jsonCfg) { // step1: analyze file diff --git a/src/cli/dts2cpp/src/gen/tools/FileRW.js b/src/cli/dts2cpp/src/gen/tools/FileRW.js index 823228e7..7f8b71f1 100644 --- a/src/cli/dts2cpp/src/gen/tools/FileRW.js +++ b/src/cli/dts2cpp/src/gen/tools/FileRW.js @@ -15,8 +15,12 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out; + let i; + let len; + let c; + let char2; + let char3; out = ''; len = array.length; diff --git a/src/cli/dts2cpp/src/gen/tools/NapiLog.js b/src/cli/dts2cpp/src/gen/tools/NapiLog.js index 188f2404..dc732dd4 100644 --- a/src/cli/dts2cpp/src/gen/tools/NapiLog.js +++ b/src/cli/dts2cpp/src/gen/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/dts2cpp/src/gen/tools/common.js b/src/cli/dts2cpp/src/gen/tools/common.js index e1dcb7f7..a782e1f6 100644 --- a/src/cli/dts2cpp/src/gen/tools/common.js +++ b/src/cli/dts2cpp/src/gen/tools/common.js @@ -80,7 +80,7 @@ InterfaceList.getValue = function (name) { for (let i in ifs) { let vv = ifs[i]; if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -151,7 +151,7 @@ TypeList.getValue = function (name) { let ifs = TypeList.types[TypeList.types.length - 1]; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -335,7 +335,7 @@ function getMapType(type) { function getUnionType(type) { type = type.replace(/\s*/g, ''); - var typeArr = new Array(); + let typeArr = new Array(); typeArr = type.split('|'); return typeArr; } diff --git a/src/cli/dts2cpp/src/gen/tools/tool.js b/src/cli/dts2cpp/src/gen/tools/tool.js index ca51073f..adf019e0 100644 --- a/src/cli/dts2cpp/src/gen/tools/tool.js +++ b/src/cli/dts2cpp/src/gen/tools/tool.js @@ -35,7 +35,7 @@ function print(...args) { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); diff --git a/src/cli/dts2ets/appCodeGen/src/app_code_gen.js b/src/cli/dts2ets/appCodeGen/src/app_code_gen.js index bf5f2995..4c53a658 100644 --- a/src/cli/dts2ets/appCodeGen/src/app_code_gen.js +++ b/src/cli/dts2ets/appCodeGen/src/app_code_gen.js @@ -19,7 +19,7 @@ const { checkFileError } = require('./tools/common'); const { NapiLog } = require('./tools/NapiLog'); const path = require('path'); const stdio = require('stdio'); -var fs = require('fs'); +let fs = require('fs'); const { print } = require('./tools/tool'); let ops = stdio.getopt({ diff --git a/src/cli/dts2ets/appCodeGen/src/generate.js b/src/cli/dts2ets/appCodeGen/src/generate.js index a61414e4..f0743a7b 100644 --- a/src/cli/dts2ets/appCodeGen/src/generate.js +++ b/src/cli/dts2ets/appCodeGen/src/generate.js @@ -31,7 +31,7 @@ const MAXINT = 100; const SUBSTREND = 11; const LENGTH = 5; const MODTWO = 2; -var fs = require('fs'); +let fs = require('fs'); let indexEtsTemplete = `\ import napitest from '@ohos.[import_module_name]'; @@ -93,11 +93,11 @@ function analyzeJsonCfg(jsonCfg) { // 随机生成字符串 function generateRandomString(length) { - var result = ''; - var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - var charactersLength = characters.length; + let result = ''; + let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + let charactersLength = characters.length; - for (var i = 0; i < length; i++) { + for (let i = 0; i < length; i++) { result += characters.charAt(Math.floor(Math.random() * charactersLength)); } diff --git a/src/cli/dts2ets/appCodeGen/src/main.js b/src/cli/dts2ets/appCodeGen/src/main.js index 46b44811..61a06543 100644 --- a/src/cli/dts2ets/appCodeGen/src/main.js +++ b/src/cli/dts2ets/appCodeGen/src/main.js @@ -16,7 +16,7 @@ const { analyzeFile } = require('./analyze'); const { generateAppCode } = require('./generate'); const { NapiLog } = require('./tools/NapiLog'); const re = require('./tools/re'); -var fs = require('fs'); +let fs = require('fs'); function doGenerate(ifname, destdir, jsonCfg) { // step1: analyze file diff --git a/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js b/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js index 823228e7..7f8b71f1 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/FileRW.js @@ -15,8 +15,12 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out; + let i; + let len; + let c; + let char2; + let char3; out = ''; len = array.length; diff --git a/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js b/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js index 3b8496d4..4814e6eb 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/dts2ets/appCodeGen/src/tools/common.js b/src/cli/dts2ets/appCodeGen/src/tools/common.js index 5f2634c5..46739bdd 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/common.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/common.js @@ -79,7 +79,7 @@ InterfaceList.getValue = function (name) { for (let i in ifs) { let vv = ifs[i]; if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -150,7 +150,7 @@ TypeList.getValue = function (name) { let ifs = TypeList.types[TypeList.types.length - 1]; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -334,7 +334,7 @@ function getMapType(type) { function getUnionType(type) { type = type.replace(/\s*/g, ''); - var typeArr = new Array(); + let typeArr = new Array(); typeArr = type.split('|'); return typeArr; } diff --git a/src/cli/dts2ets/appCodeGen/src/tools/tool.js b/src/cli/dts2ets/appCodeGen/src/tools/tool.js index 1894512b..47a5443f 100644 --- a/src/cli/dts2ets/appCodeGen/src/tools/tool.js +++ b/src/cli/dts2ets/appCodeGen/src/tools/tool.js @@ -35,7 +35,7 @@ function print(...args) { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); diff --git a/src/cli/h2dts/src/tsGen/cmd_gen.js b/src/cli/h2dts/src/tsGen/cmd_gen.js index 88422f13..cfc415ac 100644 --- a/src/cli/h2dts/src/tsGen/cmd_gen.js +++ b/src/cli/h2dts/src/tsGen/cmd_gen.js @@ -17,7 +17,7 @@ const tsMain = require('./tsMain'); const { NapiLog } = require('./tools/NapiLog'); const path = require('path'); const stdio = require('stdio'); -var fs = require('fs'); +let fs = require('fs'); const util = require('util'); let ops = stdio.getopt({ @@ -39,7 +39,7 @@ catch (err) { NapiLog.init(ops.loglevel, path.join('' + ops.out, 'napi_gen.log')); let fileNames = ops.filename; -var pathDir = ops.directory; +let pathDir = ops.directory; if (fileNames == null && pathDir == null) { NapiLog.logInfo('fileNames and pathDir both cannot be empty at the same time'); } else if (pathDir !== '') { diff --git a/src/cli/h2dts/src/tsGen/tools/FileRW.js b/src/cli/h2dts/src/tsGen/tools/FileRW.js index 648b6918..96ba27c6 100644 --- a/src/cli/h2dts/src/tsGen/tools/FileRW.js +++ b/src/cli/h2dts/src/tsGen/tools/FileRW.js @@ -15,8 +15,12 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out; + let i; + let len; + let c; + let char2; + let char3; out = ''; len = array.length; diff --git a/src/cli/h2dts/src/tsGen/tools/NapiLog.js b/src/cli/h2dts/src/tsGen/tools/NapiLog.js index 135741d3..66e076b7 100644 --- a/src/cli/h2dts/src/tsGen/tools/NapiLog.js +++ b/src/cli/h2dts/src/tsGen/tools/NapiLog.js @@ -34,9 +34,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/h2dts/src/tsGen/tsMain.js b/src/cli/h2dts/src/tsGen/tsMain.js index af01f2c0..a4a60461 100644 --- a/src/cli/h2dts/src/tsGen/tsMain.js +++ b/src/cli/h2dts/src/tsGen/tsMain.js @@ -53,7 +53,7 @@ function createNameSpaceInfo(parseNameSpaceInfo) { function analyzeNameSpace(rootInfo, parseResult) { let parseNameSpaces = parseResult.namespaces; - for (var i = 0; i < parseNameSpaces.length; ++i) { + for (let i = 0; i < parseNameSpaces.length; ++i) { let nameSpaceInfo = createNameSpaceInfo(parseNameSpaces[i]); rootInfo.namespaces.push(nameSpaceInfo); } @@ -167,7 +167,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } let parseParams = parseFuncInfo.parameters; - for (var i = 0; i < parseParams.length; ++i) { + for (let i = 0; i < parseParams.length; ++i) { let param = createParam(parseParams[i]); funcInfo.params.push(param); } @@ -183,7 +183,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } function putFuncIntoNamespace(funcInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === funcInfo.namespace) { namespaces[i].functions.push(funcInfo); return; @@ -194,7 +194,7 @@ function putFuncIntoNamespace(funcInfo, namespaces) { function analyzeRootFunction(rootInfo, parseResult) { let parseFunctions = parseResult.functions; - for (var i = 0; i < parseFunctions.length; ++i) { + for (let i = 0; i < parseFunctions.length; ++i) { let funcInfo = createFuncInfo(parseFunctions[i], false); if (parseFunctions[i].namespace !== '') { // function in namespace @@ -208,7 +208,7 @@ function analyzeRootFunction(rootInfo, parseResult) { function createProperties(parseProperties) { let propertyList = []; - for (var i = 0; i < parseProperties.length; ++i) { + for (let i = 0; i < parseProperties.length; ++i) { let property = {}; property.name = parseProperties[i].name; property.type = getJsTypeFromC(parseProperties[i].raw_type, parseProperties[i]); @@ -219,7 +219,7 @@ function createProperties(parseProperties) { function createClassFunctions(parseFuncs) { let funcList = []; - for (var i = 0; i < parseFuncs.length; ++i) { + for (let i = 0; i < parseFuncs.length; ++i) { let funcInfo = createFuncInfo(parseFuncs[i], true); funcList.push(funcInfo); } @@ -243,7 +243,7 @@ function createClassInfo(parseClassInfo) { } function putClassIntoNamespace(classInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === classInfo.namespace) { namespaces[i].classes.push(classInfo); return; @@ -255,7 +255,7 @@ function putClassIntoNamespace(classInfo, namespaces) { function analyzeClasses(rootInfo, parseResult) { let parseClasses = parseResult.classes; - for (var className in parseClasses) { + for (let className in parseClasses) { let classInfo = createClassInfo(parseClasses[className]); if (classInfo.namespace !== '') { // class in namespace @@ -269,7 +269,7 @@ function analyzeClasses(rootInfo, parseResult) { function getTab(tabLv) { let tab = ''; - for (var i = 0; i < tabLv; ++i) { + for (let i = 0; i < tabLv; ++i) { tab += ' '; } return tab; @@ -279,7 +279,7 @@ function genFunction(func, tabLv, needDeclare = false) { let tab = getTab(tabLv); let funcPrefix = func.isClassFunc ? '' : 'function '; let funcParams = ''; - for (var i = 0; i < func.params.length; ++i) { + for (let i = 0; i < func.params.length; ++i) { funcParams += i > 0 ? ', ' : ''; funcParams += func.params[i].name + ': ' + func.params[i].type; } @@ -292,10 +292,10 @@ function genClass(classInfo, tabLv, needDeclare = false) { let declareStr = needDeclare ? 'declare ' : ''; let tsClass = tab + declareStr + 'class ' + classInfo.name + ' {\n'; let tab1 = getTab(tabLv + 1); - for (var i = 0; i < classInfo.properties.length; ++i) { + for (let i = 0; i < classInfo.properties.length; ++i) { tsClass += util.format('%s%s: %s;\n', tab1, classInfo.properties[i].name, classInfo.properties[i].type); } - for (var i = 0; i < classInfo.functions.length; ++i) { + for (let i = 0; i < classInfo.functions.length; ++i) { tsClass += genFunction(classInfo.functions[i], tabLv + 1); } tsClass += tab + '}\n'; @@ -305,10 +305,10 @@ function genClass(classInfo, tabLv, needDeclare = false) { function genNamespace(namespace, tabLv) { let tab = getTab(tabLv); let tsNamespace = tab + util.format('declare namespace %s {\n', namespace.name); - for (var i = 0; i < namespace.functions.length; ++i) { + for (let i = 0; i < namespace.functions.length; ++i) { tsNamespace += genFunction(namespace.functions[i], tabLv + 1); } - for (var i = 0; i < namespace.classes.length; ++i) { + for (let i = 0; i < namespace.classes.length; ++i) { tsNamespace += genClass(namespace.classes[i], tabLv + 1); } tsNamespace += tab + '}\n'; @@ -318,15 +318,15 @@ function genNamespace(namespace, tabLv) { function genTsContent(rootInfo) { let tsContent = rootInfo.needCallback ? 'import { AsyncCallback, Callback } from \'./../basic\';\n\n' : ''; - for (var i = 0; i < rootInfo.classes.length; ++i) { + for (let i = 0; i < rootInfo.classes.length; ++i) { tsContent += genClass(rootInfo.classes[i], 0, true); } - for (var i = 0; i < rootInfo.namespaces.length; ++i) { + for (let i = 0; i < rootInfo.namespaces.length; ++i) { tsContent += genNamespace(rootInfo.namespaces[i], 0); } - for (var i = 0; i < rootInfo.functions.length; ++i) { + for (let i = 0; i < rootInfo.functions.length; ++i) { tsContent += genFunction(rootInfo.functions[i], 0, true); } diff --git a/src/cli/h2dtscpp/src/src/tools/NapiLog.js b/src/cli/h2dtscpp/src/src/tools/NapiLog.js index d4a5cb84..dfe93b71 100644 --- a/src/cli/h2dtscpp/src/src/tools/NapiLog.js +++ b/src/cli/h2dtscpp/src/src/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/h2dtscpp/src/src/tools/common.js b/src/cli/h2dtscpp/src/src/tools/common.js index daa18ce2..dc6a47eb 100644 --- a/src/cli/h2dtscpp/src/src/tools/common.js +++ b/src/cli/h2dtscpp/src/src/tools/common.js @@ -25,7 +25,7 @@ InterfaceList.getValue = function (name) { let ifs = InterfaceList.interfacess_; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { @@ -59,7 +59,7 @@ TypeList.getValue = function (name) { let ifs = TypeList.types; for (let i in ifs) { if (ifs[i].name === name) { - var hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); + let hasProperty = Object.prototype.hasOwnProperty.call(ifs[i].body, 'allProperties'); if (hasProperty) { return ifs[i].body.allProperties.values; } else { diff --git a/src/cli/h2dtscpp/src/src/tsGen/tsMain.js b/src/cli/h2dtscpp/src/src/tsGen/tsMain.js index 5050b81b..d02bc7ee 100644 --- a/src/cli/h2dtscpp/src/src/tsGen/tsMain.js +++ b/src/cli/h2dtscpp/src/src/tsGen/tsMain.js @@ -62,7 +62,7 @@ function createNameSpaceInfo(parseNameSpaceInfo) { function analyzeNameSpace(rootInfo, parseResult) { let parseNameSpaces = parseResult.namespaces; - for (var i = 0; i < parseNameSpaces.length; ++i) { + for (let i = 0; i < parseNameSpaces.length; ++i) { let nameSpaceInfo = createNameSpaceInfo(parseNameSpaces[i]); rootInfo.namespaces.push(nameSpaceInfo); } @@ -190,7 +190,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } let parseParams = parseFuncInfo.parameters; - for (var i = 0; i < parseParams.length; ++i) { + for (let i = 0; i < parseParams.length; ++i) { let param = createParam(parseParams[i]); funcInfo.params.push(param); } @@ -206,7 +206,7 @@ function createFuncInfo(parseFuncInfo, isClassFunc) { } function putFuncIntoNamespace(funcInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === funcInfo.namespace) { namespaces[i].functions.push(funcInfo); return; @@ -226,7 +226,7 @@ function analyzeRootTypeDef(rootInfo, parseResult) { function analyzeRootFunction(rootInfo, parseResult) { let parseFunctions = parseResult.functions; - for (var i = 0; i < parseFunctions.length; ++i) { + for (let i = 0; i < parseFunctions.length; ++i) { // 普通方法生成模板 let funcInfo = createFuncInfo(parseFunctions[i], false); if (parseFunctions[i].namespace !== '') { @@ -241,7 +241,7 @@ function analyzeRootFunction(rootInfo, parseResult) { function createProperties(parseProperties) { let propertyList = []; - for (var i = 0; i < parseProperties.length; ++i) { + for (let i = 0; i < parseProperties.length; ++i) { let property = {}; property.name = parseProperties[i].name; property.type = getJsTypeFromC(parseProperties[i].type, parseProperties[i]); @@ -252,7 +252,7 @@ function createProperties(parseProperties) { function createClassFunctions(parseFuncs) { let funcList = []; - for (var i = 0; i < parseFuncs.length; ++i) { + for (let i = 0; i < parseFuncs.length; ++i) { let funcInfo = createFuncInfo(parseFuncs[i], true); funcList.push(funcInfo); } @@ -276,7 +276,7 @@ function createClassInfo(parseClassInfo) { } function putClassIntoNamespace(classInfo, namespaces) { - for (var i = 0; i < namespaces.length; ++i) { + for (let i = 0; i < namespaces.length; ++i) { if (namespaces[i].name === classInfo.namespace) { namespaces[i].classes.push(classInfo); return; @@ -287,7 +287,7 @@ function putClassIntoNamespace(classInfo, namespaces) { function analyzeClasses(rootInfo, parseResult) { let parseClasses = parseResult.classes; - for (var className in parseClasses) { + for (let className in parseClasses) { let classInfo = createClassInfo(parseClasses[className]); if (classInfo.namespace !== '') { // class in namespace @@ -301,7 +301,7 @@ function analyzeClasses(rootInfo, parseResult) { function getTab(tabLv) { let tab = ''; - for (var i = 0; i < tabLv; ++i) { + for (let i = 0; i < tabLv; ++i) { tab += ' '; } return tab; @@ -311,7 +311,7 @@ function genFunction(func, tabLv, dtsDeclare) { let tab = getTab(tabLv); let funcPrefix = func.isClassFunc ? '' : 'export const '; let funcParams = ''; - for (var i = 0; i < func.params.length; ++i) { + for (let i = 0; i < func.params.length; ++i) { funcParams += i > 0 ? ', ' : ''; funcParams += func.params[i].name + ': ' + func.params[i].type; } @@ -352,7 +352,7 @@ function genClass(classInfo, tabLv, dtsDeclare, needDeclare = false) { let tsClass = tab + 'export ' + 'interface ' + classInfo.name + ' {\n'; let tab1 = getTab(tabLv + 1); let interfaceBody = []; - for (var i = 0; i < classInfo.properties.length; ++i) { + for (let i = 0; i < classInfo.properties.length; ++i) { let myType = classInfo.properties[i].type; if (!isJsBasicType(myType)) { myType += ' | null'; @@ -387,10 +387,10 @@ function genClass(classInfo, tabLv, dtsDeclare, needDeclare = false) { function genNamespace(namespace, tabLv, dtsDeclare) { let tab = getTab(tabLv); let tsNamespace = tab + util.format('declare namespace %s {\n', namespace.name); - for (var i = 0; i < namespace.functions.length; ++i) { + for (let i = 0; i < namespace.functions.length; ++i) { tsNamespace += genFunction(namespace.functions[i], tabLv + 1, dtsDeclare)[0]; } - for (var i = 0; i < namespace.classes.length; ++i) { + for (let i = 0; i < namespace.classes.length; ++i) { tsNamespace += genClass(namespace.classes[i], tabLv + 1, dtsDeclare); } tsNamespace += tab + '}\n'; @@ -433,15 +433,15 @@ function genTsContent(rootInfo, dtsDeclare) { // gen typedefs tsContent += genType(rootInfo.typedefs, 0); - for (var i = 0; i < rootInfo.classes.length; ++i) { + for (let i = 0; i < rootInfo.classes.length; ++i) { tsContent += genClass(rootInfo.classes[i], 0, dtsDeclare, true); } - for (var i = 0; i < rootInfo.namespaces.length; ++i) { + for (let i = 0; i < rootInfo.namespaces.length; ++i) { tsContent += genNamespace(rootInfo.namespaces[i], 0, dtsDeclare); } - for (var i = 0; i < rootInfo.functions.length; ++i) { + for (let i = 0; i < rootInfo.functions.length; ++i) { tsContent += genFunction(rootInfo.functions[i], 0, dtsDeclare)[0]; } diff --git a/src/cli/h2sa/src/src/gen/analyze.js b/src/cli/h2sa/src/src/gen/analyze.js index 514ab2bf..62318324 100644 --- a/src/cli/h2sa/src/src/gen/analyze.js +++ b/src/cli/h2sa/src/src/gen/analyze.js @@ -70,7 +70,7 @@ function createFuncInfo(parseFuncInfo) { funcInfo.name = parseFuncInfo.name; let parseParams = parseFuncInfo.parameters; - for (var i = 0; i < parseParams.length; ++i) { + for (let i = 0; i < parseParams.length; ++i) { let param = createParam(parseParams[i]); funcInfo.params.push(param); } @@ -82,7 +82,7 @@ function createFuncInfo(parseFuncInfo) { function createClassFunctions(parseFuncs) { let funcList = []; - for (var i = 0; i < parseFuncs.length; ++i) { + for (let i = 0; i < parseFuncs.length; ++i) { if (!(parseFuncs[i].constructor || parseFuncs[i].destructor)) { // 构造和析构方法不需要生成remote接口代码 let funcInfo = createFuncInfo(parseFuncs[i]); funcList.push(funcInfo); @@ -115,7 +115,7 @@ function analyzeClasses(rootInfo, parseClasses) { let firstClassName = null; // JSON集合中第一个class名称 let serviceClassName = null;// JSON集合中带“@ServiceClass”注解的class名称 let i = 0; - for (var className in parseClasses) { + for (let className in parseClasses) { if (++i === 1) { firstClassName = className; } diff --git a/src/cli/h2sa/src/src/gen/generate.js b/src/cli/h2sa/src/src/gen/generate.js index 43ecb20c..14021bd8 100644 --- a/src/cli/h2sa/src/src/gen/generate.js +++ b/src/cli/h2sa/src/src/gen/generate.js @@ -85,7 +85,7 @@ function getClientFuncParamStr(params) { function genClientMsgFunc(funcList) { let initParavalue = ''; let initParamessage = ''; - for (var n = 0; n < funcList.params.length; ++n) { + for (let n = 0; n < funcList.params.length; ++n) { if (numericTypes.includes(funcList.params[n].type)) { // 数值类型初始化为0 initParavalue = '1'; @@ -568,7 +568,7 @@ function genServiceFunc(funcInfo, className, paramStr) { initRetvalue = 'nullptr'; // 假设是指针类型或其他复杂类型 } - for (var n = 0; n < funcInfo.params.length; ++n) { + for (let n = 0; n < funcInfo.params.length; ++n) { if (numericTypes.includes(funcInfo.params[n].type)) { // 数值添加 paramsName += (n === 0) ? '' : '+ '; @@ -717,7 +717,7 @@ function genFunctionCode(classInfo) { genResult.clientFuncLogMessage = ''; //client.cpp 中的打印信息 let enumTab = getTab(2); let funcTab = getTab(1); - for (var i = 0; i < funcList.length; ++i) { + for (let i = 0; i < funcList.length; ++i) { funcList[i].funcEnum = funcList[i].name.toUpperCase(); // remote方法的枚举值 genResult.funcEnumStr += (i === 0) ? '' : ',\n' + enumTab; genResult.funcEnumStr += funcList[i].funcEnum; diff --git a/src/cli/h2sa/src/src/gen/main.js b/src/cli/h2sa/src/src/gen/main.js index 4f2cac82..c5fa9168 100644 --- a/src/cli/h2sa/src/src/gen/main.js +++ b/src/cli/h2sa/src/src/gen/main.js @@ -34,7 +34,7 @@ let ops = stdio.getopt({ NapiLog.init(ops.loglevel, path.join('' + ops.out, 'napi_gen.log')); let fileNames = ops.filename; -var pathDir = ops.directory; +let pathDir = ops.directory; if ((fileNames === null || fileNames === undefined) && (pathDir === null || pathDir === undefined)) { NapiLog.logInfo('fileNames and pathDir both cannot be empty at the same time'); } else if (pathDir && pathDir !== '') { diff --git a/src/cli/h2sa/src/src/tools/FileRW.js b/src/cli/h2sa/src/src/tools/FileRW.js index df7b44b7..4e7b0616 100644 --- a/src/cli/h2sa/src/src/tools/FileRW.js +++ b/src/cli/h2sa/src/src/tools/FileRW.js @@ -15,8 +15,12 @@ const fs = require('fs'); function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out; + let i; + let len; + let c; + let char2; + let char3; out = ''; len = array.length; diff --git a/src/cli/h2sa/src/src/tools/NapiLog.js b/src/cli/h2sa/src/src/tools/NapiLog.js index 947eb213..689b11ae 100644 --- a/src/cli/h2sa/src/src/tools/NapiLog.js +++ b/src/cli/h2sa/src/src/tools/NapiLog.js @@ -32,9 +32,9 @@ NapiLog.LEV_DEBUG = 2; NapiLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = NapiLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = NapiLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/cli/h2sa/src/src/tools/tool.js b/src/cli/h2sa/src/src/tools/tool.js index 87d1d234..3617508f 100644 --- a/src/cli/h2sa/src/src/tools/tool.js +++ b/src/cli/h2sa/src/src/tools/tool.js @@ -28,7 +28,7 @@ function print(...args) { } String.prototype.format = function (...args) { - var result = this; + let result = this; let reg = new RegExp('%[sd]{1}'); for (let i = 0; i < args.length; i++) { let p = result.search(reg); @@ -57,7 +57,7 @@ function replaceAll(s, sfrom, sto) { function getTab(tabLv) { let tab = ''; - for (var i = 0; i < tabLv; ++i) { + for (let i = 0; i < tabLv; ++i) { tab += ' '; } return tab; diff --git a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js index a2d236bc..ed1078b9 100644 --- a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js +++ b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginLog.js @@ -24,9 +24,9 @@ VsPluginLog.LEV_DEBUG = 2; VsPluginLog.LEV_INFO = 3; const LEV_STR = ['[NON]', '[ERR]', '[DBG]', '[INF]']; -var logLevel = VsPluginLog.LEV_ERROR; -var logFileName = null; -var logResultMessage = [true, '']; +let logLevel = VsPluginLog.LEV_ERROR; +let logFileName = null; +let logResultMessage = [true, '']; function getDateString() { let nowDate = new Date(); diff --git a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js index e19bc6fe..ffe71cff 100644 --- a/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js +++ b/src/tool/api/api_scan_vs_plugin/src/gen/tools/VsPluginTool.js @@ -65,8 +65,12 @@ function checkFileError(ifname) { } function utf8ArrayToStr(array) { - var out, i, len, c; - var char2, char3; + let out; + let i; + let len; + let c; + let char2; + let char3; out = ''; len = array.length; diff --git a/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html b/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html index 04561120..dd18bb70 100644 --- a/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html +++ b/src/tool/api/api_scan_vs_plugin/src/vs_plugin_view.html @@ -108,13 +108,13 @@ }