From 08d59bb0f161c9d4080b8f8cbff30e7c65e15d81 Mon Sep 17 00:00:00 2001
From: buzhifeng <buzhifeng2@huawei.com>
Date: Mon, 10 Oct 2022 15:26:30 +0800
Subject: [PATCH] =?UTF-8?q?API8eTS=E5=B7=A5=E7=A8=8B=E7=9A=84FA=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E7=9C=8B=E9=A2=84=E8=A7=88=E5=99=A8=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E6=97=A5=E5=BF=97=E7=AA=97=E5=8F=A3=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0=E4=B8=8D=E5=AE=8C=E5=85=A8=20Signed?=
 =?UTF-8?q?-off-by:=20buzhifeng=20<buzhifeng2@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock-generate/package.json                                  | 2 +-
 mock-generate/src/generate/generateCommonFunction.ts        | 6 +++++-
 mock-generate/src/generate/generateCommonMethodSignature.ts | 6 +++++-
 package.json                                                | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mock-generate/package.json b/mock-generate/package.json
index 7681826a..25a24faa 100644
--- a/mock-generate/package.json
+++ b/mock-generate/package.json
@@ -4,7 +4,7 @@
   "description": "generate mock",
   "main": "main.js",
   "scripts": {
-    "build": "npm install && tsc && cd dist && node main.js && cd .. && eslint -c .eslintrc --fix ../runtime/**/systemplugin/**/*.js"
+    "build": "npm install && node ../node_modules/typescript/bin/tsc && cd dist && node main.js && cd .. && eslint -c .eslintrc --fix ../runtime/**/systemplugin/**/*.js"
   },
   "keywords": [
     "mock"
diff --git a/mock-generate/src/generate/generateCommonFunction.ts b/mock-generate/src/generate/generateCommonFunction.ts
index 528311af..9185c17f 100644
--- a/mock-generate/src/generate/generateCommonFunction.ts
+++ b/mock-generate/src/generate/generateCommonFunction.ts
@@ -37,7 +37,11 @@ export function generateCommonFunction(rootName: string, functionArray: Array<Fu
       functionBody += getCallbackStatement();
     }
     if (functionEntity.returnType.returnKind !== SyntaxKind.VoidKeyword) {
-      functionBody += getReturnStatement(functionEntity.returnType, sourceFile);
+      if (rootName === 'featureAbility' && functionEntity.returnType.returnKindName === 'Context') {
+        functionBody += 'return _Context;';
+      } else {
+        functionBody += getReturnStatement(functionEntity.returnType, sourceFile);
+      }
     }
   } else {
     const argSet: Set<string> = new Set<string>();
diff --git a/mock-generate/src/generate/generateCommonMethodSignature.ts b/mock-generate/src/generate/generateCommonMethodSignature.ts
index 9de61ae3..326d7a93 100644
--- a/mock-generate/src/generate/generateCommonMethodSignature.ts
+++ b/mock-generate/src/generate/generateCommonMethodSignature.ts
@@ -36,7 +36,11 @@ export function generateCommonMethodSignature(rootName: string, methodSignatureA
       methodSignatureBody += getCallbackStatement();
     }
     if (methodEntity.returnType.returnKind !== SyntaxKind.VoidKeyword) {
-      methodSignatureBody += getReturnStatement(methodEntity.returnType, sourceFile);
+      if (rootName === 'Context' && methodEntity.returnType.returnKindName === 'Context') {
+        methodSignatureBody += 'return Context;';
+      } else {
+        methodSignatureBody += getReturnStatement(methodEntity.returnType, sourceFile);
+      }
     }
   } else {
     const argSet: Set<string> = new Set<string>();
diff --git a/package.json b/package.json
index 2192d1f0..00308395 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   "scripts": {
     "test:lint": "eslint -c .eslintrc --fix test/**/*.ts",
     "test:unit": "mocha --timeout 5000 -r ts-node/register test/lib.ts test/ut/**/*.ts test/ut/*.ts",
-    "build:mock": "cd ./mock-generate && npm run build && cd ..",
-    "build": "node build_jsmock_system_plugin.js && node build_strip_native_min.js"
+    "build:mock": "cd ./mock-generate && npm run build",
+    "build": "npm run build:mock && node build_jsmock_system_plugin.js && node build_strip_native_min.js"
   },
   "keywords": [
     "javascript",