@vtecx/vtecxnext 2.2.5 → 2.2.7

package/dist/vtecxnext.d.ts

@@ -407,13 +407,14 @@ export declare class VtecxNext {
      * @param targetService target service name (for service linkage)
      * @return feed (entry array)
      */
-    practicalPaging: (uri: string, num: number, targetService?: string) => Promise<any>;
+    getPageWithPagination: (uri: string, num: number, targetService?: string) => Promise<any>;
     /**
      * ページングのカーソルリスト作成処理
      * 続きがある場合、次のカーソルリスト作成処理を実行する
      * @param vtecxnext
      * @param uri キーとパラメータ
      * @param prevLastPage 前回の最終ページ
+     * @param targetService 対象サービス
      */
     private nextPagination;
     /**

package/dist/vtecxnext.js

@@ -1430,15 +1430,15 @@ class VtecxNext {
      * @param targetService target service name (for service linkage)
      * @return feed (entry array)
      */
-    practicalPaging = async (uri, num, targetService) => {
-        //console.log(`[practicalPaging] start. uri=${uri} num=${num} ${targetService ? 'targetService=' + targetService : ''}`)
+    getPageWithPagination = async (uri, num, targetService) => {
+        //console.log(`[getPageWithPagination] start. uri=${uri} num=${num} ${targetService ? 'targetService=' + targetService : ''}`)
         // ページ数が1の場合、カーソルリスト作成処理を行う
         if (num === 1) {
-            //console.log(`[practicalPaging] pagination start. uri=${uri}`)
-            const paginationInfo = await this.pagination(uri, `1,${String(PAGINATION_NUM)}`);
+            //console.log(`[getPageWithPagination] pagination start. uri=${uri}`)
+            const paginationInfo = await this.pagination(uri, `1,${String(PAGINATION_NUM)}`, targetService);
             if (paginationInfo.hasNext) {
                 // 次のカーソルリスト作成 (非同期のまま)
-                this.nextPagination(uri, PAGINATION_NUM);
+                this.nextPagination(uri, PAGINATION_NUM, targetService);
             }
             if (paginationInfo.lastPageNumber === 0) {
                 // データが存在しない場合終了
@@ -1446,9 +1446,9 @@ class VtecxNext {
             }
         }
         // ページ取得
-        //console.log(`[practicalPaging] getPage start. uri=${uri} num=${num}`)
+        //console.log(`[getPageWithPagination] getPage start. uri=${uri} num=${num}`)
         try {
-            return await this.getPage(uri, num);
+            return await this.getPage(uri, num, targetService);
         }
         catch (error) {
             if ((0, exports.isVtecxNextError)(error)) {
@@ -1466,13 +1466,14 @@ class VtecxNext {
      * @param vtecxnext
      * @param uri キーとパラメータ
      * @param prevLastPage 前回の最終ページ
+     * @param targetService 対象サービス
      */
-    nextPagination = async (uri, prevLastPage) => {
+    nextPagination = async (uri, prevLastPage, targetService) => {
         const firstPage = prevLastPage + 1;
         const lastPage = prevLastPage + prevLastPage;
-        const paginationInfo = await this.pagination(uri, `${String(firstPage)},${String(lastPage)}`);
+        const paginationInfo = await this.pagination(uri, `${String(firstPage)},${String(lastPage)}`, targetService);
         if (paginationInfo.hasNext) {
-            await this.nextPagination(uri, lastPage);
+            await this.nextPagination(uri, lastPage, targetService);
         }
     };
     /**
@@ -2288,20 +2289,17 @@ class VtecxNext {
         //console.log(`[vtecxnext addGroupByAdmin] start. group=${group} selfid=${selfid} uids=${uids}`)
         // 入力チェック
         checkUri(group, 'group key');
+        checkNotNull(uids, 'uid');
         //checkNotNull(selfid, 'selfid (hierarchical name under my group alias)')
         // vte.cxへリクエスト
         const method = 'POST';
         const url = `${SERVLETPATH_PROVIDER}${group}?_addgroupByAdmin${selfid ? '&_selfid=' + selfid : ''}`;
-        let value;
-        if (uids) {
-            const feed = [];
-            for (const uid of uids) {
-                const entry = { 'link': [{ '___rel': 'self', '___href': `/_user/${uid}` }] };
-                feed.push(entry);
-            }
-            value = JSON.stringify(feed);
+        const feed = [];
+        for (const uid of uids) {
+            const entry = { 'link': [{ '___rel': 'self', '___href': `/_user/${uid}` }] };
+            feed.push(entry);
         }
-        checkNotNull(value, 'uid');
+        const value = JSON.stringify(feed);
         let response;
         try {
             response = await this.requestVtecx(method, url, value);
@@ -4173,7 +4171,7 @@ const isBlank = (val) => {
     if (val === null || val === undefined || val === '') {
         return true;
     }
-    if (Array.isArray(val) && val.length === 0) {
+    if (Array.isArray(val) && val.length <= 0) {
         return true;
     }
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtecx/vtecxnext",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "description": "vte.cx Next.js api",
   "main": "dist/index.js",
   "files": [
@@ -22,13 +22,13 @@
   },
   "homepage": "https://github.com/reflexworks/vtecxnext#readme",
   "devDependencies": {
-    "@types/node": "^20.12.13",
+    "@types/node": "^22.7.9",
     "@types/sqlstring": "^2.3.2",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.6.3"
   },
   "dependencies": {
-    "next": "^14.2.3",
+    "next": "^14.2.16",
     "sqlstring": "^2.3.2"
   }
 }