dff-util 1.2.7 → 1.2.9

package/README.md

@@ -264,17 +264,6 @@ export type SessionUser = {
 };
 ```
 
-## ResponseType
-
-```
-ResponseType = {
-  status?: string | number;
-  data?: any;
-  error?: any;
-  total?: number;
-};
-
-```
 
 ## SearchByLimitType
 ```
@@ -354,6 +343,9 @@ export type ResponseType = {
   status?: string | number;
   data?: any;
   error?: any;
+  total?: number;
+  skip?: number;
+  limit?: number;
 };
 
 export type SearchByType = {
@@ -363,14 +355,6 @@ export type SearchByType = {
   searchTerm?: string;
 };
 
-export type PaginationResponseType = {
-  status?: string | number;
-  data?: any;
-  error?: any;
-  total?: number;
-  skip?: number;
-  limit?: number;
-};
 
 export type SearchByLimitType = {
   limit: number;

package/dist/main/case-mapper.d.ts

@@ -1,5 +1,5 @@
 export declare function toCamelCase(str: string): string;
-export declare function toSnakeCase(str: string, isMongoId?: boolean): string;
+export declare function toSnakeCase(str: string): string;
 export declare function toPascalCase(str: string): string;
 export declare function toUpperCase(str: string): string;
 export declare function toLowerCase(str: string): string;

package/dist/main/case-mapper.js

@@ -13,9 +13,7 @@ function toCamelCase(str) {
         .replace(/[_\s-]+(.)?/g, (_, chr) => (chr ? chr.toUpperCase() : ''))
         .replace(/^[A-Z]/, (chr) => chr.toLowerCase());
 }
-function toSnakeCase(str, isMongoId = false) {
-    if (str === 'id' && isMongoId)
-        return '_id';
+function toSnakeCase(str) {
     return str
         .replace(/([a-z0-9])([A-Z])/g, '$1_$2') // camelCase → camel_Case
         .replace(/[\s-]+/g, '_') // space/dash → underscore
@@ -44,39 +42,42 @@ function toLowerCase(str) {
         .replace(/^_+|_+$/g, '')
         .toLowerCase();
 }
+function isPlainObject(obj) {
+    return Object.prototype.toString.call(obj) === '[object Object]';
+}
 function toViewMapper(obj) {
     if (Array.isArray(obj)) {
         return obj.map(toViewMapper);
     }
-    else if (obj !== null && typeof obj === 'object') {
+    else if (isPlainObject(obj)) {
         return Object.fromEntries(Object.entries(obj).map(([key, value]) => [
-            toCamelCase(key),
+            toCamelCase(key === '_id' ? 'id' : key),
             toViewMapper(value),
         ]));
     }
-    return obj;
+    return obj; // Date, Buffer, Map, etc. returned as-is
 }
 function toEntityMapper(obj) {
     if (Array.isArray(obj)) {
         return obj.map(toEntityMapper);
     }
-    else if (obj !== null && typeof obj === 'object') {
+    else if (isPlainObject(obj)) {
         return Object.fromEntries(Object.entries(obj).map(([key, value]) => [
             toSnakeCase(key),
             toEntityMapper(value),
         ]));
     }
-    return obj;
+    return obj; // Date, Buffer, Map, etc. returned as-is
 }
 function toSchemaMapper(obj) {
     if (Array.isArray(obj)) {
-        return obj.map(toSchemaMapper);
+        return obj.map(toEntityMapper);
     }
-    else if (obj !== null && typeof obj === 'object') {
+    else if (isPlainObject(obj)) {
         return Object.fromEntries(Object.entries(obj).map(([key, value]) => [
-            toSnakeCase(key, true),
-            toSchemaMapper(value),
+            toSnakeCase(key === 'id' ? '_id' : key),
+            toEntityMapper(value),
         ]));
     }
-    return obj;
+    return obj; // Date, Buffer, Map, etc. returned as-is
 }

package/dist/main/const-type.d.ts

@@ -23,6 +23,9 @@ export type ResponseType = {
     status?: string | number;
     data?: any;
     error?: any;
+    total?: number;
+    skip?: number;
+    limit?: number;
 };
 export type SearchByType = {
     query?: Record<string, any>;
@@ -30,14 +33,6 @@ export type SearchByType = {
     order?: "ASC" | "DESC";
     searchTerm?: string;
 };
-export type PaginationResponseType = {
-    status?: string | number;
-    data?: any;
-    error?: any;
-    total?: number;
-    skip?: number;
-    limit?: number;
-};
 export type SearchByLimitType = {
     limit: number;
     skip: number;

package/dist/main/http.d.ts

@@ -8,11 +8,11 @@ export declare enum RespType {
 export declare const HttpHeaders: {
     'Content-Type': string;
     authorization: null;
-    'x-request-id': null;
+    'request-id': null;
 };
 export declare const BaseHeaders: {
     authorization: null;
-    'x-request-id': null;
+    'request-id': null;
 };
 export declare const HttpMethods: {
     GET: string;

package/dist/main/http.js

@@ -22,11 +22,11 @@ var RespType;
 exports.HttpHeaders = {
     'Content-Type': 'application/json',
     authorization: null,
-    'x-request-id': null,
+    'request-id': null,
 };
 exports.BaseHeaders = {
     authorization: null,
-    'x-request-id': null,
+    'request-id': null,
 };
 exports.HttpMethods = {
     GET: "GET",
@@ -69,14 +69,14 @@ class Http {
             url = url.startsWith('http') ? url : Http.API_BASE_URL + url;
             const fullUrl = params ? `${url}?${new URLSearchParams(params).toString()}` : url;
             headers = headers || exports.HttpHeaders;
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = { method: 'GET', headers: headers };
                 const response = yield fetch(fullUrl, requestOptions);
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['x-request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: error };
             }
         });
     }
@@ -84,14 +84,14 @@ class Http {
         return __awaiter(this, arguments, void 0, function* (url, data, headers, type = RespType.JSON) {
             url = url.startsWith('http') ? url : Http.API_BASE_URL + url;
             headers = headers || exports.HttpHeaders;
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = { method: 'POST', body: JSON.stringify(data), headers: headers };
                 const response = yield fetch(url, requestOptions);
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: url, requestId: headers['x-request-id'], body: data, error: error };
+                throw { url: url, requestId: headers['request-id'], body: data, error: error };
             }
         });
     }
@@ -99,14 +99,14 @@ class Http {
         return __awaiter(this, arguments, void 0, function* (url, data, headers, type = RespType.JSON) {
             url = url.startsWith('http') ? url : Http.API_BASE_URL + url;
             headers = headers || exports.HttpHeaders;
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = { method: 'PUT', body: JSON.stringify(data), headers: headers };
                 const response = yield fetch(url, requestOptions);
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: url, requestId: headers['x-request-id'], body: data, error: error };
+                throw { url: url, requestId: headers['request-id'], body: data, error: error };
             }
         });
     }
@@ -115,14 +115,14 @@ class Http {
             url = url.startsWith('http') ? url : Http.API_BASE_URL + url;
             const fullUrl = params ? `${url}?${new URLSearchParams(params).toString()}` : url;
             headers = headers || exports.HttpHeaders;
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = { method: 'DELETE', headers: headers };
                 const response = yield fetch(fullUrl, requestOptions);
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['x-request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: error };
             }
         });
     }
@@ -132,14 +132,14 @@ class Http {
             const params = { key: appKey, payload: JSON.stringify(sessionInfo) };
             const fullUrl = `${url}?${new URLSearchParams(params).toString()}`;
             const headers = Object.assign(Object.assign({}, Headers), { 'X-API-KEY': apiKey || '' });
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = { method: 'GET', headers: headers };
                 const response = yield fetch(fullUrl, requestOptions);
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['x-request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: error };
             }
         });
     }
@@ -156,7 +156,7 @@ class Http {
             if (isHeadersAddMultiForm) {
                 headers = Object.assign(Object.assign({}, headers), { 'Content-Type': headers['Content-Type'] || 'multipart/form-data' });
             }
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = {
                     method: method,
@@ -167,7 +167,7 @@ class Http {
                 return yield Http.RespData(response, type);
             }
             catch (error) {
-                throw { url: url, requestId: headers['x-request-id'], error: error };
+                throw { url: url, requestId: headers['request-id'], error: error };
             }
         });
     }
@@ -176,7 +176,7 @@ class Http {
             headers = headers || {
                 'Content-Type': file.type,
             };
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = {
                     method: method,
@@ -187,7 +187,7 @@ class Http {
                 return response;
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['x-request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: error };
             }
         });
     }
@@ -195,7 +195,7 @@ class Http {
         return __awaiter(this, arguments, void 0, function* (fullUrl, params, headers = exports.HttpHeaders, method = 'GET') {
             fullUrl = params ? `${fullUrl}?${new URLSearchParams(params).toString()}` : fullUrl;
             headers = headers || exports.HttpHeaders;
-            headers['x-request-id'] = headers['x-request-id'] || (0, util_1.AppUUID4)();
+            headers['request-id'] = headers['request-id'] || (0, util_1.AppUUID4)();
             try {
                 const requestOptions = { method: method, headers: headers };
                 const response = yield fetch(fullUrl, requestOptions);
@@ -204,7 +204,7 @@ class Http {
                 return buffer;
             }
             catch (error) {
-                throw { url: fullUrl, requestId: headers['x-request-id'], error: error };
+                throw { url: fullUrl, requestId: headers['request-id'], error: error };
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dff-util",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {