From 7c94a10d78f6e4231ddac998d23baffc2e379e55 Mon Sep 17 00:00:00 2001
From: mahaoyuan <mahaoyuan@kaihong.com>
Date: Fri, 5 Aug 2022 11:18:31 +0800
Subject: [PATCH 1/5] fix: adjust the ui

Signed-off-by: mahaoyuan <mahaoyuan@kaihong.com>
---
 napi_vs_plugin/src/extension.js        |  77 +++++++++++++++++++++----
 napi_vs_plugin/src/images/file.png     | Bin 0 -> 311 bytes
 napi_vs_plugin/src/images/path.png     | Bin 0 -> 608 bytes
 napi_vs_plugin/src/vs_plugin_view.html |  71 +++++++++++++++++------
 4 files changed, 119 insertions(+), 29 deletions(-)
 create mode 100644 napi_vs_plugin/src/images/file.png
 create mode 100644 napi_vs_plugin/src/images/path.png

diff --git a/napi_vs_plugin/src/extension.js b/napi_vs_plugin/src/extension.js
index 55db25b6..fde05327 100644
--- a/napi_vs_plugin/src/extension.js
+++ b/napi_vs_plugin/src/extension.js
@@ -20,6 +20,7 @@ const fs = require('fs');
 const re = require("./gen/tools/VsPluginRe");
 const { VsPluginLog } = require("./gen/tools/VsPluginLog");
 const { detectPlatform, readFile } = require('./gen/tools/VsPluginTool');
