Merge branch 'master' of gitee.com:huyunhui1/xts_acts

Signed-off-by: Nhuyunhui1 <huyunhui1@huawei.com>

arkcompiler/BUILD.gn

+# Copyright (C) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import("//build/ohos_var.gni")
 
 group("arkcompiler") {
   testonly = true
   if (is_standard_system) {
-    deps = [
-      "esmodule:esmodule",
-    ]
+    deps = [ "esmodule:esmodule" ]
   }
 }
\ No newline at end of file

arkcompiler/esmodule/BUILD.gn

+# Copyright (C) 2023 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import("//build/ohos_var.gni")
 
 group("esmodule") {

arkcompiler/esmodule/esmodule_entry/entry/src/main/cpp/hello.cpp

@@ -20,7 +20,7 @@ static napi_value Add(napi_env env, napi_callback_info info)
     size_t argc = 2;
     napi_value args[2] = {nullptr};
 
-    napi_get_cb_info(env, info, &argc, args , nullptr, nullptr);
+    napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
 
     napi_valuetype valuetype0;
     napi_typeof(env, args[0], &valuetype0);
@@ -38,7 +38,6 @@ static napi_value Add(napi_env env, napi_callback_info info)
     napi_create_double(env, value0 + value1, &sum);
 
     return sum;
-
 }
 
 EXTERN_C_START

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportHar.ts

@@ -12,13 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ohpmRes} from 'har'
+import {ohpmRes} from 'har';
 import worker from '@ohos.worker';
 
