diff --git a/container/BUILD.gn b/container/BUILD.gn index e2d5970..6eeebf8 100644 --- a/container/BUILD.gn +++ b/container/BUILD.gn @@ -124,7 +124,7 @@ template("container_lib") { subsystem_name = "compileruntime" part_name = "jsapi_util" - relative_install_dir = "module" + relative_install_dir = "module/util" } } diff --git a/container/arraylist/native_module_arraylist.cpp b/container/arraylist/native_module_arraylist.cpp index ccfc5d4..c99767f 100644 --- a/container/arraylist/native_module_arraylist.cpp +++ b/container/arraylist/native_module_arraylist.cpp @@ -28,7 +28,7 @@ static napi_value ArrayListInit(napi_env env, napi_value exports) return exports; } extern "C" -__attribute__((visibility("default"))) void NAPI_arraylist_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_ArrayList_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_arraylist_js_start; @@ -38,7 +38,7 @@ __attribute__((visibility("default"))) void NAPI_arraylist_GetJSCode(const char } } extern "C" -__attribute__((visibility("default"))) void NAPI_arraylist_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_ArrayList_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_arraylist_abc_start; @@ -62,4 +62,4 @@ extern "C" __attribute__((constructor)) void RegisterModule() { napi_module_register(&arrayListModule); } -} \ No newline at end of file +} diff --git a/container/deque/native_module_deque.cpp b/container/deque/native_module_deque.cpp index 8f2584d..70eea6c 100644 --- a/container/deque/native_module_deque.cpp +++ b/container/deque/native_module_deque.cpp @@ -27,7 +27,7 @@ static napi_value DequeInit(napi_env env, napi_value exports) return exports; } extern "C" -__attribute__((visibility("default"))) void NAPI_deque_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_Deque_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_deque_js_start; @@ -38,7 +38,7 @@ __attribute__((visibility("default"))) void NAPI_deque_GetJSCode(const char **bu } } extern "C" -__attribute__((visibility("default"))) void NAPI_deque_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_Deque_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_deque_abc_start; diff --git a/container/hashmap/js_hashmap.ts b/container/hashmap/js_hashmap.ts index 0569553..4e2b84c 100644 --- a/container/hashmap/js_hashmap.ts +++ b/container/hashmap/js_hashmap.ts @@ -24,7 +24,7 @@ if (arkPritvate !== undefined) { } if (flag || fastHashMap === undefined) { - const HashMapAbility = requireNapi("struct"); + const HashMapAbility = requireNapi("util.struct"); interface IterableIterator { next: () => { value: T | undefined; @@ -164,4 +164,4 @@ if (flag || fastHashMap === undefined) { export default { HashMap: fastHashMap, -}; \ No newline at end of file +}; diff --git a/container/hashmap/native_module_hashmap.cpp b/container/hashmap/native_module_hashmap.cpp index 4da9b03..4892c1c 100644 --- a/container/hashmap/native_module_hashmap.cpp +++ b/container/hashmap/native_module_hashmap.cpp @@ -29,7 +29,7 @@ static napi_value HashMapInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_hashmap_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_HashMap_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_hashmap_js_start; @@ -40,7 +40,7 @@ __attribute__((visibility("default"))) void NAPI_hashmap_GetJSCode(const char ** } } extern "C" -__attribute__((visibility("default"))) void NAPI_hashmap_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_HashMap_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_hashmap_abc_start; diff --git a/container/hashset/js_hashset.ts b/container/hashset/js_hashset.ts index 4ce892d..4438a65 100644 --- a/container/hashset/js_hashset.ts +++ b/container/hashset/js_hashset.ts @@ -25,7 +25,7 @@ if (arkPritvate !== undefined) { } if (flag || fastHashSet === undefined) { - const HashSetAbility = requireNapi("struct"); + const HashSetAbility = requireNapi("util.struct"); interface IterableIterator { next: () => { value: T | undefined; diff --git a/container/hashset/native_module_hashset.cpp b/container/hashset/native_module_hashset.cpp index ef8999e..c5d9cdf 100644 --- a/container/hashset/native_module_hashset.cpp +++ b/container/hashset/native_module_hashset.cpp @@ -29,7 +29,7 @@ static napi_value HashSetInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_hashset_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_HashSet_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_hashset_js_start; @@ -40,7 +40,7 @@ __attribute__((visibility("default"))) void NAPI_hashset_GetJSCode(const char ** } } extern "C" -__attribute__((visibility("default"))) void NAPI_hashset_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_HashSet_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_hashset_abc_start; diff --git a/container/lightweightmap/js_lightweightmap.ts b/container/lightweightmap/js_lightweightmap.ts index 17c0fd2..7c429b5 100644 --- a/container/lightweightmap/js_lightweightmap.ts +++ b/container/lightweightmap/js_lightweightmap.ts @@ -24,7 +24,7 @@ if (arkPritvate !== undefined) { } if (flag || fastLightWeightMap === undefined) { - const LightWeightAbility = requireNapi("struct"); + const LightWeightAbility = requireNapi("util.struct"); interface IterableIterator { next: () => { value: T | undefined; diff --git a/container/lightweightmap/native_module_lightweightmap.cpp b/container/lightweightmap/native_module_lightweightmap.cpp index ec32936..d828099 100644 --- a/container/lightweightmap/native_module_lightweightmap.cpp +++ b/container/lightweightmap/native_module_lightweightmap.cpp @@ -29,7 +29,7 @@ static napi_value LightWeightMapInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_lightweightmap_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_LightWeightMap_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_lightweightmap_js_start; @@ -41,7 +41,7 @@ __attribute__((visibility("default"))) void NAPI_lightweightmap_GetJSCode(const } extern "C" -__attribute__((visibility("default"))) void NAPI_lightweightmap_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_LightWeightMap_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_lightweightmap_abc_start; diff --git a/container/lightweightset/js_lightweightset.ts b/container/lightweightset/js_lightweightset.ts index a925189..d4cbe78 100644 --- a/container/lightweightset/js_lightweightset.ts +++ b/container/lightweightset/js_lightweightset.ts @@ -24,7 +24,7 @@ if (arkPritvate !== undefined) { } if (flag || fastLightWeightSet === undefined) { - const LightWeightAbility = requireNapi("struct"); + const LightWeightAbility = requireNapi("util.struct"); interface IterableIterator { next: () => { value: T | undefined; diff --git a/container/lightweightset/native_module_lightweightset.cpp b/container/lightweightset/native_module_lightweightset.cpp index 577efbc..6d427d0 100644 --- a/container/lightweightset/native_module_lightweightset.cpp +++ b/container/lightweightset/native_module_lightweightset.cpp @@ -29,7 +29,7 @@ static napi_value LightWeightSetInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_lightweightset_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_LightWeightSet_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_lightweightset_js_start; @@ -41,7 +41,7 @@ __attribute__((visibility("default"))) void NAPI_lightweightset_GetJSCode(const } extern "C" -__attribute__((visibility("default"))) void NAPI_lightweightset_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_LightWeightSet_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_lightweightset_abc_start; diff --git a/container/linkedlist/native_module_linkedlist.cpp b/container/linkedlist/native_module_linkedlist.cpp index 40a8ed0..b15a45a 100644 --- a/container/linkedlist/native_module_linkedlist.cpp +++ b/container/linkedlist/native_module_linkedlist.cpp @@ -29,7 +29,7 @@ static napi_value LinkedListInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_linkedlist_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_LinkedList_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_linkedlist_js_start; @@ -40,7 +40,7 @@ __attribute__((visibility("default"))) void NAPI_linkedlist_GetJSCode(const char } } extern "C" -__attribute__((visibility("default"))) void NAPI_linkedlist_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_LinkedList_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_linkedlist_abc_start; diff --git a/container/list/native_module_list.cpp b/container/list/native_module_list.cpp index e8f53b9..379e8e4 100644 --- a/container/list/native_module_list.cpp +++ b/container/list/native_module_list.cpp @@ -27,7 +27,7 @@ static napi_value ListInit(napi_env env, napi_value exports) return exports; } extern "C" -__attribute__((visibility("default"))) void NAPI_list_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_List_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_list_js_start; @@ -38,7 +38,7 @@ __attribute__((visibility("default"))) void NAPI_list_GetJSCode(const char **buf } } extern "C" -__attribute__((visibility("default"))) void NAPI_list_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_List_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_list_abc_start; diff --git a/container/plainarray/js_plainarray.ts b/container/plainarray/js_plainarray.ts index e6901d4..ff3a5dd 100644 --- a/container/plainarray/js_plainarray.ts +++ b/container/plainarray/js_plainarray.ts @@ -24,7 +24,7 @@ if (arkPritvate !== undefined) { } if (flag || fastPlainArray === undefined) { - const PlainAbility = requireNapi("struct"); + const PlainAbility = requireNapi("util.struct"); interface IterableIterator { next: () => { value: T | undefined; diff --git a/container/plainarray/native_module_plainarray.cpp b/container/plainarray/native_module_plainarray.cpp index d33c50b..3065c31 100644 --- a/container/plainarray/native_module_plainarray.cpp +++ b/container/plainarray/native_module_plainarray.cpp @@ -29,7 +29,7 @@ static napi_value PlainArrayInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_plainarray_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_PlainArray_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_plainarray_js_start; @@ -41,7 +41,7 @@ __attribute__((visibility("default"))) void NAPI_plainarray_GetJSCode(const char } extern "C" -__attribute__((visibility("default"))) void NAPI_plainarray_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_PlainArray_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_plainarray_abc_start; diff --git a/container/queue/native_module_queue.cpp b/container/queue/native_module_queue.cpp index 758000b..7f49eab 100644 --- a/container/queue/native_module_queue.cpp +++ b/container/queue/native_module_queue.cpp @@ -27,7 +27,7 @@ static napi_value QueueInit(napi_env env, napi_value exports) return exports; } extern "C" -__attribute__((visibility("default"))) void NAPI_queue_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_Queue_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_queue_js_start; @@ -39,7 +39,7 @@ __attribute__((visibility("default"))) void NAPI_queue_GetJSCode(const char **bu } extern "C" -__attribute__((visibility("default"))) void NAPI_queue_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_Queue_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_queue_abc_start; diff --git a/container/stack/native_module_stack.cpp b/container/stack/native_module_stack.cpp index 563d5fb..abd74f6 100644 --- a/container/stack/native_module_stack.cpp +++ b/container/stack/native_module_stack.cpp @@ -27,7 +27,7 @@ static napi_value StackInit(napi_env env, napi_value exports) return exports; } extern "C" -__attribute__((visibility("default"))) void NAPI_stack_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_Stack_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_stack_js_start; @@ -39,7 +39,7 @@ __attribute__((visibility("default"))) void NAPI_stack_GetJSCode(const char **bu } extern "C" -__attribute__((visibility("default"))) void NAPI_stack_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_Stack_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_stack_abc_start; diff --git a/container/struct/native_module_struct.cpp b/container/struct/native_module_struct.cpp index 01c0311..ee65b63 100644 --- a/container/struct/native_module_struct.cpp +++ b/container/struct/native_module_struct.cpp @@ -29,7 +29,7 @@ static napi_value StructInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_struct_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_struct_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_struct_js_start; @@ -41,7 +41,7 @@ __attribute__((visibility("default"))) void NAPI_struct_GetJSCode(const char **b } extern "C" -__attribute__((visibility("default"))) void NAPI_struct_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_struct_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_struct_abc_start; diff --git a/container/treemap/js_treemap.ts b/container/treemap/js_treemap.ts index c3bbeb5..0b14f90 100644 --- a/container/treemap/js_treemap.ts +++ b/container/treemap/js_treemap.ts @@ -24,7 +24,7 @@ if (arkPritvate !== undefined) { } if (flag || fastTreeMap === undefined) { - const RBTreeAbility = requireNapi("struct") + const RBTreeAbility = requireNapi("util.struct") interface IterableIterator { next: () => { value: T | undefined; @@ -195,4 +195,4 @@ if (flag || fastTreeMap === undefined) { export default { TreeMap: fastTreeMap, -}; \ No newline at end of file +}; diff --git a/container/treemap/native_module_treemap.cpp b/container/treemap/native_module_treemap.cpp index a67b2fe..430fca6 100644 --- a/container/treemap/native_module_treemap.cpp +++ b/container/treemap/native_module_treemap.cpp @@ -29,7 +29,7 @@ static napi_value TreeMapInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_treemap_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_TreeMap_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_treemap_js_start; @@ -41,7 +41,7 @@ __attribute__((visibility("default"))) void NAPI_treemap_GetJSCode(const char ** } extern "C" -__attribute__((visibility("default"))) void NAPI_treemap_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_TreeMap_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_treemap_abc_start; diff --git a/container/treeset/js_treeset.ts b/container/treeset/js_treeset.ts index 3b3ec16..070c284 100644 --- a/container/treeset/js_treeset.ts +++ b/container/treeset/js_treeset.ts @@ -24,7 +24,7 @@ if (arkPritvate !== undefined) { } if (flag || fastTreeSet === undefined) { - const RBTreeAbility = requireNapi("struct"); + const RBTreeAbility = requireNapi("util.struct"); interface IterableIterator { next: () => { value: T | undefined; diff --git a/container/treeset/native_module_treeset.cpp b/container/treeset/native_module_treeset.cpp index 12142e9..769559e 100644 --- a/container/treeset/native_module_treeset.cpp +++ b/container/treeset/native_module_treeset.cpp @@ -29,7 +29,7 @@ static napi_value TreeSetInit(napi_env env, napi_value exports) } extern "C" -__attribute__((visibility("default"))) void NAPI_treeset_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_TreeSet_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_treeset_js_start; @@ -41,7 +41,7 @@ __attribute__((visibility("default"))) void NAPI_treeset_GetJSCode(const char ** } extern "C" -__attribute__((visibility("default"))) void NAPI_treeset_GetABCCode(const char** buf, int* buflen) +__attribute__((visibility("default"))) void NAPI_util_TreeSet_GetABCCode(const char** buf, int* buflen) { if (buf != nullptr) { *buf = _binary_treeset_abc_start; diff --git a/container/vector/native_module_vector.cpp b/container/vector/native_module_vector.cpp index c365a1a..fb4088a 100644 --- a/container/vector/native_module_vector.cpp +++ b/container/vector/native_module_vector.cpp @@ -27,7 +27,7 @@ static napi_value VectorInit(napi_env env, napi_value exports) return exports; } extern "C" -__attribute__((visibility("default"))) void NAPI_vector_GetJSCode(const char **buf, int *bufLen) +__attribute__((visibility("default"))) void NAPI_util_Vector_GetJSCode(const char **buf, int *bufLen) { if (buf != nullptr) { *buf = _binary_js_vector_js_start; @@ -39,7 +39,7 @@ __attribute__((visibility("default"))) void NAPI_vector_GetJSCode(const char **b } extern "C" -__attribute__((visibility("default"))) void NAPI_vector_GetABCCode(const char **buf, int *buflen) +__attribute__((visibility("default"))) void NAPI_util_Vector_GetABCCode(const char **buf, int *buflen) { if (buf != nullptr) { *buf = _binary_vector_abc_start;