@digione/node-custom-api 0.1.9-beta6 → 0.1.9-beta8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digione/node-custom-api",
-  "version": "0.1.9-beta6",
+  "version": "0.1.9-beta8",
   "description": "Typescript node digione-api",
   "author": "Monchai Jirayupong <monchai.j@seven.co.th>",
   "license": "MIT",

package/utils/file.d.ts

@@ -147,7 +147,7 @@ export declare class FileUtil {
         hidden?: number;
         input?: {};
     }): Promise<any>;
-    createFileByPath(files: Array<string>, slug: string, user_id: any, { parent_slug, type, name, root, upload, tags, group }?: {
+    createFileByPath(files: Array<any>, slug: string, user_id: any, { parent_slug, type, name, root, upload, tags, group }?: {
         parent_slug?: string;
         type?: string;
         name?: any;
@@ -171,7 +171,7 @@ export declare class FileUtil {
         user_id: any;
         organ_id: any;
         organ_by: any;
-        sort: string;
+        sort: any;
         date_added: string;
         name: any;
         filename: any;
@@ -181,7 +181,8 @@ export declare class FileUtil {
         extension: string;
         type: any;
         is_hidden: any;
-        tags: TagFile;
+        tags: any;
+        custom: any;
         group: any;
     }[]>;
     insertFileUnique(results: Array<any>, { format, thumb, width, height }?: {

package/utils/file.js

@@ -470,8 +470,13 @@ class FileUtil {
                 let folder = yield this.createFolder(slug, { parent_id, root, name });
                 let results = [], reqs = [];
                 files.forEach((item) => {
-                    results.push({ Location: item, Key: item });
-                    reqs.push({ originalname: (0, helper_1.getSlug)(32), mimetype: null, size: 0, type });
+                    let addition = {}, path = item;
+                    if (typeof item == "object") {
+                        addition = item;
+                        path = item['path'];
+                    }
+                    results.push({ Location: path, Key: path });
+                    reqs.push(Object.assign({ originalname: (0, helper_1.getSlug)(32), mimetype: null, size: 0, type }, addition));
                 });
                 results = yield this.formatFile(folder['id'], user_id, reqs, results, { input, tags, group });
                 return yield this.insertFileUnique(results);
@@ -577,11 +582,7 @@ class FileUtil {
                     let item = Object.assign(Object.assign({}, input), { folder_id,
                         user_id,
                         organ_id,
-                        organ_by,
-                        sort,
-                        date_added, name: reqs[key].originalname || (0, helper_1.getSlug)(32), filename: reqs[key].Key || file.Key || input['filename'], path, mimetype: reqs[key].mimetype, filesize: reqs[key].size, extension: (extension ? "." + extension : ''), type: reqs[key].type || file.type || input['type'], is_hidden,
-                        tags,
-                        group });
+                        organ_by, sort: reqs[key].sort || sort, date_added, name: reqs[key].originalname || (0, helper_1.getSlug)(32), filename: reqs[key].Key || file.Key || input['filename'], path, mimetype: reqs[key].mimetype, filesize: reqs[key].size, extension: (extension ? "." + extension : ''), type: reqs[key].type || file.type || input['type'], is_hidden, tags: reqs[key].tags || tags, custom: reqs[key].custom || input['custom'], group });
                     if (format) {
                         item = yield this.afterQueryFile(item);
                     }

package/utils/stream.js

@@ -474,6 +474,7 @@ class StreamUtil {
                 if (convert_option) {
                     let obj_value = {};
                     if (item['field_type'] == "choice") {
+                        let opt_empty = false;
                         if (field_data['choice_data']) {
                             let data = [];
                             data = field_data['choice_data'].split('\n');
@@ -496,6 +497,7 @@ class StreamUtil {
                                         data[k] = { key, value };
                                     }
                                     else {
+                                        opt_empty = true;
                                         data[k] = { key: '', value };
                                     }
                                 }
@@ -522,7 +524,7 @@ class StreamUtil {
                         }
                         if (convert_value && typeof item['field_value'] != "undefined") {
                             let field_value = item['field_value'];
-                            if (item['field_value'] == null)
+                            if (item['field_value'] == null && opt_empty)
                                 field_value = '';
                             field_data['value'] = obj_value[field_value];
                         }