From 026b590941ced1937a815c85bb26e47b7aacc7ef Mon Sep 17 00:00:00 2001 From: MangTsang Date: Wed, 26 Jan 2022 17:53:40 +0800 Subject: [PATCH] I4SBL6: Open interfaces to apply to references Signed-off-by: MangTsang --- .gitignore | 1 + bundle.json | 13 +- .../src/preferences_impl.cpp | 2 +- .../include}/common.h | 13 +- .../common/{ => include}/js_ability.h | 4 +- .../common/{ => include}/js_utils.h | 4 +- .../common/{ => include}/napi_async_proxy.h | 4 +- .../common/{ => src}/js_ability.cpp | 4 +- .../jskitsimpl/common/{ => src}/js_utils.cpp | 4 +- .../jskitsimpl/napi_dataability/BUILD.gn | 51 ++++++++ .../include}/napi_data_ability_predicates.h | 1 - .../include}/napi_predicates_utils.h | 2 +- .../src}/entry_point.cpp | 0 .../src}/napi_data_ability_predicates.cpp | 2 +- .../src}/napi_predicates_utils.cpp | 4 +- .../test/BUILD.gn | 0 .../test/unittest/src/BUILD.gn | 0 .../src/DataAbilityPredicatesJsunit.test.js | 0 .../test/unittest/src/config.json | 0 .../jskitsimpl/napi_preferences/BUILD.gn | 46 +++++++ .../include}/napi_preference.h | 0 .../include}/napi_preference_helper.h | 0 .../src}/entry_point.cpp | 0 .../src}/napi_preference.cpp | 11 +- .../src}/napi_preference_helper.cpp | 18 +-- .../test/BUILD.gn | 0 .../test/unittest/src/BUILD.gn | 0 .../src/StorageCallBackJsunit.test.js | 0 .../unittest/src/StorageHelperJsunit.test.js | 0 .../unittest/src/StoragePromiseJsunit.test.js | 0 .../unittest/src/StorageSyncJsunit.test.js | 0 .../test/unittest/src/config.json | 0 frameworks/jskitsimpl/napi_rdb/BUILD.gn | 71 ++++++++++ .../include}/napi_rdb_predicates.h | 0 .../include}/napi_rdb_store.h | 0 .../include}/napi_rdb_store_helper.h | 0 .../include}/napi_values_bucket.h | 2 +- .../src}/entry_point.cpp | 4 +- .../src}/napi_rdb_predicates.cpp | 2 +- .../src}/napi_rdb_store.cpp | 31 +++-- .../src}/napi_rdb_store_helper.cpp | 46 +------ .../src}/napi_values_bucket.cpp | 47 ++++--- .../{native_rdb => napi_rdb}/test/BUILD.gn | 0 .../test/unittest/src/BUILD.gn | 0 .../src/RdbStoreDistributedJsunit.test.js | 0 .../src/RdbStoreResultSetJsunit.test.js | 0 .../RdbstoreChangeEncryptKeyJsunit.test.js | 0 .../unittest/src/RdbstoreDeleteJsunit.test.js | 0 .../unittest/src/RdbstoreInsertJsunit.test.js | 0 .../src/RdbstorePredicatesJoinJsunit.test.js | 2 +- .../src/RdbstorePredicatesJsunit.test.js | 0 .../src/RdbstoreRdbstoreJsunit.test.js | 0 .../src/RdbstoreStoreExcuteSqlJsunit.test.js | 0 .../src/RdbstoreTransactionJsunit.test.js | 0 .../unittest/src/RdbstoreUpdateJsunit.test.js | 0 .../test/unittest/src/config.json | 0 frameworks/jskitsimpl/napi_resultset/BUILD.gn | 58 +++++++++ .../include}/napi_result_set.h | 2 +- .../napi_resultset/src/entry_point.cpp | 48 +++++++ .../src}/napi_result_set.cpp | 7 +- .../jskitsimpl/native_preferences/common.h | 65 ---------- frameworks/jskitsimpl/native_rdb/common.h | 87 ------------- .../native_appdatafwk/include/shared_block.h | 2 +- interfaces/jskits/BUILD.gn | 121 ------------------ 64 files changed, 372 insertions(+), 407 deletions(-) rename frameworks/jskitsimpl/{native_dataability => common/include}/common.h (82%) rename frameworks/jskitsimpl/common/{ => include}/js_ability.h (94%) rename frameworks/jskitsimpl/common/{ => include}/js_utils.h (97%) rename frameworks/jskitsimpl/common/{ => include}/napi_async_proxy.h (99%) rename frameworks/jskitsimpl/common/{ => src}/js_ability.cpp (98%) rename frameworks/jskitsimpl/common/{ => src}/js_utils.cpp (98%) create mode 100644 frameworks/jskitsimpl/napi_dataability/BUILD.gn rename frameworks/jskitsimpl/{native_dataability => napi_dataability/include}/napi_data_ability_predicates.h (99%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability/include}/napi_predicates_utils.h (92%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability/src}/entry_point.cpp (100%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability/src}/napi_data_ability_predicates.cpp (99%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability/src}/napi_predicates_utils.cpp (93%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability}/test/BUILD.gn (100%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability}/test/unittest/src/BUILD.gn (100%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability}/test/unittest/src/DataAbilityPredicatesJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_dataability => napi_dataability}/test/unittest/src/config.json (100%) create mode 100644 frameworks/jskitsimpl/napi_preferences/BUILD.gn rename frameworks/jskitsimpl/{native_preferences => napi_preferences/include}/napi_preference.h (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences/include}/napi_preference_helper.h (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences/src}/entry_point.cpp (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences/src}/napi_preference.cpp (97%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences/src}/napi_preference_helper.cpp (93%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/BUILD.gn (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/unittest/src/BUILD.gn (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/unittest/src/StorageCallBackJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/unittest/src/StorageHelperJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/unittest/src/StoragePromiseJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/unittest/src/StorageSyncJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_preferences => napi_preferences}/test/unittest/src/config.json (100%) create mode 100644 frameworks/jskitsimpl/napi_rdb/BUILD.gn rename frameworks/jskitsimpl/{native_rdb => napi_rdb/include}/napi_rdb_predicates.h (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/include}/napi_rdb_store.h (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/include}/napi_rdb_store_helper.h (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/include}/napi_values_bucket.h (94%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/src}/entry_point.cpp (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/src}/napi_rdb_predicates.cpp (99%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/src}/napi_rdb_store.cpp (98%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/src}/napi_rdb_store_helper.cpp (89%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb/src}/napi_values_bucket.cpp (78%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/BUILD.gn (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/BUILD.gn (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbStoreDistributedJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbStoreResultSetJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreChangeEncryptKeyJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreDeleteJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreInsertJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js (99%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstorePredicatesJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreRdbstoreJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreTransactionJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/RdbstoreUpdateJsunit.test.js (100%) rename frameworks/jskitsimpl/{native_rdb => napi_rdb}/test/unittest/src/config.json (100%) create mode 100644 frameworks/jskitsimpl/napi_resultset/BUILD.gn rename frameworks/jskitsimpl/{native_rdb => napi_resultset/include}/napi_result_set.h (100%) create mode 100644 frameworks/jskitsimpl/napi_resultset/src/entry_point.cpp rename frameworks/jskitsimpl/{native_rdb => napi_resultset/src}/napi_result_set.cpp (99%) delete mode 100644 frameworks/jskitsimpl/native_preferences/common.h delete mode 100644 frameworks/jskitsimpl/native_rdb/common.h delete mode 100644 interfaces/jskits/BUILD.gn diff --git a/.gitignore b/.gitignore index 59759b86..28b4e73f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea/ .DS_Store *.iml +._* CMakeLists.txt cmake-build-debug diff --git a/bundle.json b/bundle.json index d9381967..13b31629 100644 --- a/bundle.json +++ b/bundle.json @@ -72,9 +72,10 @@ "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_preferences:native_preferences", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability", "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb", - "//foundation/distributeddatamgr/appdatamgr/interfaces/jskits:dataability", - "//foundation/distributeddatamgr/appdatamgr/interfaces/jskits:storage", - "//foundation/distributeddatamgr/appdatamgr/interfaces/jskits:rdb" + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_dataability:dataability", + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_preferences:storage", + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_resultset:resultset", + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_rdb:rdb" ], "inner_kits": [ { @@ -138,9 +139,9 @@ "//foundation/distributeddatamgr/appdatamgr/frameworks/innerkitsimpl/native_preferences/test:unittest", "//foundation/distributeddatamgr/appdatamgr/frameworks/innerkitsimpl/native_dataability/test:unittest", "//foundation/distributeddatamgr/appdatamgr/frameworks/innerkitsimpl/native_rdb/test:unittest", - "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/native_rdb/test:unittest", - "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/native_preferences/test:unittest", - "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/native_dataability/test:unittest" + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_rdb/test:unittest", + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_preferences/test:unittest", + "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/napi_dataability/test:unittest" ] } } diff --git a/frameworks/innerkitsimpl/native_preferences/src/preferences_impl.cpp b/frameworks/innerkitsimpl/native_preferences/src/preferences_impl.cpp index c46b8bc7..6676a1ad 100644 --- a/frameworks/innerkitsimpl/native_preferences/src/preferences_impl.cpp +++ b/frameworks/innerkitsimpl/native_preferences/src/preferences_impl.cpp @@ -15,7 +15,7 @@ #include "preferences_impl.h" -#include +#include #include #include diff --git a/frameworks/jskitsimpl/native_dataability/common.h b/frameworks/jskitsimpl/common/include/common.h similarity index 82% rename from frameworks/jskitsimpl/native_dataability/common.h rename to frameworks/jskitsimpl/common/include/common.h index 483d3ade..c0fde322 100644 --- a/frameworks/jskitsimpl/native_dataability/common.h +++ b/frameworks/jskitsimpl/common/include/common.h @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef DA_JSKIT_NAPI_COMMON_PREDICATES_H -#define DA_JSKIT_NAPI_COMMON_PREDICATES_H +#ifndef RDB_JSKIT_COMMON_H +#define RDB_JSKIT_COMMON_H #include #include @@ -21,15 +21,14 @@ #include "hilog/log.h" namespace OHOS { -namespace DataAbilityJsKit { -static const OHOS::HiviewDFX::HiLogLabel PREFIX_LABEL = { LOG_CORE, 0xD001650, "DataAbilityJsKit" }; - +namespace AppDataMgrJsKit { +static const OHOS::HiviewDFX::HiLogLabel PREFIX_LABEL = { LOG_CORE, 0xD001650, "AppDataMgrJsKit" }; #define LOG_DEBUG(...) ((void)OHOS::HiviewDFX::HiLog::Debug(PREFIX_LABEL, __VA_ARGS__)) #define LOG_INFO(...) ((void)OHOS::HiviewDFX::HiLog::Info(PREFIX_LABEL, __VA_ARGS__)) #define LOG_WARN(...) ((void)OHOS::HiviewDFX::HiLog::Warn(PREFIX_LABEL, __VA_ARGS__)) #define LOG_ERROR(...) ((void)OHOS::HiviewDFX::HiLog::Error(PREFIX_LABEL, __VA_ARGS__)) #define LOG_FATAL(...) ((void)OHOS::HiviewDFX::HiLog::Fatal(PREFIX_LABEL, __VA_ARGS__)) -} // namespace DataAbilityJsKit +} // namespace RdbJsKit } // namespace OHOS -#endif // DA_JSKIT_NAPI_COMMON_PREDICATES_H +#endif diff --git a/frameworks/jskitsimpl/common/js_ability.h b/frameworks/jskitsimpl/common/include/js_ability.h similarity index 94% rename from frameworks/jskitsimpl/common/js_ability.h rename to frameworks/jskitsimpl/common/include/js_ability.h index 01b0efc6..c203e182 100644 --- a/frameworks/jskitsimpl/common/js_ability.h +++ b/frameworks/jskitsimpl/common/include/js_ability.h @@ -23,13 +23,13 @@ #include "napi/native_node_api.h" namespace OHOS { -namespace JsKit { +namespace AppDataMgrJsKit { class JSAbility final { public: static std::string GetDatabaseDir(napi_env env); static std::string GetBundleName(napi_env env); }; -} // namespace JsKit +} // namespace AppDataMgrJsKit } // namespace OHOS #endif // DISTRIBUTEDDATAMGR_APPDATAMGR_JSABILITY_H diff --git a/frameworks/jskitsimpl/common/js_utils.h b/frameworks/jskitsimpl/common/include/js_utils.h similarity index 97% rename from frameworks/jskitsimpl/common/js_utils.h rename to frameworks/jskitsimpl/common/include/js_utils.h index 7012ed23..0ee95f26 100644 --- a/frameworks/jskitsimpl/common/js_utils.h +++ b/frameworks/jskitsimpl/common/include/js_utils.h @@ -24,7 +24,7 @@ #include "napi/native_node_api.h" namespace OHOS { -namespace JsKit { +namespace AppDataMgrJsKit { class JSUtils final { public: static constexpr int32_t DEFAULT_BUF_SIZE = 1024; @@ -42,7 +42,7 @@ public: static napi_value Convert2JSValue(napi_env env, double value); static napi_value Convert2JSValue(napi_env env, bool value); }; -} // namespace JsKit +} // namespace AppDataMgrJsKit } // namespace OHOS #endif // DISTRIBUTEDDATAMGR_APPDATAMGR_JSUTILS_H diff --git a/frameworks/jskitsimpl/common/napi_async_proxy.h b/frameworks/jskitsimpl/common/include/napi_async_proxy.h similarity index 99% rename from frameworks/jskitsimpl/common/napi_async_proxy.h rename to frameworks/jskitsimpl/common/include/napi_async_proxy.h index 243500d3..27a26bc8 100644 --- a/frameworks/jskitsimpl/common/napi_async_proxy.h +++ b/frameworks/jskitsimpl/common/include/napi_async_proxy.h @@ -22,7 +22,7 @@ #include "securec.h" namespace OHOS { -namespace JsKit { +namespace AppDataMgrJsKit { constexpr int MAX_INPUT_COUNT = 10; constexpr int OK = 0; constexpr int ERR = -1; @@ -165,6 +165,6 @@ public: private: T *asyncContext; }; -} // namespace JsKit +} // namespace AppDataMgrJsKit } // namespace OHOS #endif diff --git a/frameworks/jskitsimpl/common/js_ability.cpp b/frameworks/jskitsimpl/common/src/js_ability.cpp similarity index 98% rename from frameworks/jskitsimpl/common/js_ability.cpp rename to frameworks/jskitsimpl/common/src/js_ability.cpp index 96403fcd..fd94158b 100644 --- a/frameworks/jskitsimpl/common/js_ability.cpp +++ b/frameworks/jskitsimpl/common/src/js_ability.cpp @@ -24,7 +24,7 @@ #endif namespace OHOS { -namespace JsKit { +namespace AppDataMgrJsKit { static const OHOS::HiviewDFX::HiLogLabel PREFIX_LABEL = { LOG_CORE, 0xD001650, "JOHOS_JsKit_Ability" }; #define LOG_DEBUG(...) ((void)OHOS::HiviewDFX::HiLog::Debug(PREFIX_LABEL, __VA_ARGS__)) @@ -111,5 +111,5 @@ std::string JSAbility::GetDatabaseDir(napi_env env) return databaseDir; } #endif -} // namespace JsKit +} // namespace AppDataMgrJsKit } // namespace OHOS \ No newline at end of file diff --git a/frameworks/jskitsimpl/common/js_utils.cpp b/frameworks/jskitsimpl/common/src/js_utils.cpp similarity index 98% rename from frameworks/jskitsimpl/common/js_utils.cpp rename to frameworks/jskitsimpl/common/src/js_utils.cpp index 3e847aeb..d922ae18 100644 --- a/frameworks/jskitsimpl/common/js_utils.cpp +++ b/frameworks/jskitsimpl/common/src/js_utils.cpp @@ -18,7 +18,7 @@ #include "securec.h" namespace OHOS { -namespace JsKit { +namespace AppDataMgrJsKit { std::string JSUtils::Convert2String(napi_env env, napi_value jsStr, const size_t max) { NAPI_ASSERT_BASE(env, max > 0, "failed on max > 0", std::string()); @@ -173,5 +173,5 @@ napi_value JSUtils::Convert2JSValue(napi_env env, bool value) } return jsValue; } -} // namespace JsKit +} // namespace AppDataMgrJsKit } // namespace OHOS \ No newline at end of file diff --git a/frameworks/jskitsimpl/napi_dataability/BUILD.gn b/frameworks/jskitsimpl/napi_dataability/BUILD.gn new file mode 100644 index 00000000..6963cd31 --- /dev/null +++ b/frameworks/jskitsimpl/napi_dataability/BUILD.gn @@ -0,0 +1,51 @@ +# Copyright (c) 2022 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.gni") +import("//build/ohos/ace/ace.gni") + +ohos_copy("appdatamgr_declaration") { + sources = [ "./api" ] + outputs = [ target_out_dir + "/$target_name/" ] + module_source_dir = target_out_dir + "/$target_name" + module_install_name = "" +} + +ohos_shared_library("dataability") { + include_dirs = [ + "include", + "../common/include", + "../napi_rdb/include", + "//third_party/node/src", + "//utils/native/base/include", + ] + + sources = [ + "../common/src/js_utils.cpp", + "src/entry_point.cpp", + "src/napi_data_ability_predicates.cpp", + "src/napi_predicates_utils.cpp", + ] + + deps = [ "../napi_rdb:rdb" ] + + external_deps = [ + "hilog_native:libhilog", + "napi:ace_napi", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", + ] + + subsystem_name = "distributeddatamgr" + part_name = "native_appdatamgr" + relative_install_dir = "module/data" +} diff --git a/frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.h b/frameworks/jskitsimpl/napi_dataability/include/napi_data_ability_predicates.h similarity index 99% rename from frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.h rename to frameworks/jskitsimpl/napi_dataability/include/napi_data_ability_predicates.h index 525663a4..0f82d0ed 100644 --- a/frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.h +++ b/frameworks/jskitsimpl/napi_dataability/include/napi_data_ability_predicates.h @@ -24,7 +24,6 @@ namespace OHOS { namespace DataAbilityJsKit { - class DataAbilityPredicatesProxy { public: static void Init(napi_env env, napi_value exports); diff --git a/frameworks/jskitsimpl/native_dataability/napi_predicates_utils.h b/frameworks/jskitsimpl/napi_dataability/include/napi_predicates_utils.h similarity index 92% rename from frameworks/jskitsimpl/native_dataability/napi_predicates_utils.h rename to frameworks/jskitsimpl/napi_dataability/include/napi_predicates_utils.h index da80f9f6..11e8678b 100644 --- a/frameworks/jskitsimpl/native_dataability/napi_predicates_utils.h +++ b/frameworks/jskitsimpl/napi_dataability/include/napi_predicates_utils.h @@ -25,4 +25,4 @@ namespace DataAbilityJsKit { napi_value InitPredicatesUtils(napi_env env, napi_value info); } // namespace DataAbilityJsKit } // namespace OHOS -#endif //APPDATAMGR_NAPI_PREDICATES_UTILS_H +#endif // APPDATAMGR_NAPI_PREDICATES_UTILS_H diff --git a/frameworks/jskitsimpl/native_dataability/entry_point.cpp b/frameworks/jskitsimpl/napi_dataability/src/entry_point.cpp similarity index 100% rename from frameworks/jskitsimpl/native_dataability/entry_point.cpp rename to frameworks/jskitsimpl/napi_dataability/src/entry_point.cpp diff --git a/frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.cpp b/frameworks/jskitsimpl/napi_dataability/src/napi_data_ability_predicates.cpp similarity index 99% rename from frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.cpp rename to frameworks/jskitsimpl/napi_dataability/src/napi_data_ability_predicates.cpp index 7521f66c..89fa4f77 100644 --- a/frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.cpp +++ b/frameworks/jskitsimpl/napi_dataability/src/napi_data_ability_predicates.cpp @@ -20,7 +20,7 @@ #include "napi_async_proxy.h" using namespace OHOS::NativeRdb; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace DataAbilityJsKit { diff --git a/frameworks/jskitsimpl/native_dataability/napi_predicates_utils.cpp b/frameworks/jskitsimpl/napi_dataability/src/napi_predicates_utils.cpp similarity index 93% rename from frameworks/jskitsimpl/native_dataability/napi_predicates_utils.cpp rename to frameworks/jskitsimpl/napi_dataability/src/napi_predicates_utils.cpp index 44d55e20..18244c30 100644 --- a/frameworks/jskitsimpl/native_dataability/napi_predicates_utils.cpp +++ b/frameworks/jskitsimpl/napi_dataability/src/napi_predicates_utils.cpp @@ -21,6 +21,8 @@ #include "napi_rdb_predicates.h" #include "predicates_utils.h" +using namespace OHOS::AppDataMgrJsKit; + namespace OHOS { namespace DataAbilityJsKit { napi_value CreateRdbPredicates(napi_env env, napi_callback_info info) @@ -35,7 +37,7 @@ napi_value CreateRdbPredicates(napi_env env, napi_callback_info info) napi_valuetype valueType; NAPI_CALL(env, napi_typeof(env, args[0], &valueType)); NAPI_ASSERT(env, valueType == napi_string, "Table name should be a string."); - std::string tableName = JsKit::JSUtils::Convert2String(env, args[0], JsKit::JSUtils::DEFAULT_BUF_SIZE); + std::string tableName = JSUtils::Convert2String(env, args[0], JSUtils::DEFAULT_BUF_SIZE); NAPI_CALL(env, napi_typeof(env, args[1], &valueType)); NAPI_ASSERT(env, valueType == napi_object, "Table name should be an object."); diff --git a/frameworks/jskitsimpl/native_dataability/test/BUILD.gn b/frameworks/jskitsimpl/napi_dataability/test/BUILD.gn similarity index 100% rename from frameworks/jskitsimpl/native_dataability/test/BUILD.gn rename to frameworks/jskitsimpl/napi_dataability/test/BUILD.gn diff --git a/frameworks/jskitsimpl/native_dataability/test/unittest/src/BUILD.gn b/frameworks/jskitsimpl/napi_dataability/test/unittest/src/BUILD.gn similarity index 100% rename from frameworks/jskitsimpl/native_dataability/test/unittest/src/BUILD.gn rename to frameworks/jskitsimpl/napi_dataability/test/unittest/src/BUILD.gn diff --git a/frameworks/jskitsimpl/native_dataability/test/unittest/src/DataAbilityPredicatesJsunit.test.js b/frameworks/jskitsimpl/napi_dataability/test/unittest/src/DataAbilityPredicatesJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_dataability/test/unittest/src/DataAbilityPredicatesJsunit.test.js rename to frameworks/jskitsimpl/napi_dataability/test/unittest/src/DataAbilityPredicatesJsunit.test.js diff --git a/frameworks/jskitsimpl/native_dataability/test/unittest/src/config.json b/frameworks/jskitsimpl/napi_dataability/test/unittest/src/config.json similarity index 100% rename from frameworks/jskitsimpl/native_dataability/test/unittest/src/config.json rename to frameworks/jskitsimpl/napi_dataability/test/unittest/src/config.json diff --git a/frameworks/jskitsimpl/napi_preferences/BUILD.gn b/frameworks/jskitsimpl/napi_preferences/BUILD.gn new file mode 100644 index 00000000..2eb0b9fc --- /dev/null +++ b/frameworks/jskitsimpl/napi_preferences/BUILD.gn @@ -0,0 +1,46 @@ +# Copyright (c) 2022 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.gni") +import("//build/ohos/ace/ace.gni") + +ohos_copy("appdatamgr_declaration") { + sources = [ "./api" ] + outputs = [ target_out_dir + "/$target_name/" ] + module_source_dir = target_out_dir + "/$target_name" + module_install_name = "" +} + +ohos_shared_library("storage") { + include_dirs = [ + "include", + "../common/include", + "//third_party/node/src", + "//utils/native/base/include", + ] + + sources = [ + "src/entry_point.cpp", + "src/napi_preference.cpp", + "src/napi_preference_helper.cpp", + ] + + external_deps = [ + "hilog_native:libhilog", + "napi:ace_napi", + "native_appdatamgr:native_preferences", + ] + + subsystem_name = "distributeddatamgr" + part_name = "native_appdatamgr" + relative_install_dir = "module/data" +} diff --git a/frameworks/jskitsimpl/native_preferences/napi_preference.h b/frameworks/jskitsimpl/napi_preferences/include/napi_preference.h similarity index 100% rename from frameworks/jskitsimpl/native_preferences/napi_preference.h rename to frameworks/jskitsimpl/napi_preferences/include/napi_preference.h diff --git a/frameworks/jskitsimpl/native_preferences/napi_preference_helper.h b/frameworks/jskitsimpl/napi_preferences/include/napi_preference_helper.h similarity index 100% rename from frameworks/jskitsimpl/native_preferences/napi_preference_helper.h rename to frameworks/jskitsimpl/napi_preferences/include/napi_preference_helper.h diff --git a/frameworks/jskitsimpl/native_preferences/entry_point.cpp b/frameworks/jskitsimpl/napi_preferences/src/entry_point.cpp similarity index 100% rename from frameworks/jskitsimpl/native_preferences/entry_point.cpp rename to frameworks/jskitsimpl/napi_preferences/src/entry_point.cpp diff --git a/frameworks/jskitsimpl/native_preferences/napi_preference.cpp b/frameworks/jskitsimpl/napi_preferences/src/napi_preference.cpp similarity index 97% rename from frameworks/jskitsimpl/native_preferences/napi_preference.cpp rename to frameworks/jskitsimpl/napi_preferences/src/napi_preference.cpp index eb29e4fb..59680a6c 100644 --- a/frameworks/jskitsimpl/native_preferences/napi_preference.cpp +++ b/frameworks/jskitsimpl/napi_preferences/src/napi_preference.cpp @@ -15,20 +15,21 @@ #include "napi_preference.h" +#include + #include #include #include -#include -#include "securec.h" -#include "common.h" +#include "common.h" +#include "napi_async_proxy.h" #include "preferences.h" #include "preferences_errno.h" #include "preferences_value.h" -#include "napi_async_proxy.h" +#include "securec.h" using namespace OHOS::NativePreferences; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace PreferencesJsKit { diff --git a/frameworks/jskitsimpl/native_preferences/napi_preference_helper.cpp b/frameworks/jskitsimpl/napi_preferences/src/napi_preference_helper.cpp similarity index 93% rename from frameworks/jskitsimpl/native_preferences/napi_preference_helper.cpp rename to frameworks/jskitsimpl/napi_preferences/src/napi_preference_helper.cpp index 393aa193..8ac4e535 100644 --- a/frameworks/jskitsimpl/native_preferences/napi_preference_helper.cpp +++ b/frameworks/jskitsimpl/napi_preferences/src/napi_preference_helper.cpp @@ -13,16 +13,18 @@ * limitations under the License. */ #include "napi_preference_helper.h" + +#include #include + +#include "common.h" +#include "napi_async_proxy.h" +#include "napi_preference.h" +#include "preferences_errno.h" #include "securec.h" -#include "napi_preference.h" -#include "common.h" -#include "preferences_errno.h" -#include "napi_async_proxy.h" - using namespace OHOS::NativePreferences; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace PreferencesJsKit { @@ -118,7 +120,7 @@ napi_value DeleteStorageSync(napi_env env, napi_callback_info info) int errCode = PreferencesHelper::DeletePreferences(path); if (errCode != E_OK) { LOG_ERROR("deleteStorage failed %{public}d", errCode); - napi_throw_error(env, GetErrStr(errCode), "deleteStorage failed"); + napi_throw_error(env, std::to_string(errCode).c_str(), "deleteStorage failed"); } LOG_DEBUG("deleteStorage end"); @@ -159,7 +161,7 @@ napi_value RemoveStorageFromCacheSync(napi_env env, napi_callback_info info) int errCode = PreferencesHelper::RemovePreferencesFromCache(path); if (errCode != E_OK) { LOG_ERROR("removeStorageFromCache failed %{public}d", errCode); - napi_throw_error(env, GetErrStr(errCode), "removeStorageFromCache failed"); + napi_throw_error(env, std::to_string(errCode).c_str(), "removeStorageFromCache failed"); } LOG_DEBUG("removeStorageFromCache end"); diff --git a/frameworks/jskitsimpl/native_preferences/test/BUILD.gn b/frameworks/jskitsimpl/napi_preferences/test/BUILD.gn similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/BUILD.gn rename to frameworks/jskitsimpl/napi_preferences/test/BUILD.gn diff --git a/frameworks/jskitsimpl/native_preferences/test/unittest/src/BUILD.gn b/frameworks/jskitsimpl/napi_preferences/test/unittest/src/BUILD.gn similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/unittest/src/BUILD.gn rename to frameworks/jskitsimpl/napi_preferences/test/unittest/src/BUILD.gn diff --git a/frameworks/jskitsimpl/native_preferences/test/unittest/src/StorageCallBackJsunit.test.js b/frameworks/jskitsimpl/napi_preferences/test/unittest/src/StorageCallBackJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/unittest/src/StorageCallBackJsunit.test.js rename to frameworks/jskitsimpl/napi_preferences/test/unittest/src/StorageCallBackJsunit.test.js diff --git a/frameworks/jskitsimpl/native_preferences/test/unittest/src/StorageHelperJsunit.test.js b/frameworks/jskitsimpl/napi_preferences/test/unittest/src/StorageHelperJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/unittest/src/StorageHelperJsunit.test.js rename to frameworks/jskitsimpl/napi_preferences/test/unittest/src/StorageHelperJsunit.test.js diff --git a/frameworks/jskitsimpl/native_preferences/test/unittest/src/StoragePromiseJsunit.test.js b/frameworks/jskitsimpl/napi_preferences/test/unittest/src/StoragePromiseJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/unittest/src/StoragePromiseJsunit.test.js rename to frameworks/jskitsimpl/napi_preferences/test/unittest/src/StoragePromiseJsunit.test.js diff --git a/frameworks/jskitsimpl/native_preferences/test/unittest/src/StorageSyncJsunit.test.js b/frameworks/jskitsimpl/napi_preferences/test/unittest/src/StorageSyncJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/unittest/src/StorageSyncJsunit.test.js rename to frameworks/jskitsimpl/napi_preferences/test/unittest/src/StorageSyncJsunit.test.js diff --git a/frameworks/jskitsimpl/native_preferences/test/unittest/src/config.json b/frameworks/jskitsimpl/napi_preferences/test/unittest/src/config.json similarity index 100% rename from frameworks/jskitsimpl/native_preferences/test/unittest/src/config.json rename to frameworks/jskitsimpl/napi_preferences/test/unittest/src/config.json diff --git a/frameworks/jskitsimpl/napi_rdb/BUILD.gn b/frameworks/jskitsimpl/napi_rdb/BUILD.gn new file mode 100644 index 00000000..0c87d1f4 --- /dev/null +++ b/frameworks/jskitsimpl/napi_rdb/BUILD.gn @@ -0,0 +1,71 @@ +# Copyright (c) 2022 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.gni") +import("//build/ohos/ace/ace.gni") + +ohos_copy("appdatamgr_declaration") { + sources = [ "./api" ] + outputs = [ target_out_dir + "/$target_name/" ] + module_source_dir = target_out_dir + "/$target_name" + module_install_name = "" +} + +ohos_shared_library("rdb") { + include_dirs = [ + "include", + "../common/include", + "../napi_resultset/include", + "//third_party/node/src", + "//utils/native/base/include", + ] + + sources = [ + "../common/src/js_ability.cpp", + "../common/src/js_utils.cpp", + "src/entry_point.cpp", + "src/napi_rdb_predicates.cpp", + "src/napi_rdb_store.cpp", + "src/napi_rdb_store_helper.cpp", + "src/napi_values_bucket.cpp", + ] + + deps = [ + "../napi_resultset:resultset", + "//utils/native/base:utils", + ] + + external_deps = [ + "hilog_native:libhilog", + "napi:ace_napi", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_rdb", + ] + + if (is_standard_system) { + defines = [ "STANDARD_SYSTEM_ENABLE" ] + + deps += [ "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native" ] + + external_deps += [ + "ability_runtime:ability_manager", + "ability_runtime:app_manager", + "ability_runtime:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + ] + } + + subsystem_name = "distributeddatamgr" + part_name = "native_appdatamgr" + relative_install_dir = "module/data" +} diff --git a/frameworks/jskitsimpl/native_rdb/napi_rdb_predicates.h b/frameworks/jskitsimpl/napi_rdb/include/napi_rdb_predicates.h similarity index 100% rename from frameworks/jskitsimpl/native_rdb/napi_rdb_predicates.h rename to frameworks/jskitsimpl/napi_rdb/include/napi_rdb_predicates.h diff --git a/frameworks/jskitsimpl/native_rdb/napi_rdb_store.h b/frameworks/jskitsimpl/napi_rdb/include/napi_rdb_store.h similarity index 100% rename from frameworks/jskitsimpl/native_rdb/napi_rdb_store.h rename to frameworks/jskitsimpl/napi_rdb/include/napi_rdb_store.h diff --git a/frameworks/jskitsimpl/native_rdb/napi_rdb_store_helper.h b/frameworks/jskitsimpl/napi_rdb/include/napi_rdb_store_helper.h similarity index 100% rename from frameworks/jskitsimpl/native_rdb/napi_rdb_store_helper.h rename to frameworks/jskitsimpl/napi_rdb/include/napi_rdb_store_helper.h diff --git a/frameworks/jskitsimpl/native_rdb/napi_values_bucket.h b/frameworks/jskitsimpl/napi_rdb/include/napi_values_bucket.h similarity index 94% rename from frameworks/jskitsimpl/native_rdb/napi_values_bucket.h rename to frameworks/jskitsimpl/napi_rdb/include/napi_values_bucket.h index 8501c112..a67d08b2 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_values_bucket.h +++ b/frameworks/jskitsimpl/napi_rdb/include/napi_values_bucket.h @@ -27,4 +27,4 @@ __attribute__((visibility("default"))) napi_value NAPI_OHOS_Data_RdbJsKit_Values __attribute__((visibility("default"))) OHOS::NativeRdb::ValuesBucket * NAPI_OHOS_Data_RdbJsKit_ValuesBucketProxy_GetNativeObject(napi_env env, napi_value &value); EXTERN_C_END -#endif //APPDATAMGR_NAPI_VALUES_BUCKET_H +#endif // APPDATAMGR_NAPI_VALUES_BUCKET_H diff --git a/frameworks/jskitsimpl/native_rdb/entry_point.cpp b/frameworks/jskitsimpl/napi_rdb/src/entry_point.cpp similarity index 100% rename from frameworks/jskitsimpl/native_rdb/entry_point.cpp rename to frameworks/jskitsimpl/napi_rdb/src/entry_point.cpp index 91f6e0f9..2ae917ea 100644 --- a/frameworks/jskitsimpl/native_rdb/entry_point.cpp +++ b/frameworks/jskitsimpl/napi_rdb/src/entry_point.cpp @@ -13,11 +13,11 @@ * limitations under the License. */ -#include "napi/native_api.h" -#include "napi/native_node_api.h" #include "napi_rdb_predicates.h" #include "napi_rdb_store.h" #include "napi_rdb_store_helper.h" +#include "napi/native_api.h" +#include "napi/native_node_api.h" using namespace OHOS::RdbJsKit; diff --git a/frameworks/jskitsimpl/native_rdb/napi_rdb_predicates.cpp b/frameworks/jskitsimpl/napi_rdb/src/napi_rdb_predicates.cpp similarity index 99% rename from frameworks/jskitsimpl/native_rdb/napi_rdb_predicates.cpp rename to frameworks/jskitsimpl/napi_rdb/src/napi_rdb_predicates.cpp index a9f4097e..775d57c3 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_rdb_predicates.cpp +++ b/frameworks/jskitsimpl/napi_rdb/src/napi_rdb_predicates.cpp @@ -20,7 +20,7 @@ #include "napi_async_proxy.h" using namespace OHOS::NativeRdb; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace RdbJsKit { diff --git a/frameworks/jskitsimpl/native_rdb/napi_rdb_store.cpp b/frameworks/jskitsimpl/napi_rdb/src/napi_rdb_store.cpp similarity index 98% rename from frameworks/jskitsimpl/native_rdb/napi_rdb_store.cpp rename to frameworks/jskitsimpl/napi_rdb/src/napi_rdb_store.cpp index 8639342c..dee93638 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_rdb_store.cpp +++ b/frameworks/jskitsimpl/napi_rdb/src/napi_rdb_store.cpp @@ -14,16 +14,19 @@ */ #include "napi_rdb_store.h" -#include + +#include + #include "common.h" #include "js_utils.h" #include "napi_async_proxy.h" #include "napi_rdb_predicates.h" #include "napi_result_set.h" +#include "rdb_errno.h" #include "securec.h" using namespace OHOS::NativeRdb; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace RdbJsKit { @@ -89,19 +92,19 @@ void RdbStoreContext::BindArgs(napi_env env, napi_value arg) napi_typeof(env, element, &type); switch (type) { case napi_boolean: { - bool value; - napi_status status = napi_get_value_bool(env, element, &value); - if (status == napi_ok) { - bindArgs.push_back(ValueObject(value)); - } - } break; + bool value; + napi_status status = napi_get_value_bool(env, element, &value); + if (status == napi_ok) { + bindArgs.push_back(ValueObject(value)); + } + } break; case napi_number: { - double value; - napi_status status = napi_get_value_double(env, element, &value); - if (status == napi_ok) { - bindArgs.push_back(ValueObject(value)); - } - } break; + double value; + napi_status status = napi_get_value_double(env, element, &value); + if (status == napi_ok) { + bindArgs.push_back(ValueObject(value)); + } + } break; case napi_null: bindArgs.push_back(ValueObject()); break; diff --git a/frameworks/jskitsimpl/native_rdb/napi_rdb_store_helper.cpp b/frameworks/jskitsimpl/napi_rdb/src/napi_rdb_store_helper.cpp similarity index 89% rename from frameworks/jskitsimpl/native_rdb/napi_rdb_store_helper.cpp rename to frameworks/jskitsimpl/napi_rdb/src/napi_rdb_store_helper.cpp index bb18b69c..47be5976 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_rdb_store_helper.cpp +++ b/frameworks/jskitsimpl/napi_rdb/src/napi_rdb_store_helper.cpp @@ -28,7 +28,7 @@ #include "unistd.h" using namespace OHOS::NativeRdb; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace RdbJsKit { @@ -259,50 +259,6 @@ void ParseStoreConfig(const napi_env &env, const napi_value &object, HelperRdbCo LOG_DEBUG("ParseStoreConfig name=%{public}s", name.c_str()); asyncContext->config.SetName(std::move(name)); - value = nullptr; - napi_get_named_property(env, object, "storageMode", &value); - if (value != nullptr) { - int32_t mode = 0; - napi_status status = napi_get_value_int32(env, value, &mode); - if (status == napi_ok) { - StorageMode storageMode = StorageMode(mode); - asyncContext->config.SetStorageMode(storageMode); - LOG_DEBUG("ParseStoreConfig storageMode=%{public}d", mode); - } - } - - value = nullptr; - napi_get_named_property(env, object, "readOnly", &value); - if (value != nullptr) { - bool readOnly = true; - napi_status status = napi_get_value_bool(env, value, &readOnly); - if (status == napi_ok) { - asyncContext->config.SetReadOnly(readOnly); - LOG_DEBUG("ParseStoreConfig SetReadOnly=%{public}d", readOnly); - } - } - - value = nullptr; - napi_get_named_property(env, object, "fileType", &value); - if (value != nullptr) { - int32_t mode = 0; - napi_status status = napi_get_value_int32(env, value, &mode); - if (status == napi_ok) { - asyncContext->config.SetDatabaseFileType(DatabaseFileType(mode)); - LOG_DEBUG("ParseStoreConfig fileType=%{public}d", mode); - } - } - - value = nullptr; - napi_get_named_property(env, object, "journalMode", &value); - if (value != nullptr) { - int32_t mode = 0; - napi_status status = napi_get_value_int32(env, value, &mode); - if (status == napi_ok) { - asyncContext->config.SetJournalMode(static_cast(mode)); - LOG_DEBUG("ParseStoreConfig journalMode=%{public}d", mode); - } - } value = nullptr; napi_get_named_property(env, object, "encryptKey", &value); if (value != nullptr) { diff --git a/frameworks/jskitsimpl/native_rdb/napi_values_bucket.cpp b/frameworks/jskitsimpl/napi_rdb/src/napi_values_bucket.cpp similarity index 78% rename from frameworks/jskitsimpl/native_rdb/napi_values_bucket.cpp rename to frameworks/jskitsimpl/napi_rdb/src/napi_values_bucket.cpp index 30c0e832..3d8c81e4 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_values_bucket.cpp +++ b/frameworks/jskitsimpl/napi_rdb/src/napi_values_bucket.cpp @@ -19,8 +19,7 @@ #include "js_utils.h" #include "value_object.h" -using namespace OHOS::JsKit; -using namespace OHOS::RdbJsKit; +using namespace OHOS::AppDataMgrJsKit; using namespace OHOS::NativeRdb; __attribute__((visibility("default"))) napi_value NAPI_OHOS_Data_RdbJsKit_ValuesBucketProxy_NewInstance( @@ -37,33 +36,33 @@ __attribute__((visibility("default"))) napi_value NAPI_OHOS_Data_RdbJsKit_Values napi_value value = nullptr; switch (valueObject.GetType()) { case ValueObjectType::TYPE_NULL: { - value = nullptr; - } break; + value = nullptr; + } break; case ValueObjectType::TYPE_INT: { - int64_t intVal = 0; - valueObject.GetLong(intVal); - value = JSUtils::Convert2JSValue(env, intVal); - } break; + int64_t intVal = 0; + valueObject.GetLong(intVal); + value = JSUtils::Convert2JSValue(env, intVal); + } break; case ValueObjectType::TYPE_DOUBLE: { - double doubleVal = 0L; - valueObject.GetDouble(doubleVal); - value = JSUtils::Convert2JSValue(env, doubleVal); - } break; + double doubleVal = 0L; + valueObject.GetDouble(doubleVal); + value = JSUtils::Convert2JSValue(env, doubleVal); + } break; case ValueObjectType::TYPE_BLOB: { - std::vector blobVal; - valueObject.GetBlob(blobVal); - value = JSUtils::Convert2JSValue(env, blobVal); - } break; + std::vector blobVal; + valueObject.GetBlob(blobVal); + value = JSUtils::Convert2JSValue(env, blobVal); + } break; case ValueObjectType::TYPE_BOOL: { - bool boolVal = false; - valueObject.GetBool(boolVal); - value = JSUtils::Convert2JSValue(env, boolVal); - } break; + bool boolVal = false; + valueObject.GetBool(boolVal); + value = JSUtils::Convert2JSValue(env, boolVal); + } break; default: { - std::string strVal = ""; - valueObject.GetString(strVal); - value = JSUtils::Convert2JSValue(env, strVal); - } break; + std::string strVal = ""; + valueObject.GetString(strVal); + value = JSUtils::Convert2JSValue(env, strVal); + } break; } NAPI_CALL(env, napi_set_named_property(env, ret, key.c_str(), value)); } diff --git a/frameworks/jskitsimpl/native_rdb/test/BUILD.gn b/frameworks/jskitsimpl/napi_rdb/test/BUILD.gn similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/BUILD.gn rename to frameworks/jskitsimpl/napi_rdb/test/BUILD.gn diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/BUILD.gn b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/BUILD.gn similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/BUILD.gn rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/BUILD.gn diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbStoreDistributedJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbStoreDistributedJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbStoreDistributedJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbStoreDistributedJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbStoreResultSetJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbStoreResultSetJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbStoreResultSetJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbStoreResultSetJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreChangeEncryptKeyJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreChangeEncryptKeyJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreChangeEncryptKeyJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreChangeEncryptKeyJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreDeleteJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreDeleteJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreDeleteJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreDeleteJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreInsertJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreInsertJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreInsertJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreInsertJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js similarity index 99% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js index 4fb71a02..057d126f 100644 --- a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js +++ b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstorePredicatesJoinJsunit.test.js @@ -190,4 +190,4 @@ describe('rdbStorePredicatesJoinTest', function () { }) console.log(TAG + "*************Unit Test End*************"); -}) +}) \ No newline at end of file diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstorePredicatesJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstorePredicatesJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstorePredicatesJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstorePredicatesJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreRdbstoreJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreRdbstoreJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreRdbstoreJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreRdbstoreJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreStoreExcuteSqlJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreTransactionJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreTransactionJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreTransactionJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreTransactionJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreUpdateJsunit.test.js b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreUpdateJsunit.test.js similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/RdbstoreUpdateJsunit.test.js rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/RdbstoreUpdateJsunit.test.js diff --git a/frameworks/jskitsimpl/native_rdb/test/unittest/src/config.json b/frameworks/jskitsimpl/napi_rdb/test/unittest/src/config.json similarity index 100% rename from frameworks/jskitsimpl/native_rdb/test/unittest/src/config.json rename to frameworks/jskitsimpl/napi_rdb/test/unittest/src/config.json diff --git a/frameworks/jskitsimpl/napi_resultset/BUILD.gn b/frameworks/jskitsimpl/napi_resultset/BUILD.gn new file mode 100644 index 00000000..5c7c6fea --- /dev/null +++ b/frameworks/jskitsimpl/napi_resultset/BUILD.gn @@ -0,0 +1,58 @@ +# Copyright (c) 2022 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.gni") +import("//build/ohos/ace/ace.gni") + +ohos_copy("appdatamgr_declaration") { + sources = [ "./api" ] + outputs = [ target_out_dir + "/$target_name/" ] + module_source_dir = target_out_dir + "/$target_name" + module_install_name = "" +} + +ohos_shared_library("resultset") { + include_dirs = [ + "include", + "../common/include", + "//third_party/node/src", + "//utils/native/base/include", + ] + + sources = [ + "../common/src/js_utils.cpp", + "src/entry_point.cpp", + "src/napi_result_set.cpp", + ] + + deps = [ "//utils/native/base:utils" ] + + external_deps = [ + "hilog_native:libhilog", + "napi:ace_napi", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_rdb", + ] + + if (is_standard_system) { + defines = [ "STANDARD_SYSTEM_ENABLE" ] + + external_deps += [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + ] + } + + subsystem_name = "distributeddatamgr" + part_name = "native_appdatamgr" + relative_install_dir = "module/data" +} diff --git a/frameworks/jskitsimpl/native_rdb/napi_result_set.h b/frameworks/jskitsimpl/napi_resultset/include/napi_result_set.h similarity index 100% rename from frameworks/jskitsimpl/native_rdb/napi_result_set.h rename to frameworks/jskitsimpl/napi_resultset/include/napi_result_set.h index 867add16..13770a2a 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_result_set.h +++ b/frameworks/jskitsimpl/napi_resultset/include/napi_result_set.h @@ -33,10 +33,10 @@ public: static napi_value NewInstance(napi_env env, std::shared_ptr resultSet); static std::shared_ptr GetNativePredicates( const napi_env &env, const napi_value &arg); + static napi_value GetConstructor(napi_env env); private: static std::shared_ptr &GetInnerResultSet(napi_env env, napi_callback_info info); - static napi_value GetConstructor(napi_env env); static napi_value Initialize(napi_env env, napi_callback_info info); static napi_value GetAllColumnNames(napi_env env, napi_callback_info info); static napi_value GoToRow(napi_env env, napi_callback_info info); diff --git a/frameworks/jskitsimpl/napi_resultset/src/entry_point.cpp b/frameworks/jskitsimpl/napi_resultset/src/entry_point.cpp new file mode 100644 index 00000000..27bd5037 --- /dev/null +++ b/frameworks/jskitsimpl/napi_resultset/src/entry_point.cpp @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2021 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. + */ + +#include "napi_result_set.h" + +EXTERN_C_START +/* + * function for module exports + */ +static napi_value Init(napi_env env, napi_value exports) +{ + OHOS::RdbJsKit::ResultSetProxy::GetConstructor(env); + return exports; +} +EXTERN_C_END + +/* + * Module define + */ +static napi_module _module = { + .nm_version = 1, + .nm_flags = 0, + .nm_filename = nullptr, + .nm_register_func = Init, + .nm_modname = "data.resultSet", + .nm_priv = ((void *)0), + .reserved = { 0 } +}; + +/* + * Module register function + */ +static __attribute__((constructor)) void RegisterModule(void) +{ + napi_module_register(&_module); +} diff --git a/frameworks/jskitsimpl/native_rdb/napi_result_set.cpp b/frameworks/jskitsimpl/napi_resultset/src/napi_result_set.cpp similarity index 99% rename from frameworks/jskitsimpl/native_rdb/napi_result_set.cpp rename to frameworks/jskitsimpl/napi_resultset/src/napi_result_set.cpp index e7d08001..f03e3d43 100644 --- a/frameworks/jskitsimpl/native_rdb/napi_result_set.cpp +++ b/frameworks/jskitsimpl/napi_resultset/src/napi_result_set.cpp @@ -14,21 +14,22 @@ */ #include "napi_result_set.h" + #include -#include "message_parcel.h" -#include "abs_shared_result_set.h" #include "common.h" +#include "abs_shared_result_set.h" #include "js_utils.h" #include "napi_async_proxy.h" #include "string_ex.h" using namespace OHOS::NativeRdb; -using namespace OHOS::JsKit; +using namespace OHOS::AppDataMgrJsKit; namespace OHOS { namespace RdbJsKit { static napi_ref __thread ctorRef_ = nullptr; +static const int E_OK = 0; napi_value ResultSetProxy::NewInstance(napi_env env, std::shared_ptr resultSet) { napi_value cons = GetConstructor(env); diff --git a/frameworks/jskitsimpl/native_preferences/common.h b/frameworks/jskitsimpl/native_preferences/common.h deleted file mode 100644 index 78b9c08c..00000000 --- a/frameworks/jskitsimpl/native_preferences/common.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2021 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. - */ -#ifndef PREFERENCES_JSKIT_COMMON_H -#define PREFERENCES_JSKIT_COMMON_H - -#include -#include - -#include "hilog/log.h" -#include "preferences_errno.h" - -namespace OHOS { -namespace PreferencesJsKit { -static const OHOS::HiviewDFX::HiLogLabel PREFIX_LABEL = { LOG_CORE, 0xD001650, "PreferencesJsKit" }; - -#define LOG_DEBUG(...) ((void)OHOS::HiviewDFX::HiLog::Debug(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_INFO(...) ((void)OHOS::HiviewDFX::HiLog::Info(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_WARN(...) ((void)OHOS::HiviewDFX::HiLog::Warn(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_ERROR(...) ((void)OHOS::HiviewDFX::HiLog::Error(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_FATAL(...) ((void)OHOS::HiviewDFX::HiLog::Fatal(PREFIX_LABEL, __VA_ARGS__)) - -static const std::vector ERR_INFO { - "E_ERROR", - "E_STALE", - "E_INVALID_ARGS", - "E_OUT_OF_MEMORY", - "E_NOT_PERMIT", - "E_KEY_EMPTY", - "E_KEY_EXCEED_MAX_LENGTH", - "E_PTR_EXIST_ANOTHER_HOLD", - "E_DELETE_FILE_FAIL", - "E_EMPTY_FILE_PATH", - "E_RELATIVE_PATH", - "E_EMPTY_FILE_NAME", - "E_INVALID_FILE_PATH", - "E_PATH_EXCEED_MAX_LENGTH" -}; - -static inline const char *GetErrStr(int err) -{ - if (err == OHOS::NativePreferences::E_OK) { - return nullptr; - } - size_t index = err - OHOS::NativePreferences::E_BASE - 1; - if (index >= ERR_INFO.size() || index < 0) { - return "Unknown error"; - } - return ERR_INFO.at(index).c_str(); -} -} // namespace PreferencesJsKit -} // namespace OHOS - -#endif diff --git a/frameworks/jskitsimpl/native_rdb/common.h b/frameworks/jskitsimpl/native_rdb/common.h deleted file mode 100644 index a36a7f59..00000000 --- a/frameworks/jskitsimpl/native_rdb/common.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2021 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. - */ -#ifndef RDB_JSKIT_COMMON_H -#define RDB_JSKIT_COMMON_H - -#include -#include - -#include "hilog/log.h" -#include "rdb_errno.h" - -namespace OHOS { -namespace RdbJsKit { -static const OHOS::HiviewDFX::HiLogLabel PREFIX_LABEL = { LOG_CORE, 0xD001650, "RdbJsKit" }; - -#define LOG_DEBUG(...) ((void)OHOS::HiviewDFX::HiLog::Debug(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_INFO(...) ((void)OHOS::HiviewDFX::HiLog::Info(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_WARN(...) ((void)OHOS::HiviewDFX::HiLog::Warn(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_ERROR(...) ((void)OHOS::HiviewDFX::HiLog::Error(PREFIX_LABEL, __VA_ARGS__)) -#define LOG_FATAL(...) ((void)OHOS::HiviewDFX::HiLog::Fatal(PREFIX_LABEL, __VA_ARGS__)) - -static const std::vector ERR_INFO { - "E_ERROR", - "E_CANNOT_UPDATE_READONLY", - "E_REMOVE_FILE", - "E_EMPTY_FILE_NAME", - "E_EMPTY_TABLE_NAME", - "E_EMPTY_VALUES_BUCKET", - "E_INVALID_STATEMENT", - "E_INVALID_COLUMN_INDEX", - "E_INVALID_COLUMN_TYPE", - "E_INVALID_COLUMN_NAME", - "E_QUERY_IN_EXECUTE", - "E_TRANSACTION_IN_EXECUTE", - "E_EXECUTE_IN_STEP_QUERY", - "E_EXECUTE_WRITE_IN_READ_CONNECTION", - "E_BEGIN_TRANSACTION_IN_READ_CONNECTION", - "E_NO_TRANSACTION_IN_SESSION", - "E_MORE_STEP_QUERY_IN_ONE_SESSION", - "E_NO_ROW_IN_QUERY", - "E_INVALID_BIND_ARGS_COUNT", - "E_INVALID_OBJECT_TYPE", - "E_INVALID_CONFLICT_FLAG", - "E_HAVING_CLAUSE_NOT_IN_GROUP_BY", - "E_NOT_SUPPORTED_BY_STEP_RESULT_SET", - "E_STEP_RESULT_SET_CROSS_THREADS", - "E_STEP_RESULT_QUERY_NOT_EXECUTED", - "E_STEP_RESULT_IS_AFTER_LAST", - "E_STEP_RESULT_QUERY_EXCEEDED", - "E_STATEMENT_NOT_PREPARED", - "E_EXECUTE_RESULT_INCORRECT", - "E_STEP_RESULT_CLOSED", - "E_RELATIVE_PATH", - "E_EMPTY_NEW_ENCRYPT_KEY", - "E_CHANGE_UNENCRYPTED_TO_ENCRYPTED", - "E_CHANGE_ENCRYPT_KEY_IN_BUSY", - "E_STEP_STATEMENT_NOT_INIT", - "E_NOT_SUPPORTED_ATTACH_IN_WAL_MODE" -}; - -static inline const char *GetErrStr(int err) -{ - if (err == OHOS::NativeRdb::E_OK) { - return nullptr; - } - size_t index = err - OHOS::NativeRdb::E_BASE - 1; - if (index >= ERR_INFO.size() || index < 0) { - return "Unkown error"; - } - return ERR_INFO.at(index).c_str(); -} -} // namespace RdbJsKit -} // namespace OHOS - -#endif diff --git a/interfaces/innerkits/native_appdatafwk/include/shared_block.h b/interfaces/innerkits/native_appdatafwk/include/shared_block.h index b683a72d..6b4efe65 100644 --- a/interfaces/innerkits/native_appdatafwk/include/shared_block.h +++ b/interfaces/innerkits/native_appdatafwk/include/shared_block.h @@ -16,7 +16,7 @@ #ifndef SHARED_BLOCK_H #define SHARED_BLOCK_H -#include +#include #include #include diff --git a/interfaces/jskits/BUILD.gn b/interfaces/jskits/BUILD.gn deleted file mode 100644 index 14d79f01..00000000 --- a/interfaces/jskits/BUILD.gn +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright (c) 2021 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.gni") -import("//build/ohos/ace/ace.gni") - -ohos_copy("appdatamgr_declaration") { - sources = [ "./api" ] - outputs = [ target_out_dir + "/$target_name/" ] - module_source_dir = target_out_dir + "/$target_name" - module_install_name = "" -} - -ohos_shared_library("storage") { - include_dirs = [ - "//third_party/node/src", - "//utils/native/base/include", - "../../frameworks/jskitsimpl/common", - ] - - sources = [ - "../../frameworks/jskitsimpl/native_preferences/entry_point.cpp", - "../../frameworks/jskitsimpl/native_preferences/napi_preference.cpp", - "../../frameworks/jskitsimpl/native_preferences/napi_preference_helper.cpp", - ] - - external_deps = [ - "hilog_native:libhilog", - "napi:ace_napi", - "native_appdatamgr:native_preferences", - ] - - subsystem_name = "distributeddatamgr" - part_name = "native_appdatamgr" - relative_install_dir = "module/data" -} - -ohos_shared_library("rdb") { - include_dirs = [ - "//third_party/node/src", - "//utils/native/base/include", - "../../frameworks/jskitsimpl/common", - ] - - sources = [ - "../../frameworks/jskitsimpl/common/js_ability.cpp", - "../../frameworks/jskitsimpl/common/js_utils.cpp", - "../../frameworks/jskitsimpl/native_rdb/entry_point.cpp", - "../../frameworks/jskitsimpl/native_rdb/napi_rdb_predicates.cpp", - "../../frameworks/jskitsimpl/native_rdb/napi_rdb_store.cpp", - "../../frameworks/jskitsimpl/native_rdb/napi_rdb_store_helper.cpp", - "../../frameworks/jskitsimpl/native_rdb/napi_result_set.cpp", - "../../frameworks/jskitsimpl/native_rdb/napi_values_bucket.cpp", - ] - - deps = [ "//utils/native/base:utils" ] - - external_deps = [ - "hilog_native:libhilog", - "napi:ace_napi", - "native_appdatamgr:native_appdatafwk", - "native_appdatamgr:native_rdb", - ] - - if (is_standard_system) { - defines = [ "STANDARD_SYSTEM_ENABLE" ] - - deps += [ "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native" ] - - external_deps += [ - "ability_runtime:ability_manager", - "ability_runtime:app_manager", - "ability_runtime:want", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", - ] - } - - subsystem_name = "distributeddatamgr" - part_name = "native_appdatamgr" - relative_install_dir = "module/data" -} - -ohos_shared_library("dataability") { - include_dirs = [ - "//third_party/node/src", - "//utils/native/base/include", - "../../frameworks/jskitsimpl/common", - "../../frameworks/jskitsimpl/native_rdb", - ] - - sources = [ - "../../frameworks/jskitsimpl/common/js_utils.cpp", - "../../frameworks/jskitsimpl/native_dataability/entry_point.cpp", - "../../frameworks/jskitsimpl/native_dataability/napi_data_ability_predicates.cpp", - "../../frameworks/jskitsimpl/native_dataability/napi_predicates_utils.cpp", - ] - - deps = [ "../../interfaces/jskits:rdb" ] - - external_deps = [ - "hilog_native:libhilog", - "napi:ace_napi", - "native_appdatamgr:native_dataability", - "native_appdatamgr:native_rdb", - ] - - subsystem_name = "distributeddatamgr" - part_name = "native_appdatamgr" - relative_install_dir = "module/data" -}