+const path = require('path');
 var exeFilePath = null;
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
@@ -59,7 +60,7 @@ function executor(name, genDir, mode) {
 
 function genCommand(name, genDir, mode) {
 	var genFileMode = mode == 0 ? " -f " : " -d ";
-	if (genDir == "") {
+	if (genDir == ""){
 		return exeFilePath + genFileMode + name;
 	}
 	return exeFilePath + genFileMode + name + " -o " + genDir;
@@ -79,30 +80,73 @@ function register(context, command) {
 		const panel = vscode.window.createWebviewPanel(
 			'generate', // Identifies the type of WebView
 			'Generate Napi Frame', // Title of the panel displayed to the user
-			vscode.ViewColumn.One, // Display the WebView panel in the form of new columns in the editor
+			vscode.ViewColumn.Two, // Display the WebView panel in the form of new columns in the editor
 			{
 				enableScripts: true, // Enable or disable JS, default is Enable
 				retainContextWhenHidden: true, // Keep the WebView state when it is hidden to avoid being reset
 			}
 		);
-		panel.webview.html = getWebviewContent();
+		panel.webview.html = getWebviewContent(context);
 		panel.webview.onDidReceiveMessage(message => {
-			if (message == "cancel") {
+			let msg = message.msg;
+			if (msg == "cancel") {
 				panel.dispose();
-			} else {
+			} else if(msg == "param") {
 				let mode = message.mode;
 				let name = message.fileNames;
 				let genDir = message.genDir;
 				checkMode(name, genDir, mode);
+			} else {
+				selectPath(panel, message);
 			}
 		}, undefined, context.subscriptions);
 		let fn = re.getFileInPath(uri.fsPath);
 		let tt = re.match("@ohos.[a-zA-Z_0-9]+.d.ts", fn);
-		panel.webview.postMessage(tt ? uri.fsPath : "");
+		var result = {
+			msg: "selectInterPath",
+			path: tt ? uri.fsPath : ""
+			}
+	    panel.webview.postMessage(result);
 	});
 	return disposable;
 }
 
+/**
+* 选择本地目录/文件夹
+*/
+ function selectPath(panel, message) {
+	let mode = 1;
+	if (message.mode != undefined) {
+		mode = message.mode;
+	}
+	const options = {
+		canSelectMany: mode == 0 ? true : false,//是否可以选择多个
+		openLabel: mode == 0 ? '选择文件' : '选择文件夹',//打开选择的右下角按钮label
+		canSelectFiles: mode == 0 ? true : false,//是否选择文件
+		canSelectFolders: mode == 0 ? false : true,//是否选择文件夹
+		defaultUri:vscode.Uri.file(''),//默认打开本地路径
+		filters: { 
+			'Text files': ['d.ts']
+		}
+	};
+   
+	return vscode.window.showOpenDialog(options).then(fileUri => {
+	   if (fileUri && fileUri[0]) {
+		   console.log('Selected file: ' + fileUri[0].fsPath);
+		   let filePath = "";
+		   for (let index = 0; index < fileUri.length; index++) {
+				filePath += fileUri[index].fsPath.concat(",");
+		   }
+		   var result = {
+				msg: message.msg,
+				path: filePath.length > 0 ? filePath.substring(0, filePath.length - 1) : filePath
+				}
+		   panel.webview.postMessage(result);
+		   return fileUri[0].fsPath
+	   }
+   });
+}
+
 function checkMode(name, genDir, mode) {
 	name = re.replaceAll(name, " ", "");
 	if ("" == name) {
@@ -110,13 +154,13 @@ function checkMode(name, genDir, mode) {
 		return;
 	}
 	if (mode == 0) {
-		if (name.indexOf(".") < 0) {
+		if (name.indexOf(".") < 0 || !fs.lstatSync(name).isFile()) {
 			vscode.window.showErrorMessage("Please enter the correct file path!");
 			return;
 		}
 	} else {
-		if (name.indexOf(".") > 0) {
-			vscode.window.showErrorMessage("Please enter the correct folder path!");
+		if (name.indexOf(".") > 0 || !fs.lstatSync(name).isDirectory()) {
+			vscode.window.showErrorMessage("Please enter the correct folder folder!");
 			return;
 		}
 	}
@@ -130,11 +174,24 @@ function checkMode(name, genDir, mode) {
 // this method is called when your extension is deactivated
 function deactivate() { }
 
-function getWebviewContent() {
+function getWebviewContent(context) {
 	let data = readFile(__dirname + '/vs_plugin_view.html');
+	data = getWebViewContent(context, '/vs_plugin_view.html');
 	return data.toString();
 }
 
+function getWebViewContent(context, templatePath) {
+    const resourcePath = path.join(context.extensionPath, templatePath);
+    const dirPath = path.dirname(resourcePath);
+    let html = fs.readFileSync(resourcePath, 'utf-8');
+    html = html.replace(/(<link.+?href="|<script.+?src="|<iframe.+?src="|<img.+?src=")(.+?)"/g, (m, $1, $2) => {
+        if($2.indexOf("https://")<0)return $1 + vscode.Uri.file(path.resolve(dirPath, $2))
+		.with({ scheme: 'vscode-resource' }).toString() + '"';
+        else return $1 + $2+'"';
+    });
+    return html;
+}
+
 module.exports = {
 	activate,
 	deactivate
diff --git a/napi_vs_plugin/src/images/file.png b/napi_vs_plugin/src/images/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c365a02e99414acb29c643fc2d64d150cff9f0
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#@kvBMR9Hvtmr)ABFc3uFqQ?;Y67(=Ccni_v=tTt2q9BNR4_!$~rCQr&n}Q(8
zZ+CXyPSVf{KVI@<e-gke0aZN)ZpQ`K0(%j81ZpbFiU22Lvoo-X1^EUrsR8K$b6^P!
ze4R@{jqr%b*l9`tA~I@frmB5l@d45#dwZVyv;xRGsjAbvR4nU|P3{Mc0<gFiptG|U
z1)!>K>M5`WhHXGv0eIsXuxe|Z!&U+qrn&n2U?(E?P@SsQZ$Ut#n}7dJ#+{yl0LaRc
z#sos{fdr5eNC~6_QUd>-K+JR&Z5Q7I7Qa$$2_ULlggE^hJ^@2>!y!F<Rfzxq002ov
JPDHLkV1mB>dR_nk

literal 0
HcmV?d00001

diff --git a/napi_vs_plugin/src/images/path.png b/napi_vs_plugin/src/images/path.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f408a584f243956fab1916d9152f34364cdf78
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%8c9S!R9HvtmphD2Q51&1Kk=%(;t>^%3bkjn6iB8Kl|)BWBGI5iBN-~9lc<<x
z5+tG|<Jr!rG&7ZWgiv`DzpTkVvYk1{Y-jGtZRV8s?!EtSul28W))7N~G-Q1i0se}B
z?Tx@WU?;E~cmZ6KG~HLK{s1KL2f&(|*caevUl2LKC~yRL3S3AKmx2B1x08~74LTAz
zz;j@I2ugYvLbf+0@h-Xn`!?;rA?bV5AvwS^V8Z|ba=q}-@#<pvA34Bv;805no&cx*
zCk3{{#5+<tw*eE9PSm5214OvPgsW<cJ|`2-bjgG5)xaZQ9WWwksxbmt&Z{z90=xu9
zC3O<7glu1lO8^%o-E9Tva>J56Lj|zC5_nvcf|A>muCcug*q%%nX8gAa^Mh@#08XbS
zv=vxdD%`Se{xZxA6V-4B*s?&;su4vA-<-D*WdOH<eZV9Tt$0e(&jrG?Zm+)$BWL5l
zC*XjjZ+!_@=hgv^0hfR=N$2|(kMr9A?n$cNh@ClXZwAf+yMZ6TE8wc6_iYi#Q*cny
z*RJZe!^C4P^Tpu`V$MuxyE5UMWWq^FL0|mXj<UU#%@Xzb;=ZJa%-o?g%>aWa!wR@*
zzW69<Pa{BjDGjm_H358(w6_(YIMyu-3sUe<(wW`>QWT>C!h~yUoMG%R;q2Jg>xW5J
uhP!}h&974#&WiUAP?E}CBd`ci5`o_-qRb&!3c5Z30000<MNUMnLSTZd=nzx@

literal 0
HcmV?d00001

diff --git a/napi_vs_plugin/src/vs_plugin_view.html b/napi_vs_plugin/src/vs_plugin_view.html
index 437ce254..8570f35e 100644
--- a/napi_vs_plugin/src/vs_plugin_view.html
+++ b/napi_vs_plugin/src/vs_plugin_view.html
@@ -10,7 +10,7 @@
 <body>
 	<style type="text/css">
 		body {
-			background-color: #F5F5F5;
+			background-color: #000000;
 			margin:0 auto;
 			position:absolute;
 			left:35%;
@@ -22,11 +22,11 @@
 			text-decoration: none;
 		}
 
-		button {
+		button.button {
 			background-color: #ffffff;
             font-family: Consolas, sans-serif;
             font-size: 16px;
-            border-radius: 20px;
+            border-radius: 3px;
             border-color: #C4C4C4;
             align-self: center;
             border: 1px solid #C4C4C4;
@@ -35,7 +35,7 @@
 			height:24px
 		}
 
-		button:hover {
+		button.button:hover {
 			background: #4B97D9;
 			color: #fff;
 			border: 0px;
@@ -61,9 +61,9 @@
 
 		div {
 			font-size: 16px;
-			color: black;
-			font-weight: bold;
-			width: 800px;
+			color: #ffffff;
+			/* font-weight: bold; */
+			width: 400px;
 			height: 50px;
 			text-align: left;
 		}
@@ -82,10 +82,11 @@
 			});
 		}
 
-		function sendMsg() {
+		function sendParamMsg() {
 			var fileNames = document.getElementById("interfaceFile").value;
 			var genDir = document.getElementById("genFile").value;
 			var result = {
+				msg: "param",
 				mode: mode,
 				fileNames: fileNames,
 				genDir: genDir,
@@ -93,14 +94,42 @@
 			vscode.postMessage(result);
 		}
 
+		function selectInterPath() {
+			var result = {
+				msg: "selectInterPath",
+				mode: mode
+			}
+			vscode.postMessage(result);
+		}
+
+		function selectPath(message) {
+			var result = {
+				msg: message
+			}
+			vscode.postMessage(result);
+		}
+
 		function cancel() {
-			vscode.postMessage("cancel");
+			var result = {
+				msg: "cancel"
+			}
+			vscode.postMessage(result);
 		}
 
 		window.addEventListener('message', event => {
-			const message = event.data;
-			document.getElementById("interfaceFile").value = message;
-			fillInputDir(message);
+			const message = event.data.msg;
+			const path = event.data.path;
+			if(message == "selectInterPath") {
+				document.getElementById("interfaceFile").value = path;
+				fillInputDir(path);
+			} else if(message == "selectGenPath") {
+				document.getElementById("genFile").value = path;
+			} else if(message == "selectBuildPath") {
+				document.getElementById("buildFile").value = path;
+			}
+			else {
+				console.log("param is error");
+			}
 		})
 
 		function inputChange() {
@@ -124,6 +153,7 @@
 			document.getElementById("genFile").value = dir;
 			document.getElementById("buildFile").value = dir;
 		}
+
 	</script>
 	<div id="selectMode">
 		选择生成方式：
@@ -136,23 +166,26 @@
 	</br>
 	<div id="interface" style="margin-top: 10px;">
 		选择接口文件：
-		<input class="text" style="width: 200px; height: 18px;" type="text" id="interfaceFile" onchange="inputChange()" onporpertychange="inputChange() ">
+		<input class="text" style="width: 250px; height: 18px;" type="text" id="interfaceFile" onchange="inputChange()" onporpertychange="inputChange() ">
+		<img src="./images/file.png" width="16px" height="16px" onclick="selectInterPath()">
 	</div>
 
 	<div style="margin-top: 10px;">
 		生成框架路径：
-		<input class="text" style="width: 200px; height: 18px;" accept="text" id="genFile">
+		<input class="text" style="width: 250px; height: 18px;" accept="text" id="genFile">
+		<img src="./images/path.png" width="16px" height="16px" onclick="selectPath('selectGenPath')">
 	</div>
 	<div style="margin-top: 10px;">
 		编译脚本路径：
-		<input class="text" style="width: 200px; height: 18px;" type="text" id="buildFile">
+		<input class="text" style="width: 250px; height: 18px;" type="text" id="buildFile">
+		<img src="./images/path.png" width="16px" height="16px" onclick="selectPath('selectBuildPath')">
 	</div>
-	<div style="margin-top: 10px;">
+	<div style="margin-top: 10px; text-align: right;">
+		<button type="button" class="button" onclick="cancel()" style="background-color: #333333; border: 1px solid #333333; color: #fff;">Cancel</button>
+		<button type="button" class="button" onclick="sendParamMsg()" style="background-color: #4B97D9; border: 1px solid #4B97D9; color: #fff;">Ok</button>
 		<a href="https://gitee.com/openharmony/napi_generator" target="_blank">
-			<button type="button">Help</button>
+			<button type="button" style="background-color: #333333; width: 20px; height: 20px; border-radius: 50%;border: none; color: #fff;">?</button>
 		</a>
-		<button type="button" onclick="cancel()">Cancel</button>
-		<button type="button" onclick="sendMsg()">Ok</button>
 	</div>
 </body>
 
-- 
Gitee


From e3cceacbfe4461cb1b3234b28536390c783fd815 Mon Sep 17 00:00:00 2001
From: shenjie <shenjie@kaihong.com>
Date: Thu, 11 Aug 2022 16:05:36 +0800
Subject: [PATCH 2/5] Modify ENSEMBLE and INTEGRATION_TESTING

Signed-off-by: shenjie <shenjie@kaihong.com>
---
 docs/ENSEMBLE_METHOD_ZH.md     | 271 +++++++++++++++++++++++++++------
 docs/INTEGRATION_TESTING_ZH.md |  67 ++++++--
 2 files changed, 285 insertions(+), 53 deletions(-)

diff --git a/docs/ENSEMBLE_METHOD_ZH.md b/docs/ENSEMBLE_METHOD_ZH.md
index 48cb3833..5d992d5d 100755
--- a/docs/ENSEMBLE_METHOD_ZH.md
+++ b/docs/ENSEMBLE_METHOD_ZH.md
@@ -3,11 +3,12 @@
 ## 场景说明
 
 为了实现工具生成的接口被其他子系统或者应用调用，需将生成的代码编译集成到OpenHarmony系统中，使其生成动态库，供OpenHarmony应用层调用。
-本文介绍如何将工具生成的源码利用OpenHarmony编译系统生成动态库供应用层调用。
+本文介绍如何将工具生成的源码利用OpenHarmony编译系统生成动态库供应用层调用，主要是有以下两种方式，分别为增加ohos.build文件方式和增加bundle.json文件方式。
 
-## 建立模块位置
+## ohos.build方式集成
+### 建立模块位置
 
-模块目录理论上可以建立在OpenHarmony代码库的任何地方，为行方便，假设OpenHarmony代码库的目录为`OHOS_SRC`，在`OHOS_SRC`目录下，例如建立此次测试模块目录：napitest。此时，`OHOS_SRC`目录下应该有 ark, foundation, device, …, napitest等目录，其中napitest就是刚刚建立的，在napitest目录下，把之前用可执行文件或者插件转换出来的文件全部拷贝到该目录下，并且在该目录下新建一个文件ohos.build。例如napitest目录下有以下文件：
+模块目录理论上可以建立在OpenHarmony代码库的任何地方，假设OpenHarmony代码库的目录为`OHOS_SRC`，在`OHOS_SRC/foundation`目录下，例如建立此次测试模块目录：napitest。此时，`OHOS_SRC/foundation`目录下应该有aafwk,ace,ai, …, napitest等目录，其中napitest就是刚刚建立的，在napitest目录下，把之前用可执行文件或者插件转换出来的文件全部拷贝到该目录下，并且在该目录下新建一个文件ohos.build。例如napitest目录下有以下文件：
 
     foundation/napitest
     |-- binding.gyp
@@ -20,50 +21,47 @@
     |-- x_napi_tool.cpp
     |-- x_napi_tool.h
 
-## 编译修改点
+### 编译修改点
 
-### 修改build.gn文件
+#### 修改build.gn文件
 
 ```
-import("//build/ohos.gni")
+	import("//build/ohos.gni")
 
-ohos_shared_library("napitest")
-{
-    # 指定编译源文件
-    sources = [
-        "napitest_middle.cpp",
-        "napitest.cpp",
-        "x_napi_tool.cpp",
-    ]
-    include_dirs = [
-        ".",
-        "//third_party/node/src",
-    ]
-    # 指定编译依赖，如果依赖第三方库，需要在此添加
-    deps=[
-        "//foundation/ace/napi:ace_napi",
-        "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    ]
-    public_deps = [
-        "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
-    ]
-    remove_configs = [ "//build/config/compiler:no_rtti" ]
-    cflags=[
-    ]
-    cflags_cc=[
-        "-frtti",
-    ]
-    ldflags = [
-    ]
-    # 指定库生成的路径
-    relative_install_dir = "module"
-    # 主要是修改下面两条内容，子系统及其组件，后面会引用
-    part_name = "napitest_interface"
-    subsystem_name = "napitest"
-}
+	ohos_shared_library("napitest")
+	{
+    	# 指定编译源文件
+    	sources = [
+        	"napitest_middle.cpp",
+        	"napitest.cpp",
+        	"x_napi_tool.cpp",
+    	]
+    	include_dirs = [
+        	".",
+        	"//third_party/node/src",
+    	]
+    	# 指定编译依赖，如果依赖第三方库，需要在此添加
+    	deps=[
+        	"//foundation/ace/napi:ace_napi",
+        	"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
+    	]
+    	remove_configs = [ "//build/config/compiler:no_rtti" ]
+    	cflags=[
+    	]
+    	cflags_cc=[
+        	"-frtti",
+    	]
+    	ldflags = [
+    	]
+    	# 指定库生成的路径
+    	relative_install_dir = "module"
+    	# 主要是修改下面两条内容，子系统及其组件，后面会引用
+    	part_name = "napitest_interface"
+    	subsystem_name = "napitest"
+	}
 ```
 
-### 修改ohos.build文件
+#### 修改ohos.build文件
 其中module_list选项中的"//foundation/napitest"指的是napitest目录，":napitest"指的是上面BUILD.gn中的目标ohos_shared_library("napitest")。
 
 ```
@@ -80,7 +78,186 @@ ohos_shared_library("napitest")
 }
 ```
 
-### 增加子系统
+#### 修改napitest.cpp文件
+
+为方便调试，在napitest.cpp文件或napitest_middle.cpp文件中加入打印日志语句。以修改napitest.cpp文件为例，增加以下代码：
+
+
+```
+	#include "napitest.h"
+	#include <hilog/log.h>
+	using namespace OHOS;
+	namespace {
+	constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, 0, "NAPITESTNAPILayer" };
+	#define NAPITEST_LOG(fmt, ...) HiviewDFX::HiLog::Info(LABEL, \
+    	"%{public}s:%{public}d " fmt, __func__, __LINE__, ##__VA_ARGS__)
+	}
+	namespace napitest {
+		bool fun1(std::string &v, std::string &out)
+		{
+    		NAPITEST_LOG("napitest fun1 begin!!!!!!!!!!!!!!");
+    		return true;
+		}
+	}
+```
+#### 增加子系统
+
+在源码/build/subsystem_config.json中增加子系统选项。如下所示：
+
+```
+"napitest": {
+    "project": "hmf/napitest",
+    "path": "foundation/napitest",
+    "name": "napitest",
+    "dir": "foundation"
+  }
+```
+
+### 添加功能模块
+在产品配置中添加上述子系统的功能模块，编译到产品产出文件中，例如在源码/productdefine/common/products/rk3566.json中增加part选项，其中napitest就是上面填的subsystem_name，napitest_interface就是上面填的part_name。
+
+    "napitest:napitest_interface":{}
+
+### 编译验证
+
+编译成功后，就会生成libnapitest.z.so，目录如下所示：
+
+    /out/ohos-arm-release/packages/phone/system/lib/module
+
+## bundle.json方式集成
+### 建立模块位置
+
+模块目录理论上可以建立在OpenHarmony代码库的任何地方，假设OpenHarmony代码库的目录为`OHOS_SRC`，在`OHOS_SRC/foundation`目录下，例如建立此次测试模块目录：napitest。此时，`OHOS_SRC/foundation`目录下应该有aafwk,ace,ai, …, napitest等目录，其中napitest就是刚刚建立的，在napitest目录下，把之前用可执行文件或者插件转换出来的文件全部拷贝到该目录下，并且在该目录下新建一个文件bundle.json。例如napitest目录下有以下文件：
+
+    foundation/napitest
+    |-- binding.gyp
+    |-- BUILD.gn
+    |-- bundle.json
+    |-- napitest.cpp
+    |-- napitest.h
+    |-- napitest_middle.cpp
+    |-- test.sh
+    |-- x_napi_tool.cpp
+    |-- x_napi_tool.h
+
+### 编译修改点
+
+#### 修改build.gn文件
+
+```
+
+	import("//build/ohos.gni")
+
+	ohos_shared_library("napitest")
+	{
+    	# 指定编译源文件
+    	sources = [
+        	"napitest_middle.cpp",
+        	"napitest.cpp",
+        	"x_napi_tool.cpp",
+    	]
+    	include_dirs = [
+        	".",
+        	"//third_party/node/src",
+    	]
+    	# 指定编译依赖，如果依赖第三方库，需要在此添加
+    	deps=[
+        	"//foundation/ace/napi:ace_napi",
+        	"//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog",
+    	]
+    	remove_configs = [ "//build/config/compiler:no_rtti" ]
+    	cflags=[
+    	]
+    	cflags_cc=[
+        	"-frtti",
+    	]
+    	ldflags = [
+    	]
+    	# 指定库生成的路径
+    	relative_install_dir = "module"
+    	# 主要是修改下面两条内容，子系统及其组件，后面会引用
+    	part_name = "napitest_interface"
+    	subsystem_name = "napitest"
+	}
+```
+
+#### 修改bundle.json文件
+其中destPath选项中的"//foundation/napitest"指的是napitest目录，":napitest"指的是上面BUILD.gn中的目标ohos_shared_library("napitest")。
+
+```
+{
+  "name": "@ohos/napitest",
+  "description": "napitest provides atomic capabilities",
+  "version": "3.1",
+  "license": "Apache License 2.0",
+  "publishAs": "code-segment",
+  "segment": {
+    "destPath": "foundation/napitest"
+  },
+  "dirs": {},
+  "scripts": {},
+  "component": {
+    "name": "napitest_interface",
+    "subsystem": "napitest",
+    "features": [],
+    "adapted_system_type": [
+      "standard"
+    ],
+    "rom": "10000KB",
+    "ram": "10000KB",
+    "deps": {
+      "components": [
+        "ace_napi",
+        "ipc_core",
+        "libhilog"
+      ],
+      "third_party": [
+        "node"
+      ]
+    },
+    "build": {
+      "sub_component": [
+        "//foundation/napitest:napitest"
+      ],
+      "inner_kits": [
+        {
+          "header": {
+            "header_base": "//foundation/napitest",
+            "header_files": [
+              "x_napi_tool.h",
+              "napitest.h"
+            ]
+          },
+          "name": "//foundation/napitest:napitest"
+        }
+      ]
+    }
+  }
+}
+```
+
+#### 修改napitest.cpp文件
+为方便调试，在napitest.cpp文件或napitest_middle.cpp文件中加入打印日志语句。以修改napitest.cpp文件为例，增加以下代码：
+
+
+```
+	#include "napitest.h"
+	#include <hilog/log.h>
+	using namespace OHOS;
+	namespace {
+	constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, 0, "NAPITESTNAPILayer" };
+	#define NAPITEST_LOG(fmt, ...) HiviewDFX::HiLog::Info(LABEL, \
+    	"%{public}s:%{public}d " fmt, __func__, __LINE__, ##__VA_ARGS__)
+	}
+	namespace napitest {
+		bool fun1(std::string &v, std::string &out)
+		{
+    		NAPITEST_LOG("napitest fun1 begin!!!!!!!!!!!!!!");
+    		return true;
+		}
+	}
+```
+#### 增加子系统
 
 在源码/build/subsystem_config.json中增加子系统选项。如下所示：
 
@@ -94,15 +271,21 @@ ohos_shared_library("napitest")
 ```
 
 ### 添加功能模块
-在产品配置中添加上述子系统的功能模块，编译到产品产出文件中，例如在源码/productdefine/common/products/rk3566.json中增加part选项，其中napitest就是上面填的part_name，napitest_interface就是上面填的subsystem_name。
+在产品配置中添加上述子系统的功能模块，编译到产品产出文件中，例如在源码/productdefine/common/products/rk3566.json中增加part选项，其中napitest就是上面填的subsystem_name，napitest_interface就是上面填的part_name。
 
     "napitest:napitest_interface":{}
 
-## 编译验证
+### 编译验证
 
 编译成功后，就会生成libnapitest.z.so，目录如下所示：
 
     /out/ohos-arm-release/packages/phone/system/lib/module
 
+## 总结
+
+两种集成方式使用场景说明：
+
+ohos.build方式集成：适合3.0前版本使用。
 
+bundle.json方式集成：兼容ohos.build方式，但3.1及以后版本建议使用此种方式集成。
 
diff --git a/docs/INTEGRATION_TESTING_ZH.md b/docs/INTEGRATION_TESTING_ZH.md
index 1214e090..884e6c06 100755
--- a/docs/INTEGRATION_TESTING_ZH.md
+++ b/docs/INTEGRATION_TESTING_ZH.md
@@ -1,7 +1,7 @@
 # NAPI框架生成工具集成测试
 
 ## 简介
-  本文主要介绍如何将NAPI框架生成代码集成NAPI到OpenHarmony系统，进而进行集成测试。
+  本文主要介绍如何将NAPI框架生成代码集成到OpenHarmony系统，进而进行集成测试。
 
 ## 准备
 
@@ -11,14 +11,61 @@
 
   系统镜像的具体生成方法，可以左键单击以下链接了解：
 
-  [生成代码集成到OpenHarmony的方法](https://gitee.com/openharmony/napi_generator/blob/master/docs/ENSEMBLE_METHOD_ZH.md)
+  [生成代码集成到OpenHarmony](https://gitee.com/openharmony/napi_generator/blob/master/docs/ENSEMBLE_METHOD_ZH.md)
 
   3.应用hap包：hap包及源码路径如下：
 
-```
+```	
 napi_generator/examples/app
 ```
 
+  hap包的具体生成方法，可参考OpenHarmony/docs/zh-cn/application-dev文档中使用JS语言开发（FA模型）。其中修改index.js文件内容如下：
+  
+
+```	
+
+	import router from '@ohos.router';
+	import napitest from '@ohos.napitest';
+	export default {
+    	data: {
+        	title: ""
+    	},
+    	onInit(){
+        	this.title = this.$t('strings.world');
+    	},
+    	onclick: function () {
+        	router.push({
+            	url: "pages/second/second"
+        	})
+    	},
+    	ontest: function () {
+        	console.log("napitest  begin AAAAAAAAAAAAAAAAAA")
+        	var  Entity = {
+            	ENTITY_DEFAULT : "entity.system.default",
+            	ENTITY_HOME : "entity.system.home",
+            	ENTITY_VOICE : "entity.system.voice",
+            	ENTITY_BROWSABLE : "entity.system.browsable",
+            	ENTITY_VIDEO : "entity.system.video"
+        	}
+        	napitest.Space3.fun1("ggggg",Entity.ENTITY_DEFAULT);
+        	console.log("napitest  end AAAAAAAAAAAAAAAAAA")
+    		}
+	}
+```
+  修改index.html文件内容如下：
+
+```
+
+	<!--index.hml-->
+	<div class="container">
+    	<text class="title">
+        	Hello World
+    	</text>
+	<!-- 添加按钮，值为Next，并绑定onclick方法-->
+    	<input class="btn" type="button" value="Next" onclick="onclick"></input>
+    	<input class="btn" type="button" value="napitest" onclick="ontest"></input>
+	</div>
+```
 
 ## 使用说明
 步骤一：安装镜像环境。
@@ -44,12 +91,14 @@ napi_generator/examples/app
   然后单击设备中安装的APP，进入APP后单击测试按钮，执行完成后会在hdc安装目录下出现log.txt文件。
 
 ## 查看结果
-log.txt中包含“===isScreenOn===”日志表示接口调用成功。如下所示：
-
-    03-01 19:48:19.594   916   940 I 00000/power_interface: ===isScreenOn===
-    03-01 19:48:19.594   916   925 I 00000/ProducerEglSurface: <342>AddEglData: bufferImpl is reused return.
-    03-01 19:48:19.594   916   925 I 00000/ProducerEglSurface: (Window)<217>WaitForReleaseFence: releaseFence 39.
-    03-01 19:48:19.594   916   923 I 03b00/JSApp: app Log: power_is_screen_on_promise_test screenOn is 0
+log.txt中包含“======fun1(name: string, flags: Entity): number======”日志表示接口调用成功。如下所示：
+
+    01-01 00:13:10.355  2020  2027 I 00000/NAPITESTNAPILayer: fun1_middle:93 *******fun1_middle begin**********
+	01-01 00:13:10.357  2020  2038 D 01400/OHOS::ROSEN: RSRenderThread ProcessCommands size: 2
+	01-01 00:13:10.358  2020  2038 D 01400/OHOS::ROSEN: RSRenderThread DrawFrame(790351535051) in GPU
+	01-01 00:13:10.360  2020  2027 I 00000/NAPITESTNAPILayer: fun1_middle:107 *****fun1_middle xxxxx**********
+	01-01 00:13:10.360  2020  2027 I 00000/NAPITESTNAPILayer: fun1:28 ======fun1(name: string, flags: Entity): number======
+	01-01 00:13:10.360  2020  2027 I 00000/NAPITESTNAPILayer: fun1_middle:113 *******fun1_middle   end*********
 
 ## 相关仓
 
-- 
Gitee


From 7429ff5317531601b1ae89974723306d98daab03 Mon Sep 17 00:00:00 2001
From: zhaojunxia <zhaojunxia@kaihong.com>
Date: Fri, 5 Aug 2022 10:14:32 +0800
Subject: [PATCH 3/5] feat: support array_Map

Signed-off-by: zhaojunxia <zhaojunxia@kaihong.com>
---
 napi_vs_plugin/src/extension.js               |  76 +++++++++++++++---
 napi_vs_plugin/src/images/file.png            | Bin 0 -> 311 bytes
 napi_vs_plugin/src/images/path.png            | Bin 0 -> 608 bytes
 napi_vs_plugin/src/vs_plugin_view.html        |  71 +++++++++++-----
 src/gen/generate/param_generate.js            |  70 +++++++++++-----
 src/gen/tools/common.js                       |  38 ++++++---
 test/storytest/test_array_map/@ohos.test.d.ts |  30 ++++++-
 test/storytest/test_array_map/test.js         |  37 ++++++++-
 8 files changed, 260 insertions(+), 62 deletions(-)
 create mode 100644 napi_vs_plugin/src/images/file.png
 create mode 100644 napi_vs_plugin/src/images/path.png

diff --git a/napi_vs_plugin/src/extension.js b/napi_vs_plugin/src/extension.js
index 55db25b6..b9f9df66 100644
--- a/napi_vs_plugin/src/extension.js
+++ b/napi_vs_plugin/src/extension.js
@@ -20,6 +20,7 @@ const fs = require('fs');
 const re = require("./gen/tools/VsPluginRe");
 const { VsPluginLog } = require("./gen/tools/VsPluginLog");
 const { detectPlatform, readFile } = require('./gen/tools/VsPluginTool');
+const path = require('path');
 var exeFilePath = null;
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
@@ -59,7 +60,7 @@ function executor(name, genDir, mode) {
 
 function genCommand(name, genDir, mode) {
 	var genFileMode = mode == 0 ? " -f " : " -d ";
-	if (genDir == "") {
+	if (genDir == ""){
 		return exeFilePath + genFileMode + name;
 	}
 	return exeFilePath + genFileMode + name + " -o " + genDir;
@@ -79,30 +80,73 @@ function register(context, command) {
 		const panel = vscode.window.createWebviewPanel(
 			'generate', // Identifies the type of WebView
 			'Generate Napi Frame', // Title of the panel displayed to the user
-			vscode.ViewColumn.One, // Display the WebView panel in the form of new columns in the editor
+			vscode.ViewColumn.Two, // Display the WebView panel in the form of new columns in the editor
 			{
 				enableScripts: true, // Enable or disable JS, default is Enable
 				retainContextWhenHidden: true, // Keep the WebView state when it is hidden to avoid being reset
 			}
 		);
-		panel.webview.html = getWebviewContent();
+		panel.webview.html = getWebviewContent(context);
 		panel.webview.onDidReceiveMessage(message => {
-			if (message == "cancel") {
+			let msg = message.msg;
+			if (msg == "cancel") {
 				panel.dispose();
-			} else {
+			} else if(msg == "param") {
 				let mode = message.mode;
 				let name = message.fileNames;
 				let genDir = message.genDir;
 				checkMode(name, genDir, mode);
+			} else {
+				selectPath(panel, message);
 			}
 		}, undefined, context.subscriptions);
 		let fn = re.getFileInPath(uri.fsPath);
 		let tt = re.match("@ohos.[a-zA-Z_0-9]+.d.ts", fn);
-		panel.webview.postMessage(tt ? uri.fsPath : "");
+		var result = {
+			msg: "selectInterPath",
+			path: tt ? uri.fsPath : ""
+			}
+	    panel.webview.postMessage(result);
 	});
 	return disposable;
 }
 
+/**
+* 选择本地目录/文件夹
+*/
+ function selectPath(panel, message) {
+	let mode = 1;
+	if (message.mode != undefined) {
+		mode = message.mode;
+	}
+	const options = {
+		canSelectMany: mode == 0 ? true : false,//是否可以选择多个
+		openLabel: mode == 0 ? '选择文件' : '选择文件夹',//打开选择的右下角按钮label
+		canSelectFiles: mode == 0 ? true : false,//是否选择文件
+		canSelectFolders: mode == 0 ? false : true,//是否选择文件夹
+		defaultUri:vscode.Uri.file(''),//默认打开本地路径
+		filters: { 
+			'Text files': ['d.ts']
+		}
+	};
+   
+	return vscode.window.showOpenDialog(options).then(fileUri => {
+	   if (fileUri && fileUri[0]) {
+		   console.log('Selected file: ' + fileUri[0].fsPath);
+		   let filePath = "";
+		   for (let index = 0; index < fileUri.length; index++) {
+				filePath += fileUri[index].fsPath.concat(",");
+		   }
+		   var result = {
+				msg: message.msg,
+				path: filePath.length > 0 ? filePath.substring(0, filePath.length - 1) : filePath
+				}
+		   panel.webview.postMessage(result);
+		   return fileUri[0].fsPath
+	   }
+   });
+}
+
 function checkMode(name, genDir, mode) {
 	name = re.replaceAll(name, " ", "");
 	if ("" == name) {
@@ -110,13 +154,13 @@ function checkMode(name, genDir, mode) {
 		return;
 	}
 	if (mode == 0) {
-		if (name.indexOf(".") < 0) {
+		if (name.indexOf(".") < 0 || !fs.lstatSync(name).isFile()) {
 			vscode.window.showErrorMessage("Please enter the correct file path!");
 			return;
 		}
 	} else {
-		if (name.indexOf(".") > 0) {
-			vscode.window.showErrorMessage("Please enter the correct folder path!");
+		if (name.indexOf(".") > 0 || !fs.lstatSync(name).isDirectory()) {
+			vscode.window.showErrorMessage("Please enter the correct folder folder!");
 			return;
 		}
 	}
@@ -130,11 +174,23 @@ function checkMode(name, genDir, mode) {
 // this method is called when your extension is deactivated
 function deactivate() { }
 
-function getWebviewContent() {
+function getWebviewContent(context) {
 	let data = readFile(__dirname + '/vs_plugin_view.html');
+	data = getWebViewContent(context, '/vs_plugin_view.html');
 	return data.toString();
 }
 
+function getWebViewContent(context, templatePath) {
+    const resourcePath = path.join(context.extensionPath, templatePath);
+    const dirPath = path.dirname(resourcePath);
+    let html = fs.readFileSync(resourcePath, 'utf-8');
+    html = html.replace(/(<link.+?href="|<script.+?src="|<iframe.+?src="|<img.+?src=")(.+?)"/g, (m, $1, $2) => {
+        if($2.indexOf("https://")<0)return $1 + vscode.Uri.file(path.resolve(dirPath, $2)).with({ scheme: 'vscode-resource' }).toString() + '"';
+        else return $1 + $2+'"';
+    });
+    return html;
+}
+
 module.exports = {
 	activate,
 	deactivate
diff --git a/napi_vs_plugin/src/images/file.png b/napi_vs_plugin/src/images/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c365a02e99414acb29c643fc2d64d150cff9f0
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#@kvBMR9Hvtmr)ABFc3uFqQ?;Y67(=Ccni_v=tTt2q9BNR4_!$~rCQr&n}Q(8
zZ+CXyPSVf{KVI@<e-gke0aZN)ZpQ`K0(%j81ZpbFiU22Lvoo-X1^EUrsR8K$b6^P!
ze4R@{jqr%b*l9`tA~I@frmB5l@d45#dwZVyv;xRGsjAbvR4nU|P3{Mc0<gFiptG|U
z1)!>K>M5`WhHXGv0eIsXuxe|Z!&U+qrn&n2U?(E?P@SsQZ$Ut#n}7dJ#+{yl0LaRc
z#sos{fdr5eNC~6_QUd>-K+JR&Z5Q7I7Qa$$2_ULlggE^hJ^@2>!y!F<Rfzxq002ov
JPDHLkV1mB>dR_nk

literal 0
HcmV?d00001

diff --git a/napi_vs_plugin/src/images/path.png b/napi_vs_plugin/src/images/path.png
new file mode 100644
index 0000000000000000000000000000000000000000..56f408a584f243956fab1916d9152f34364cdf78
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%8c9S!R9HvtmphD2Q51&1Kk=%(;t>^%3bkjn6iB8Kl|)BWBGI5iBN-~9lc<<x
z5+tG|<Jr!rG&7ZWgiv`DzpTkVvYk1{Y-jGtZRV8s?!EtSul28W))7N~G-Q1i0se}B
z?Tx@WU?;E~cmZ6KG~HLK{s1KL2f&(|*caevUl2LKC~yRL3S3AKmx2B1x08~74LTAz
zz;j@I2ugYvLbf+0@h-Xn`!?;rA?bV5AvwS^V8Z|ba=q}-@#<pvA34Bv;805no&cx*
zCk3{{#5+<tw*eE9PSm5214OvPgsW<cJ|`2-bjgG5)xaZQ9WWwksxbmt&Z{z90=xu9
zC3O<7glu1lO8^%o-E9Tva>J56Lj|zC5_nvcf|A>muCcug*q%%nX8gAa^Mh@#08XbS
zv=vxdD%`Se{xZxA6V-4B*s?&;su4vA-<-D*WdOH<eZV9Tt$0e(&jrG?Zm+)$BWL5l
zC*XjjZ+!_@=hgv^0hfR=N$2|(kMr9A?n$cNh@ClXZwAf+yMZ6TE8wc6_iYi#Q*cny
z*RJZe!^C4P^Tpu`V$MuxyE5UMWWq^FL0|mXj<UU#%@Xzb;=ZJa%-o?g%>aWa!wR@*
zzW69<Pa{BjDGjm_H358(w6_(YIMyu-3sUe<(wW`>QWT>C!h~yUoMG%R;q2Jg>xW5J
uhP!}h&974#&WiUAP?E}CBd`ci5`o_-qRb&!3c5Z30000<MNUMnLSTZd=nzx@

literal 0
HcmV?d00001

diff --git a/napi_vs_plugin/src/vs_plugin_view.html b/napi_vs_plugin/src/vs_plugin_view.html
index 437ce254..8570f35e 100644
--- a/napi_vs_plugin/src/vs_plugin_view.html
+++ b/napi_vs_plugin/src/vs_plugin_view.html
@@ -10,7 +10,7 @@
 <body>
 	<style type="text/css">
 		body {
-			background-color: #F5F5F5;
+			background-color: #000000;
 			margin:0 auto;
 			position:absolute;
 			left:35%;
@@ -22,11 +22,11 @@
 			text-decoration: none;
 		}
 
-		button {
+		button.button {
 			background-color: #ffffff;
             font-family: Consolas, sans-serif;
             font-size: 16px;
-            border-radius: 20px;
+            border-radius: 3px;
             border-color: #C4C4C4;
             align-self: center;
             border: 1px solid #C4C4C4;
@@ -35,7 +35,7 @@
 			height:24px
 		}
 
-		button:hover {
+		button.button:hover {
 			background: #4B97D9;
 			color: #fff;
 			border: 0px;
@@ -61,9 +61,9 @@
 
 		div {
 			font-size: 16px;
-			color: black;
-			font-weight: bold;
-			width: 800px;
+			color: #ffffff;
+			/* font-weight: bold; */
+			width: 400px;
 			height: 50px;
 			text-align: left;
 		}
@@ -82,10 +82,11 @@
 			});
 		}
 
-		function sendMsg() {
+		function sendParamMsg() {
 			var fileNames = document.getElementById("interfaceFile").value;
 			var genDir = document.getElementById("genFile").value;
 			var result = {
+				msg: "param",
 				mode: mode,
 				fileNames: fileNames,
 				genDir: genDir,
@@ -93,14 +94,42 @@
 			vscode.postMessage(result);
 		}
 
+		function selectInterPath() {
+			var result = {
+				msg: "selectInterPath",
+				mode: mode
+			}
+			vscode.postMessage(result);
+		}
+
+		function selectPath(message) {
+			var result = {
+				msg: message
+			}
+			vscode.postMessage(result);
+		}
+
 		function cancel() {
-			vscode.postMessage("cancel");
+			var result = {
+				msg: "cancel"
+			}
+			vscode.postMessage(result);
 		}
 
 		window.addEventListener('message', event => {
-			const message = event.data;
-			document.getElementById("interfaceFile").value = message;
-			fillInputDir(message);
+			const message = event.data.msg;
+			const path = event.data.path;
+			if(message == "selectInterPath") {
+				document.getElementById("interfaceFile").value = path;
+				fillInputDir(path);
+			} else if(message == "selectGenPath") {
+				document.getElementById("genFile").value = path;
+			} else if(message == "selectBuildPath") {
+				document.getElementById("buildFile").value = path;
+			}
+			else {
+				console.log("param is error");
+			}
 		})
 
 		function inputChange() {
@@ -124,6 +153,7 @@
 			document.getElementById("genFile").value = dir;
 			document.getElementById("buildFile").value = dir;
 		}
+
 	</script>
 	<div id="selectMode">
 		选择生成方式：
@@ -136,23 +166,26 @@
 	</br>
 	<div id="interface" style="margin-top: 10px;">
 		选择接口文件：
-		<input class="text" style="width: 200px; height: 18px;" type="text" id="interfaceFile" onchange="inputChange()" onporpertychange="inputChange() ">
+		<input class="text" style="width: 250px; height: 18px;" type="text" id="interfaceFile" onchange="inputChange()" onporpertychange="inputChange() ">
+		<img src="./images/file.png" width="16px" height="16px" onclick="selectInterPath()">
 	</div>
 
 	<div style="margin-top: 10px;">
 		生成框架路径：
-		<input class="text" style="width: 200px; height: 18px;" accept="text" id="genFile">
+		<input class="text" style="width: 250px; height: 18px;" accept="text" id="genFile">
+		<img src="./images/path.png" width="16px" height="16px" onclick="selectPath('selectGenPath')">
 	</div>
 	<div style="margin-top: 10px;">
 		编译脚本路径：
-		<input class="text" style="width: 200px; height: 18px;" type="text" id="buildFile">
+		<input class="text" style="width: 250px; height: 18px;" type="text" id="buildFile">
+		<img src="./images/path.png" width="16px" height="16px" onclick="selectPath('selectBuildPath')">
 	</div>
-	<div style="margin-top: 10px;">
+	<div style="margin-top: 10px; text-align: right;">
+		<button type="button" class="button" onclick="cancel()" style="background-color: #333333; border: 1px solid #333333; color: #fff;">Cancel</button>
+		<button type="button" class="button" onclick="sendParamMsg()" style="background-color: #4B97D9; border: 1px solid #4B97D9; color: #fff;">Ok</button>
 		<a href="https://gitee.com/openharmony/napi_generator" target="_blank">
-			<button type="button">Help</button>
+			<button type="button" style="background-color: #333333; width: 20px; height: 20px; border-radius: 50%;border: none; color: #fff;">?</button>
 		</a>
-		<button type="button" onclick="cancel()">Cancel</button>
-		<button type="button" onclick="sendMsg()">Ok</button>
 	</div>
 </body>
 
diff --git a/src/gen/generate/param_generate.js b/src/gen/generate/param_generate.js
index fd5865e4..5ba6c1f1 100644
--- a/src/gen/generate/param_generate.js
+++ b/src/gen/generate/param_generate.js
@@ -103,14 +103,21 @@ function getArrayTypeTemplete(type) {
         arrayType = "std::string"
     } else if (arrayType == "boolean") {
         arrayType = "bool"
-    } else if (arrayType == "[key:string]:string") {
+    } else if (arrayType == "[key:string]:string" || arrayType == "Map<string,string>") {
         arrayType = "std::map<std::string, std::string>"
-    } else if (arrayType.substring(0, arrayType.length-1) == "[key:string]:NUMBER_TYPE_") {       
+    } else if (arrayType.substring(0, arrayType.length-1) == "[key:string]:NUMBER_TYPE_" || 
+        arrayType.substring(0, arrayType.length-1) == "Map<string,NUMBER_TYPE_>") {       
         let len = arrayType.length
         let num = arrayType.substring(len-1, len)
         arrayType = "std::map<std::string, NUMBER_TYPE_%s>".format(num)
-    } else if (arrayType == "[key:string]:boolean") {
+    } else if (arrayType == "[key:string]:boolean" || arrayType == "Map<string,boolean>") {
         arrayType = "std::map<std::string, bool>"
+    } else if (arrayType.substring(0, 14) == "[key:string]:") {
+        let valueType = arrayType.substring(14, arrayType.length)
+        arrayType = "std::map<std::string, %s>".format(valueType)
+    } else if (arrayType.substring(0, 11) == "Map<string,") {
+        let valueType = arrayType.substring(11, arrayType.length-1)
+        arrayType = "std::map<std::string, %s>".format(valueType)
     }
     return arrayType
 }
@@ -199,6 +206,34 @@ function getArrTempletereplaceSwap(arrTemplete, arrayType, napiVn, lt) {
     }
     return arrTemplete
 }
+function getMapValueType(strLen, keyType, arrayType){
+    let valueTypeIn
+    if (keyType == "[key:string]:"){
+        valueTypeIn = arrayType.substring(strLen, arrayType.length)
+    } else if (keyType == "Map<string,"){
+        valueTypeIn = arrayType.substring(strLen, arrayType.length - 1)
+    }            
+    
+    let mapValueType
+    if (valueTypeIn == "string") {
+        mapValueType = "std::string"
+    } else if (valueTypeIn == "boolean") {
+        mapValueType = "bool"
+    } else {
+        mapValueType = valueTypeIn
+    }
+    return mapValueType
+}
+
+function getMapKeyLen(arrayType) {
+    let strLen
+    if (arrayType.substring(0,13) == "[key:string]:") {
+        strLen = "[key:string]:".length
+    }else if (arrayType.substring(0,10) == "Map<string") {
+        strLen = "Map<string,".length
+    }
+    return strLen
+}
 
 function paramGenerateArray(p, funcValue, param) {
     let type = funcValue.type
@@ -215,23 +250,20 @@ function paramGenerateArray(p, funcValue, param) {
         param.valueFill += "%svio->in%d".format(param.valueFill.length > 0 ? ", " : "", p)
         param.valueDefine += "%sstd::vector<%s> %s%s".format(param.valueDefine.length > 0 ? ", " 
                             : "", arrayType, modifiers, name)
-    } else if (type.substring(0, 6) == "Array<") {
-        let str = "[key:string]:"
-        let strLen = str.length
+    } else if (type.substring(0, 6) == "Array<") {        
         let arrayType = getArrayType(type)
-        if (arrayType == "string") arrayType = "std::string"
-        if (arrayType == "boolean") arrayType = "bool"
-        if (arrayType.substring(0, strLen) == "[key:string]:") {
-            let valueTypeIn = arrayType.substring(strLen, arrayType.length)
-            let valueTypeOut
-            if (valueTypeIn == "string") {
-                valueTypeOut = "std::string"
-            } else if (valueTypeIn == "boolean") {
-                valueTypeOut = "bool"
-            } else { 
-                valueTypeOut = valueTypeIn
-            }
-            arrayType = "std::map<std::string, %s>".format(valueTypeOut)
+        let strLen =  getMapKeyLen(arrayType)
+        let keyType = arrayType.substring(0, strLen)
+
+        if (arrayType == "string") {
+            arrayType = "std::string"
+        } else if (arrayType == "boolean") {
+            arrayType = "bool"
+        } else if (keyType == "[key:string]:"|| keyType == "Map<string,") {
+            let mapValueType = getMapValueType(strLen, keyType, arrayType);             
+            arrayType = "std::map<std::string, %s>".format(mapValueType)
+        } else {
+            NapiLog.logError("The current version do not support this array type:", name, "type :", arrayType);
         }
         param.valueIn += funcValue.optional ? "\n    std::vector<%s>* in%d = nullptr;".format(arrayType, p) 
                                             : "\n    std::vector<%s> in%d;".format(arrayType, p)
diff --git a/src/gen/tools/common.js b/src/gen/tools/common.js
index 5a160741..e555c51b 100644
--- a/src/gen/tools/common.js
+++ b/src/gen/tools/common.js
@@ -102,18 +102,34 @@ function getArrayType(type) {
     let tt = re.match("Array<([a-zA-Z_0-9]+)>", type)
     if (tt != null) {
         return re.getReg(type, tt.regs[1])
-    } else {
-        tt = re.match("Array<{([[a-z:]+)([a-z:]]+)([a-zA-Z_1-9:]+)", type)
-        if (tt != null) {
-            let res = ''
-            let len = tt.regs.length
-            for (let i=1; i<len; i++) {
-                let regs1 = re.getReg(type, tt.regs[i])
-                res += regs1
-            }          
-            return res
-        }
+    } 
+    
+    tt = re.match("Array<{([[a-z:]+)([a-z:]]+)([a-zA-Z_1-9:]+)", type)
+    if (tt != null) {
+        let res = ''
+        let len = tt.regs.length
+        for (let i=1; i<len; i++) {
+            let regs1 = re.getReg(type, tt.regs[i])
+            res += regs1
+        }          
+        return res
+    }
+    
+    tt = re.match("Array<map<string", type)
+    if (tt != null) {
+        let preStr = 'Array<'
+        let preStrLen = preStr.length        
+        let res = type.substring(preStrLen, type.length-1)              
+        return res
     }
+
+    tt = re.match("Array<Map<string", type)
+    if (tt != null) {
+        let preStr = 'Array<'
+        let preStrLen = preStr.length        
+        let res = type.substring(preStrLen, type.length-1)              
+        return res
+    } 
     return null
 }
 
diff --git a/test/storytest/test_array_map/@ohos.test.d.ts b/test/storytest/test_array_map/@ohos.test.d.ts
index 6fc37ba1..d8793106 100644
--- a/test/storytest/test_array_map/@ohos.test.d.ts
+++ b/test/storytest/test_array_map/@ohos.test.d.ts
@@ -14,10 +14,38 @@
 */
 import { AsyncCallback, Callback } from './../basic';
 
-declare namespace napitest {  
+declare namespace napitest {      
+    /*    
+    export interface testInerface {
+        code: number;
+        data: string;
+    }
+    export interface testMapInerface {
+        tset1: map<string, Array<testInerface>>; -- 待实现    }
+
+    function fun7(v: Array<{[key: string]:testInerface}>): number; -- 待实现
+    function fun10(v: Array<map<string, testInerface>>): number; -- 待实现
+    function fun11(v: Array<map<string, testInerface>>): number; -- 待实现
+    function fun17(v: Array<map<string, Array<testInerface>>>): number; -- 待实现
+
+    --not support--
+    function fun4(v: Array<{[key: string]:Object}>): number; -- 参数、返回值暂时不支持
+    function fun5(v: Array<{[key: string]:[]}>): number; -- ohos中无此类用法，暂不实现
+    function fun6(v: Array<{[key: string]:any}>): number; -- 依赖于参数、返回值any类型
+
+    function fun13(v: {[key: string]:any}[]): number; --ohos中无此类用法，暂不实现
+    function fun14(v: {[key: string]:any}[]): number; --ohos中无此类用法，暂不实现
+    function fun15(v: map<string, string>[]): number; --ohos中无此类用法，暂不实现
+    function fun15(v: string): map<string, string>[]; --ohos中返回值类型为 map数组，无此类用法，暂不实现
+    */
+   
     function fun1(v: Array<{[key: string]:string}>): number;
     function fun2(v: Array<{[key: string]:number}>): number;
     function fun3(v: Array<{[key: string]:boolean}>): number;
+
+    function fun8(v: Array<Map<string, string>>): number;
+    function fun9(v: Array<Map<string, number>>): number;
+    function fun10(v: Array<Map<string, boolean>>): number;    
 }
 
 export default napitest;
\ No newline at end of file
diff --git a/test/storytest/test_array_map/test.js b/test/storytest/test_array_map/test.js
index d78cbfaf..cd1b2258 100644
--- a/test/storytest/test_array_map/test.js
+++ b/test/storytest/test_array_map/test.js
@@ -12,7 +12,7 @@
 * See the License for the specific language governing permissions and 
 * limitations under the License. 
 */
-const { fun1, fun2, fun3 } = require("./out/build/Release/napitest")
+const { fun1, fun2, fun3, fun8, fun9, fun10} = require("./out/build/Release/napitest")
 var assert = require("assert");
 
 describe('array_map', function () {    
@@ -30,4 +30,37 @@ describe('array_map', function () {
         let ret = fun3([{"age":true}, {"name":false}]);
         assert.strictEqual(ret, 0);
     });
-});
\ No newline at end of file
+    
+    it('test fun8', function () {
+        let ret = fun8([{"age":"a"}, {"name":"b"}]);
+        assert.strictEqual(ret, 0);
+    });
+
+     it('test fun9', function () {
+        let ret = fun9([{"age":1}, {"name":2}]);
+        assert.strictEqual(ret, 0);
+    });
+
+    it('test fun10', function () {
+        let ret = fun10([{"age":true}, {"name":false}]);
+        assert.strictEqual(ret, 0);
+    });
+
+    /*
+    it('test fun7', function () {
+        let ret = fun7([{"key":'{"code":0,"data":"code0"}'}, {"name":'{"code":1,"data":"code1"}'}]);
+        assert.strictEqual(ret, 0);
+    }); 
+    */  
+
+    /*it('test fun12', function () {
+        let ret = fun12([{"key1":'code1'}, {"key2":'code2'}]);
+        assert.strictEqual(ret, 0);
+    });
+    
+    it('test fun10', function () {
+        let ret = fun12([{"key1":'{"code":0,"data":"code0"}'}, {"key2":'{"code":1,"data":"code1"}'}]);
+        assert.strictEqual(ret, 0);
+    });
+    */
+});
-- 
Gitee


From db38b42e4a738f0c2df7ae4d7ba4a893b502aeb2 Mon Sep 17 00:00:00 2001
From: zhaojunxia <zhaojunxia@kaihong.com>
Date: Tue, 23 Aug 2022 00:27:48 -0700
Subject: [PATCH 4/5] feat: support no name Interface

Signed-off-by: zhaojunxia <zhaojunxia@kaihong.com>
---
 src/gen/analyze/function.js                   | 96 ++++++++++++++++---
 src/gen/analyze/interface.js                  | 26 ++++-
 src/gen/analyze/namespace.js                  | 13 ++-
 src/gen/generate/interface.js                 | 16 ++--
 src/gen/generate/param_generate.js            |  3 +-
 src/gen/tools/re.js                           |  2 +-
 .../test_interface_no_name/@ohos.test.d.ts    | 23 ++++-
 test/storytest/test_interface_no_name/test.js | 71 +++++++++++++-
 8 files changed, 213 insertions(+), 37 deletions(-)

diff --git a/src/gen/analyze/function.js b/src/gen/analyze/function.js
index d24e3664..fb7e07d4 100644
--- a/src/gen/analyze/function.js
+++ b/src/gen/analyze/function.js
@@ -82,26 +82,94 @@ function getFuncParaType(v, interfaceName, data) {
     return v
 }
 
-/**函数解析 */
-function analyzeFunction(data, name, values, ret) {
+function analyzeFuncNoNameInterface(data, values) {
     values = re.replaceAll(re.replaceAll(values, " ", ""), "\n", "")
-    let matchs = re.match("([a-zA-Z_0-9]*)\\?*:{([A-Za-z0-9_]+:[A-Za-z0-9_,]+)([A-Za-z0-9_]+:[A-Za-z0-9_]+)}$", values)
-    let interfaceName = ''
+    let res = ""
+    let interfaceName = ""
+    let matchs = re.match("([a-zA-Z_0-9]*)\\?*:{([A-Za-z0-9_]+:[A-Za-z0-9_,;]+)([A-Za-z0-9_]+:[A-Za-z0-9_]+)}(}|,|;)?$", values)
+    let tt = re.match(":{([A-Za-z0-9_]+:[A-Za-z0-9_,;]+)([A-Za-z0-9_]+:[A-Za-z0-9_]+)}(}|,|;)?$", values)
+    if (tt) {
+        let len = tt.regs.length
+        for (let i=1; i<len; i++) {
+            let regs1 = re.getReg(values, tt.regs[i])
+            if (regs1 != "}" && regs1 != ",") {
+                res += regs1
+            }         
+        }  
+    }    
+
     if (matchs) {
         let interfacePara = re.getReg(values, matchs.regs[1])
-        let number = randomInt(10);
-        interfaceName = 'AUTO_INTERFACE_%s_%s'.format(interfacePara, number)
-        let interfaceBody = values.substring(interfacePara.length+2, values.length-1)
+        let number = NumberIncrease.getAndIncrease();
+        interfaceName = "AUTO_INTERFACE_%s_%s".format(interfacePara, number)
+        let interfaceBody = res
+        let typeInterface = "{%s}".format(res)
+        values = re.replaceAll(values, typeInterface, interfaceName)
+
+        interfaceBody = re.replaceAll(interfaceBody, ",", ";")
+        data.interface.push({
+            name: interfaceName,
+            body: analyzeSubInterface(interfaceBody)
+        })
+    }
+
+    matchs = re.match("([a-zA-Z_0-9]*)\\?*:{([A-Za-z0-9_]+:[A-Za-z0-9_,;]+)([A-Za-z0-9_]+:[A-Za-z0-9_]+)}(}|,)?$", values)
+    if(matchs) {
+        let resNoNameInter = analyzeFuncNoNameInterface(data, values)
+        values = resNoNameInter.values
+    }
+
+    let result = {
+        interfaceName: interfaceName,
+        values: values
+    }
+    return result
+}
+
+function analyseSubReturn(ret, data) {
+    //匿名interface返回值 function fun4(input: string): { read: number; written: number }; 
+    ret = re.replaceAll(re.replaceAll(ret, " ", ""), "\n", "")
+    let tt = re.match("{([A-Za-z0-9_]+:[A-Za-z0-9_,;]+)([A-Za-z0-9_]+:[A-Za-z0-9_]+)}", ret)
+    if (tt) {
+        let len = tt.regs.length
+        let res = ""
+        let interfaceName = ""
+        for (let i=1; i<len; i++) {
+            let regs1 = re.getReg(ret, tt.regs[i])
+            if (regs1 != "}" && regs1 != ",") {
+                res += regs1
+            }         
+        }  
+
+        let number = NumberIncrease.getAndIncrease();
+        interfaceName = "AUTO_INTERFACE_%s".format(number)
+        let interfaceBody = res        
+        ret = interfaceName
+
         interfaceBody = re.replaceAll(interfaceBody, ",", ";")
         data.interface.push({
             name: interfaceName,
             body: analyzeSubInterface(interfaceBody)
         })
-    }  
+    }
+    if (ret.indexOf("number") >= 0) {
+        //ret = ret.replace("number", "NUMBER_TYPE_" + NumberIncrease.getAndIncrease())
+        ret = ret.replaceAll("number", "NUMBER_TYPE_" + NumberIncrease.getAndIncrease())
+    }
+    return ret
+}
+
+/**函数解析 */
+function analyzeFunction(data, name, values, ret) {
+    let res = analyzeFuncNoNameInterface(data, values)
+    let tmp
+    let funcType
+    if (res) {
+        tmp = analyzeParams(name, res.values)
+        values = tmp[0]
+        funcType = tmp[1]
+    }
 
-    let tmp = analyzeParams(name, values)
-    values = tmp[0]
-    let funcType = tmp[1]
     tmp = analyzeReturn(ret)
     ret = tmp[0]
     if (tmp[1])
@@ -113,14 +181,12 @@ function analyzeFunction(data, name, values, ret) {
     }
     for (let j in values) {
         let v = values[j]
-        v = getFuncParaType(v, interfaceName, data)
+        v = getFuncParaType(v, res.interfaceName, data)
         if (v == null) {
             NapiLog.logError("analyzeFunction is not support this type %s".format(v));
         }
     }
-    if (ret.indexOf("number") >= 0) {
-        ret = ret.replace("number", "NUMBER_TYPE_" + NumberIncrease.getAndIncrease())
-    }
+    ret = analyseSubReturn(ret, data)
     let result = {
         name: name,
         type: funcType,
diff --git a/src/gen/analyze/interface.js b/src/gen/analyze/interface.js
index dd9e5b10..d6583bc6 100644
--- a/src/gen/analyze/interface.js
+++ b/src/gen/analyze/interface.js
@@ -14,11 +14,11 @@
 */
 const re = require("../tools/re");
 const { NumberIncrease } = require("../tools/common");
-
-const { analyzeFunction } = require("./function");
+const { analyzeFunction, analyzeSubInterface } = require("./function");
+const { randomInt } = require("crypto");
 
 /**interface解析 */
-function analyzeInterface(data) {//same as class
+function analyzeInterface(data, rsltInterface = null) {//same as class
     let body = re.replaceAll(data, "\n", "").split(";")//  # replace(" ", "").
     let result = {
         value: [],
@@ -33,7 +33,6 @@ function analyzeInterface(data) {//same as class
         if (t == "") break//如果t为空直接返回
         let tt = re.match(" *([a-zA-Z0-9_]+) *: *([a-zA-Z_0-9<>,:{}[\\] ]+)", t)
         if (tt) {//变量
-
             let valueName = re.getReg(t, tt.regs[1])
             let valueType = re.getReg(t, tt.regs[2])
             let index = valueType.indexOf("number")
@@ -41,11 +40,30 @@ function analyzeInterface(data) {//same as class
                 valueType = valueType.replace("number", "NUMBER_TYPE_" + NumberIncrease.getAndIncrease())
                 index = valueType.indexOf("number")
             }
+
+            /* 匿名interface */
+            valueType = re.replaceAll(valueType, " ", "")
+            let matchs = re.match("{([A-Za-z0-9_]+:[A-Za-z0-9_,;]+)([A-Za-z0-9_]+:[A-Za-z0-9_]+)}$", valueType)
+            if (matchs) {
+                let number = randomInt(10);
+                let interfaceTypeName = 'AUTO_INTERFACE_%s_%s'.format(valueName, number)
+                let interfaceBody = valueType.substring(1, valueType.length-1)
+                interfaceBody = re.replaceAll(interfaceBody, ",", ";")
+                
+                rsltInterface.push({
+                    name: interfaceTypeName,
+                    body: analyzeInterface(interfaceBody)
+                })
+                
+                valueType = interfaceTypeName
+            }
+
             result.value.push({
                 name: valueName,
                 type: valueType
             })
         }
+
         tt = re.match(" *([A-Za-z0-9_]+)\\(([\n 'a-zA-Z:;=,_0-9?<>{}|[\\]]*)\\) *: *([A-Za-z0-9_<>{}:, .[\\]]+)", t)
         if (tt) {//函数
             let funcDetail = analyzeFunction(data, re.getReg(t, tt.regs[1]),
diff --git a/src/gen/analyze/namespace.js b/src/gen/analyze/namespace.js
index 0a49ddb6..28de147c 100644
--- a/src/gen/analyze/namespace.js
+++ b/src/gen/analyze/namespace.js
@@ -176,10 +176,11 @@ function parseFunction(matchs, data, result) {
         let funcValue = checkOutBody(data,
             matchs.regs.length == 5 ? matchs.regs[4][0] : matchs.regs[3][0], ["(", ")"], null)
         let funcRet = checkOutBody(data.substring(matchs.regs.length == 5 ?
-            matchs.regs[4][0] : matchs.regs[3][0] + funcValue.length), 0, ["", "\n"], null)
-        data = data.substring(matchs.regs.length == 5 ?
+            matchs.regs[4][0] : matchs.regs[3][0] + funcValue.length), 0, ["", "\n"], null)         
+            funcRet = re.replaceAll(funcRet, " ", "");
+            data = data.substring(matchs.regs.length == 5 ?
             matchs.regs[4][0] : matchs.regs[3][0] + funcValue.length + funcRet.length)
-        let matchFunc = re.match(" *: *([A-Za-z0-9_<>{}:, .=]+);*", funcRet)
+        let matchFunc = re.match(" *: *([A-Za-z0-9_<>{}:;, .=]+);*", funcRet)
         let matchFuncArray = re.match(" *: *([A-Za-z0-9]+)(\\[]);*", funcRet)
         if (matchFuncArray) {
             funcRet = re.getReg(funcRet, [matchFuncArray.regs[1][0], matchFuncArray.regs[2][1]])
@@ -190,6 +191,10 @@ function parseFunction(matchs, data, result) {
         else {
             funcRet = "void"
         }
+        
+        if (funcRet[funcRet.length-1] == ";") {
+            funcRet = funcRet.substring(0,funcRet.length-1);
+        }
         let funcDetail = analyzeFunction(result, funcName, funcValue.substring(1, funcValue.length - 1), funcRet)
         if (funcDetail != null)
             result.function.push(funcDetail)
@@ -207,7 +212,7 @@ function parseInterface(matchs, data, result) {
         let interfaceBody = checkOutBody(data, matchs.regs[5][0], null, null)
         result.interface.push({
             name: interfaceName,
-            body: analyzeInterface(interfaceBody.substring(1, interfaceBody.length - 1))
+            body: analyzeInterface(interfaceBody.substring(1, interfaceBody.length - 1), result.interface)
         })
         data = data.substring(matchs.regs[5][0] + interfaceBody.length, data.length)
         if (matchs.regs[1][0] != -1) {
diff --git a/src/gen/generate/interface.js b/src/gen/generate/interface.js
index 3f7c2e43..9da94695 100644
--- a/src/gen/generate/interface.js
+++ b/src/gen/generate/interface.js
@@ -45,10 +45,13 @@ static void release(void *p)
 
 function generateVariable(name, type, variable, className) {
     if (type == "string") variable.hDefine += "\n    std::string %s;".format(name)
-    else if (type.substring(0, 12) == "NUMBER_TYPE_") variable.hDefine += "\n    %s %s;".format(type, name)
-    else if (InterfaceList.getValue(type)) variable.hDefine += "\n    %s %s;".format(type, name)
-    else if (EnumList.getValue(type)) variable.hDefine += "\n    %s %s;".format(type, name)
-    else if (type.indexOf("Array<") == 0) {
+    else if (type.substring(0, 12) == "NUMBER_TYPE_") {
+        variable.hDefine += "\n    %s %s;".format(type, name)
+    } else if (InterfaceList.getValue(type)) {
+        variable.hDefine += "\n    %s %s;".format(type, name)
+    } else if (EnumList.getValue(type)) {
+        variable.hDefine += "\n    %s %s;".format(type, name)
+    } else if (type.indexOf("Array<") == 0) {
         let type2 = getArrayType(type)
         if (type2 == "string") type2 = "std::string"
         if (type2 == "boolean") type2 = "bool"
@@ -57,10 +60,9 @@ function generateVariable(name, type, variable, className) {
         variable.hDefine += "\n    bool %s;".format(name)
     } else if (type.indexOf("[]") == 0) {
         variable.hDefine += "\n    std::vector<%s> %s;".format(type, name)
-    } else if (type.substring(0, 4) == "Map<" || type.indexOf("{") == 0) {
+    } else if (type.substring(0, 4) == "Map<" || type.substring(0, 6) == "{[key:") {
         variable.hDefine += mapTypeString(type, name)
-    }
-    else {
+    } else {
         NapiLog.logError(`
         ---- generateVariable fail %s,%s ----
         `.format(name, type));
diff --git a/src/gen/generate/param_generate.js b/src/gen/generate/param_generate.js
index 5ba6c1f1..75dafbe1 100644
--- a/src/gen/generate/param_generate.js
+++ b/src/gen/generate/param_generate.js
@@ -206,7 +206,8 @@ function getArrTempletereplaceSwap(arrTemplete, arrayType, napiVn, lt) {
     }
     return arrTemplete
 }
-function getMapValueType(strLen, keyType, arrayType){
+
+function getMapValueType(strLen, keyType, arrayType) {
     let valueTypeIn
     if (keyType == "[key:string]:"){
         valueTypeIn = arrayType.substring(strLen, arrayType.length)
diff --git a/src/gen/tools/re.js b/src/gen/tools/re.js
index ff9657b5..89a1bc46 100644
--- a/src/gen/tools/re.js
+++ b/src/gen/tools/re.js
@@ -35,7 +35,7 @@ function search(ss, data) {
 
 function match(ss, data) {
     let tt = search(ss, data)
-    if (tt != null && tt.regs[0][0] == 0) return tt;
+    if (tt != null /*&& tt.regs[0][0] == 0*/) return tt;
     return null;
 }
 
diff --git a/test/storytest/test_interface_no_name/@ohos.test.d.ts b/test/storytest/test_interface_no_name/@ohos.test.d.ts
index e66a4ce7..062c70ae 100644
--- a/test/storytest/test_interface_no_name/@ohos.test.d.ts
+++ b/test/storytest/test_interface_no_name/@ohos.test.d.ts
@@ -14,8 +14,27 @@
 */
 import { AsyncCallback, Callback } from './../basic';
 
-declare namespace napitest {
-    function fun1(mancc: {name: string, age: number}): string;
+declare namespace napitest {    
+    interface TestInterfaceAA {
+        an: string;
+        al: string;
+    }
+    
+    interface TestInterface {
+        anchor: string;
+        align: string;
+        //inter1: TestInterfaceAA;
+        left: { test1: string, test2: string };//interface域变量场景
+    }
+
+    function fun2(fp2: TestInterface): string;      
+    function fun3(name : string, fp3: {name: string, age: number}): string; //函数多参数非嵌套场景
+    function fun1(mancc: {name: string, age: number}): string; //函数单参数非嵌套场景
+    function fun4(input: string): { read: number; written: number };//函数返回值场景
+    function fun5(value: {xOffset: number, animation: { duration: number, curve: string}});//函数单参数嵌套场景 
+    function fun6(nm: string, value: {xOffset: number, animation: { duration: number, curve: string}}); //函数多参数嵌套场景
+    function fun7(nm: string, value: {xOffset: number; animation: { duration: number; curve: string}}); //暂不支持 分号场景
+     
 }
 
 export default napitest;
\ No newline at end of file
diff --git a/test/storytest/test_interface_no_name/test.js b/test/storytest/test_interface_no_name/test.js
index f74a29ee..d2e5cf87 100644
--- a/test/storytest/test_interface_no_name/test.js
+++ b/test/storytest/test_interface_no_name/test.js
@@ -12,15 +12,80 @@
 * See the License for the specific language governing permissions and 
 * limitations under the License. 
 */
-const { fun1} = require("./out/build/Release/napitest")
+const { fun1,fun2, fun3, fun4, fun5, fun6, fun7} = require("./out/build/Release/napitest")
 var assert = require("assert");
 
 describe('interface_no_name', function () {
-    it('test interface_no_name fun1', function () {
-        //let mc = {"name":"abc","age":20}
+    it('test interface_no_name fun1', function () {        
         let ret = fun1({"name":"abc","age":20});
         assert.strictEqual(ret, '');
     });
+    
+    let fp2 = {
+        anchor:"abc",
+        align:"testfun2", 
+        left:{
+            test1:"fun2", 
+            test2: "t2"
+        }
+    }
+    it('test interface_no_name fun2', function () {        
+        let ret = fun2(fp2);
+        assert.strictEqual(ret, '');
+    });
+    
+    it('test interface_no_name fun3', function () {        
+        let ret = fun3("fun3p1", {name:"abc",age:20});
+        assert.strictEqual(ret, '');
+    });
+
+    
+       /* function fun6(nm: string, value: {xOffset: number, animation: { duration: number, curve: string}}); //函数多参数嵌套场景
+    function fun7(nm: string, value: {xOffset: number; animation: { duration: number; curve: string}}); //暂不支持 分号场景
+     */
+    it('test interface_no_name fun4', function () {        
+        let ret = fun4("name");
+        assert.strictEqual(ret.read, 0);
+    });
+
+    it('test interface_no_name fun5', function () {   
+        let value = {
+            xOffset: 100, 
+            animation: { 
+                duration: 20,
+                curve: "tst"
+            }
+        }
+        fun5(value);   
+        //let ret = fun5(value);
+        //assert.strictEqual(ret, void);
+    });
+
+    it('test interface_no_name fun6', function () { 
+        let value = {
+            xOffset: 100, 
+            animation: { 
+                duration: 20,
+                curve: "tst"
+            }
+        }       
+        fun6("name", value);
+
+    });
+
+    it('test interface_no_name fun7', function () {        
+        let value = {
+            xOffset: 100, 
+            animation: { 
+                duration: 20,
+                curve: "tst"
+            }
+        }       
+        fun7("name", value);
+    });
+    
+    
+
 });
 
 
-- 
Gitee


From 0b8d34bf5922e5fb7650d696a4b2283c8ea5eee6 Mon Sep 17 00:00:00 2001
From: zhaojunxia <zhaojunxia@kaihong.com>
Date: Tue, 23 Aug 2022 02:32:01 -0700
Subject: [PATCH 5/5] feat: no name interface

Signed-off-by: zhaojunxia <zhaojunxia@kaihong.com>
---
 src/gen/analyze/function.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gen/analyze/function.js b/src/gen/analyze/function.js
index 5cd44114..c507e6e3 100644
--- a/src/gen/analyze/function.js
+++ b/src/gen/analyze/function.js
@@ -163,7 +163,7 @@ function analyseSubReturn(ret, data) {
 }
 
 /**函数解析 */
-function analyzeFunction(data, name, values, ret) {
+function analyzeFunction(data, isStatic, name, values, ret) {
     let res = analyzeFuncNoNameInterface(data, values)
     let tmp
     let funcType
-- 
Gitee