-var workerPort = worker.workerPort;
-workerPort.onmessage = function() {
-  console.log("ModuleTest har");
-  if (ohpmRes){
-    workerPort.postMessage("ModuleTest receive data from main thread");
+let workerPort = worker.workerPort;
+workerPort.onmessage = function(): void {
+  if (ohpmRes) {
+    workerPort.postMessage('ModuleTest receive data from main thread');
   }
-}
+};
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportNapi.ts

@@ -12,13 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {add} from 'libentry.so'
+import {add} from 'libentry.so';
 import worker from '@ohos.worker';
 
+const ADDEND_FIRST = 2;
+const ADDEND_SECOND = 3;
+const SUM = 5;
 var workerPort = worker.workerPort;
-workerPort.onmessage = function() {
-  if (add(2, 3) == 5) {
-    console.log("ModuleTest AppNapi");
-    workerPort.postMessage("ModuleTest receive data from main thread");
+workerPort.onmessage = function(): void {
+  if (add(ADDEND_FIRST, ADD_SECOND) === SUM) {
+    workerPort.postMessage('ModuleTest receive data from main thread');
   }
-}
+};
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportOhpm.ts

@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import isLeapYear from 'leap-year'
+import isLeapYear from 'leap-year';
 import worker from '@ohos.worker';
 
-var workerPort = worker.workerPort;
-workerPort.onmessage = function() {
-  if (isLeapYear(2000)){
-    console.log("ModuleTest ohpm");
-    workerPort.postMessage("ModuleTest receive data from main thread");
+const LEAP_YEAR = 2000;
+let workerPort = worker.workerPort;
+workerPort.onmessage = function(): void {
+  if (isLeapYear(LEAP_YEAR)) {
+    workerPort.postMessage('ModuleTest receive data from main thread');
   }
-}
+};
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportRelative.ts

@@ -12,13 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { add } from '../test/test'
+import { add } from '../test/test';
 import worker from '@ohos.worker';
 
-var workerPort = worker.workerPort;
-workerPort.onmessage = function() {
-  if (add(2, 6) == 8){
-    console.log("ModuleTest relativePath");
-    workerPort.postMessage("ModuleTest receive data from main thread");
+const ADDEND_FIRST = 2;
+const ADDEND_SECOND = 3;
+const SUM = 5;
+let workerPort = worker.workerPort;
+workerPort.onmessage = function(): void {
+  if (add(ADDEND_FIRST, ADD_SECOND) === SUM) {
+    workerPort.postMessage('ModuleTest receive data from main thread');
   }
-}
+};
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportSystem.ts

@@ -12,13 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import hilog from "@ohos.hilog"
+import hilog from '@ohos.hilog';
 import worker from '@ohos.worker';
 
-hilog.info(0x0000, "testTag", 'dexter log: call ohos.hilog')
+hilog.info(0x0000, 'testTag', 'dexter log: call ohos.hilog');
 
-var workerPort = worker.workerPort;
-workerPort.onmessage = function() {
-  console.log("ModuleTest systemNapi");
-  workerPort.postMessage("ModuleTest receive data from main thread");
-}
+let workerPort = worker.workerPort;
+workerPort.onmessage = function(): void {
+  workerPort.postMessage('ModuleTest receive data from main thread');
+};
\ No newline at end of file
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/har/src/main/ets/ohpm.ts

@@ -12,5 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import isLeapYear from "leap-year"
-export var ohpmRes = isLeapYear(2000);
+import isLeapYear from 'leap-year';
+
\ No newline at end of file
+const LEAP_YEAR = 2000;
+export let ohpmRes = isLeapYear(LEAP_YEAR);
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/oh-package-lock.json5

-{
-  "lockfileVersion": 1,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6",
-    "leap-year@^4.0.0": "leap-year@4.0.0",
-    "leap-year@4.0.0": "leap-year@4.0.0"
-  },
-  "packages": {
-    "@ohos/hypium@1.0.6": {
-      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
-      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
-    },
-    "leap-year@4.0.0": {
-      "resolved": "https://repo.harmonyos.com/ohpm/leap-year/-/leap-year-4.0.0.tgz",
-      "integrity": "sha512-+GveCBnhFmRjFf04Nj/2Z/w5lNC4bRXpecIRz5QkK+LnWBwuf9jAaNEfbybrU+e2ls8J6p+FZMjiq1aEh+gPAw=="
-    }
-  }
+/**
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+{
+  "lockfileVersion": 1,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6",
+    "leap-year@^4.0.0": "leap-year@4.0.0",
+    "leap-year@4.0.0": "leap-year@4.0.0"
+  },
+  "packages": {
+    "@ohos/hypium@1.0.6": {
+      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
+      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
+    },
+    "leap-year@4.0.0": {
+      "resolved": "https://repo.harmonyos.com/ohpm/leap-year/-/leap-year-4.0.0.tgz",
+      "integrity": "sha512-+GveCBnhFmRjFf04Nj/2Z/w5lNC4bRXpecIRz5QkK+LnWBwuf9jAaNEfbybrU+e2ls8J6p+FZMjiq1aEh+gPAw=="
+    }
+  }
 }
\ No newline at end of file

arkcompiler/esmodule/esmodule_ohostest/har/src/main/ets/ohpm.ts

@@ -12,5 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import isLeapYear from "leap-year"
-export var ohpmRes = isLeapYear(2000);
+import isLeapYear from 'leap-year';
+
\ No newline at end of file
+const LEAP_YEAR = 2000;
+export let ohpmRes = isLeapYear(LEAP_YEAR);
\ No newline at end of file

arkcompiler/esmodule/esmodule_ohostest/oh-package-lock.json5

-{
-  "lockfileVersion": 1,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6",
-    "leap-year@^4.0.0": "leap-year@4.0.0",
-    "leap-year@4.0.0": "leap-year@4.0.0"
-  },
-  "packages": {
-    "@ohos/hypium@1.0.6": {
-      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
-      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
-    },
-    "leap-year@4.0.0": {
-      "resolved": "https://repo.harmonyos.com/ohpm/leap-year/-/leap-year-4.0.0.tgz",
-      "integrity": "sha512-+GveCBnhFmRjFf04Nj/2Z/w5lNC4bRXpecIRz5QkK+LnWBwuf9jAaNEfbybrU+e2ls8J6p+FZMjiq1aEh+gPAw=="
-    }
-  }
+/**
+ * Copyright (c) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+{
+  "lockfileVersion": 1,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6",
+    "leap-year@^4.0.0": "leap-year@4.0.0",
+    "leap-year@4.0.0": "leap-year@4.0.0"
+  },
+  "packages": {
+    "@ohos/hypium@1.0.6": {
+      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
+      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
+    },
+    "leap-year@4.0.0": {
+      "resolved": "https://repo.harmonyos.com/ohpm/leap-year/-/leap-year-4.0.0.tgz",
+      "integrity": "sha512-+GveCBnhFmRjFf04Nj/2Z/w5lNC4bRXpecIRz5QkK+LnWBwuf9jAaNEfbybrU+e2ls8J6p+FZMjiq1aEh+gPAw=="
+    }
+  }
 }
\ No newline at end of file