@digione/node-custom-api 0.2.0-beta1 → 0.2.0-beta11

package/middlewares/accessToken.js

@@ -31,6 +31,7 @@ const verifyAccessToken = (req, res, next) => tslib_1.__awaiter(void 0, void 0,
             }
             res.locals.auth_id = data.id;
             let setting = JSON.parse(tokenData['setting']);
+            res.locals.setting = setting;
             res.locals.group_id = setting['group_id'];
             res.locals.related_id = setting['organ_id'];
             if (setting['b2b_group_id']) {

package/middlewares/paramQuery.d.ts

@@ -1,9 +1,9 @@
 import { Request, Response } from 'express';
 export declare const getAuthParam: (req: Request, res: Response, next: any) => void;
 export declare const getStremParam: (req: Request, res: Response, next: any) => void;
-export declare const getQueryParam: (req: Request, res: Response, next: any) => void;
+export declare const getQueryParam: (req: Request, res: Response, next: any) => Promise<void | Response<any, Record<string, any>>>;
 export declare const getQueryParamCUD: (req: Request, res: Response, next: any) => void;
-export declare const getQueryParamFile: (req: Request, res: Response, next: any) => void;
+export declare const getQueryParamFile: (req: Request, res: Response, next: any) => Promise<void | Response<any, Record<string, any>>>;
 export declare const changeQueryParam: (value?: {}, { skipSystem }?: {
     skipSystem?: boolean;
 }) => (req: Request, res: Response, next: any) => any;

package/middlewares/paramQuery.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeConfigParam = exports.changeBodyParam = exports.changeOptionParam = exports.changeQueryParam = exports.getQueryParamFile = exports.getQueryParamCUD = exports.getQueryParam = exports.getStremParam = exports.getAuthParam = void 0;
+const tslib_1 = require("tslib");
 const helper_1 = require("../utils/helper");
+const errors_1 = require("../errors");
 const _ = require("lodash");
 const getAuthParam = (req, res, next) => {
     res.locals.option['hostname'] = ((0, helper_1.getENV)('NODE_ENV') == 'development' ? 'http' : 'https') + '://' + req.get('host');
@@ -77,7 +79,8 @@ const getStremParam = (req, res, next) => {
     });
 };
 exports.getStremParam = getStremParam;
-const getQueryParam = (req, res, next) => {
+const getQueryParam = (req, res, next) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    let config = res.locals.config || {};
     res.locals.option = res.locals.option || {};
     res.locals.option['lang_code'] = 'en';
     res.locals.option['currency'] = 'thb';
@@ -93,8 +96,20 @@ const getQueryParam = (req, res, next) => {
     else {
         res.locals.include = {};
     }
+    if (config['maxQueryLimit']) {
+        req.query.limit = req.query.limit || config['maxQueryLimit'];
+    }
     if (req.query.limit) {
         res.locals.option['limit'] = Number(req.query.limit);
+        if (config['maxQueryLimit'] && res.locals.option['limit'] > config['maxQueryLimit']) {
+            try {
+                yield (0, errors_1.paramError)(`"limit" must be less than or equal to ${config['maxQueryLimit']}`, { field: "limit" });
+            }
+            catch (err) {
+                let error = new errors_1.CustomError(err);
+                return res.status(error.code).send(error);
+            }
+        }
     }
     if (req.query.offset) {
         res.locals.option['offset'] = Number(req.query.offset);
@@ -124,7 +139,7 @@ const getQueryParam = (req, res, next) => {
         }
         return next();
     });
-};
+});
 exports.getQueryParam = getQueryParam;
 const getQueryParamCUD = (req, res, next) => {
     let config = res.locals.config || {};

package/models/user/user.d.ts

@@ -50,9 +50,6 @@ export declare const UserAttr: {
     organ_id: {
         type: sequelize.IntegerDataType;
     };
-    member_id: {
-        type: sequelize.StringDataType;
-    };
     provider: sequelize.StringDataType;
     mobile: sequelize.StringDataType;
     mobile_code: sequelize.StringDataType;

package/models/user/user.js

@@ -58,10 +58,6 @@ exports.UserAttr = {
     organ_id: {
         type: sequelize.INTEGER({ length: 11 })
     },
-    // points:sequelize.INTEGER({length:11}),
-    member_id: {
-        type: sequelize.STRING(100)
-    },
     provider: sequelize.STRING(40),
     mobile: sequelize.STRING(20),
     mobile_code: sequelize.STRING(10)

package/package.json

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

package/utils/auth.d.ts

@@ -15,7 +15,9 @@ export declare class AuthUtil {
         success: number;
         token: any;
     }>;
-    refreshAccessTokenByToken(token: any): Promise<{
+    refreshAccessTokenByToken(token: any, { attributes_include }?: {
+        attributes_include?: any[];
+    }): Promise<{
         access_token: string;
     }>;
     signNotificationTokenByToken(token: any, input?: any): Promise<{

package/utils/auth.js

@@ -75,7 +75,7 @@ class AuthUtil {
             }
         });
     }
-    refreshAccessTokenByToken(token) {
+    refreshAccessTokenByToken(token, { attributes_include = [] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 const tokenData = yield (0, helper_1.getTokenDataFromTokenBySecret)(token, (0, helper_1.getENV)('JWT_SECRET'));
@@ -84,7 +84,7 @@ class AuthUtil {
                 yield access_token_1.AccessTokenModel.schema(this.ref, "_").destroy({
                     where: { refresh_token_id: refreshTokenId }
                 });
-                let include_access = {}, attributes = (this.ref == 'core') ? ['group_id'] : ['organ_id', 'group_id', 'b2b_group_id', 'team_id'];
+                let include_access = {}, attributes = (this.ref == 'core') ? ['group_id'] : ['organ_id', 'group_id', 'b2b_group_id', 'team_id'].concat(attributes_include);
                 let refresh = yield refresh_token_1.RefreshTokenModel.schema(this.ref, "_").findOne({
                     where: { id: refreshTokenId }, attributes, raw: true
                 });

package/utils/file.d.ts

@@ -62,16 +62,23 @@ export declare class FileUtil {
         width?: number;
         height?: number;
     }): Promise<any>;
-    beforeFindFile(where?: {}, { tags, group }?: {
+    beforeFindFile(where?: {}, { attributes, tags, group, verify }?: {
+        attributes?: any;
         tags?: TagFile;
         group?: any;
-    }): {};
-    findAllFile({ where, folder, full, file_link, thumb, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
+        verify?: boolean;
+    }): {
+        where: {};
+        attributes: any;
+        order: any[];
+    };
+    findAllFile({ where, folder, full, file_link, thumb, verify, width, height, parent_folder, attributes, limit, offset, tag, tags, group }?: {
         where?: {};
         folder?: boolean;
         full?: boolean;
         file_link?: boolean;
         thumb?: boolean;
+        verify?: boolean;
         width?: number;
         height?: number;
         parent_folder?: string;
@@ -82,6 +89,12 @@ export declare class FileUtil {
         tags?: TagFile;
         group?: any;
     }): Promise<any[]>;
+    countFileByFolder(slug: string, { where, parent_folder, tags, group }?: {
+        where?: {};
+        parent_folder?: string;
+        tags?: any[];
+        group?: any;
+    }): Promise<number>;
     findAndCountAllFileByFolder(slug: string, { where, file_link, parent_folder, limit, offset, tag, tags, group }?: {
         where?: {};
         file_link?: boolean;

package/utils/file.js

@@ -14,7 +14,6 @@ const aws = require("aws-sdk");
 const jimp = require("jimp/dist");
 const mime = require("mime-types");
 const _ = require("lodash");
-const uuid_1 = require("uuid");
 const path = require("path");
 const fs = require("fs");
 const getBuffer = (image, { mimetype = "" } = {}) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
@@ -108,6 +107,7 @@ class FileUtil {
     }
     afterQueryFile(data = {}, { tag = {}, file_link = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            delete data['thumbnail'];
             data['custom'] = data['custom'] || {};
             data['tags'] = data['tags'] || [];
             if (data['filename'] == data['path']) {
@@ -276,12 +276,12 @@ class FileUtil {
                         return null;
                     where['$folder.parent_id$'] = query['id'];
                 }
-                where = this.beforeFindFile(where, { tags, group });
+                let option = this.beforeFindFile(where, { attributes: ['id', 'extension', 'filename', 'path', 'thumb'], tags, group });
                 let result = yield file_1.FileModel.schema(this.ref, "_").findOne({
-                    raw: true, attributes: ['id', 'extension', 'filename', 'path', 'thumb'],
-                    where: Object.assign({ '$folder.slug$': slug }, where),
+                    raw: true, attributes: option.attributes,
+                    where: Object.assign({ '$folder.slug$': slug }, option.where),
                     include: [{ as: 'folder', model: folder_1.FolderModel.schema(this.ref, "_"), attributes: [] }],
-                    order: [['sort', 'asc'], ['tags', 'desc']]
+                    order: option.order
                 });
                 return this.findImageThumb(result, { width, height });
             }
@@ -299,7 +299,8 @@ class FileUtil {
             return this.findImageThumb(item, { width, height });
         });
     }
-    beforeFindFile(where = {}, { tags = [], group = undefined } = {}) {
+    beforeFindFile(where = {}, { attributes = undefined, tags = [], group = undefined, verify = false } = {}) {
+        let order = [['sort', 'asc'], ['tags', 'desc']], thumbnail = false;
         if (this.option.organ_id) {
             where[sequelize_1.Op.and] = (where[sequelize_1.Op.and] || []).concat({ [sequelize_1.Op.or]: [{ organ_id: this.option.organ_id }, { organ_by: this.option.organ_id }] });
         }
@@ -310,9 +311,11 @@ class FileUtil {
             let op = tags.reduce((total, tag) => {
                 let value = Object.keys(tag).reduce((total, key) => total.concat([`'${key}'`, `"${tag[key]}"`]), []).join(',');
                 if (value) {
-                    total = total.concat((0, sequelize_1.literal)(`JSON_CONTAINS(tags,JSON_OBJECT(${value}))`));
-                    if (tag['slug'] == "thumbnail") {
-                        total = total.concat((0, sequelize_1.literal)(`tags IS NULL`));
+                    if (tag['slug'] == "thumbnail" && !verify) {
+                        thumbnail = true;
+                    }
+                    else {
+                        total = total.concat((0, sequelize_1.literal)(`JSON_CONTAINS(tags,JSON_OBJECT(${value}))`));
                     }
                 }
                 return total;
@@ -321,9 +324,19 @@ class FileUtil {
                 where[sequelize_1.Op.and] = (where[sequelize_1.Op.and] || []).concat({ [sequelize_1.Op.or]: op });
             }
         }
-        return where;
+        if (thumbnail) {
+            let include = [[(0, sequelize_1.literal)(`IF(JSON_CONTAINS(tags,JSON_OBJECT('slug',"thumbnail")),'yes','no')`), 'thumbnail']];
+            if (typeof attributes == "undefined") {
+                attributes = { include };
+            }
+            else if (attributes instanceof Array) {
+                attributes = attributes.concat(include);
+            }
+            order = [['thumbnail', 'desc'], ['sort', 'asc']];
+        }
+        return { where, attributes, order };
     }
-    findAllFile({ where = {}, folder = false, full = false, file_link = false, thumb = false, width = 0, height = 0, parent_folder = "", attributes = undefined, limit = undefined, offset = undefined, tag = {}, tags = [], group = undefined } = {}) {
+    findAllFile({ where = {}, folder = false, full = false, file_link = false, thumb = false, verify = true, width = 0, height = 0, parent_folder = "", attributes = undefined, limit = undefined, offset = undefined, tag = {}, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
                 let include = [];
@@ -335,10 +348,10 @@ class FileUtil {
                         return [];
                     where['$folder.parent_id$'] = query['id'];
                 }
-                where = this.beforeFindFile(where, { tags, group });
                 where['is_hidden'] = where['is_hidden'] || "no";
+                let option = this.beforeFindFile(where, { attributes, tags, group, verify });
                 let result = yield file_1.FileModel.schema(this.ref, "_").findAll({
-                    attributes, raw: true, where, limit, offset, include, order: [['sort', 'asc'], ['tags', 'desc']]
+                    attributes: option.attributes, raw: true, where: option.where, limit, offset, include, order: option.order
                 });
                 result.length && (yield this.getStorage());
                 result = yield Promise.all(result.map((item) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -359,6 +372,33 @@ class FileUtil {
             }
         });
     }
+    countFileByFolder(slug, { where = {}, parent_folder = "", tags = [], group = null } = {}) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let include_folder = [];
+            if (parent_folder) {
+                where['$`f->p`.slug$'] = parent_folder;
+                include_folder.push({
+                    required: true, attributes: [],
+                    model: folder_1.FolderModel.schema(this.ref, "_"),
+                    association: new sequelize_1.BelongsTo(folder_1.FolderModel, folder_1.FolderModel, { as: "p", foreignKey: "parent_id", constraints: false })
+                });
+            }
+            where['$f.slug$'] = slug;
+            where['is_hidden'] = where['is_hidden'] || "no";
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            return yield file_1.FileModel.schema(this.ref, "_").count({
+                where: option.where,
+                include: [
+                    {
+                        required: true, attributes: [],
+                        model: folder_1.FolderModel.schema(this.ref, "_"),
+                        association: new sequelize_1.BelongsTo(file_1.FileModel, folder_1.FolderModel, { as: "f", foreignKey: "folder_id", constraints: false }),
+                        include: include_folder
+                    }
+                ]
+            });
+        });
+    }
     findAndCountAllFileByFolder(slug, { where = {}, file_link = false, parent_folder = "", limit = undefined, offset = undefined, tag = {}, tags = [], group = null } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let where_folder = {};
@@ -372,9 +412,9 @@ class FileUtil {
             if (!folder)
                 return { rows: [], count: 0 };
             where['folder_id'] = folder['id'];
-            where = this.beforeFindFile(where, { tags, group });
             where['is_hidden'] = where['is_hidden'] || "no";
-            let data = yield Promise.all([this.findAllFile({ where, full: true, file_link, limit, offset, tag, group }), file_1.FileModel.schema(this.ref, "_").count({ where })]);
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            let data = yield Promise.all([this.findAllFile({ where, full: true, file_link, limit, offset, tag, group }), file_1.FileModel.schema(this.ref, "_").count({ where: option.where })]);
             return { rows: data[0], count: data[1] };
         });
     }
@@ -385,7 +425,7 @@ class FileUtil {
     }
     findOneFileByFolder(slug, { where = {}, full = false, file_link = false, parent_folder = "", tags = [], group = null } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (yield this.findAllFile({ where: Object.assign({ '$folder.slug$': slug }, where), folder: true, full, file_link, parent_folder, limit: 1, tags, group }))[0] || null;
+            return (yield this.findAllFile({ where: Object.assign({ '$folder.slug$': slug }, where), folder: true, full, file_link, verify: false, parent_folder, limit: 1, tags, group }))[0] || null;
         });
     }
     findOneFileById(id, { where = {}, full = true, file_link = false, parent_folder = "", tags = [], group = null } = {}) {
@@ -555,6 +595,8 @@ class FileUtil {
                 case "shtml":
                 case "svg":
                 case "rar":
+                case "kml":
+                case "shp":
                     type = 'o';
                     break;
             }
@@ -569,7 +611,7 @@ class FileUtil {
             try {
                 let result = yield Promise.all(files.map((file, key) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     folder_id = reqs[key].folder ? reqs[key].folder : folder_id;
-                    let id = (0, uuid_1.v4)().replace(/-/gi, '').substring(0, 15);
+                    let id = (0, helper_1.getFileId)();
                     let organ_id = this.option.organ_id;
                     let organ_by = this.option.parent_organ_id;
                     let sort = (0, helper_1.getDateTime)().format(formatDateTime);
@@ -635,7 +677,7 @@ class FileUtil {
             }
             catch (err) {
                 if (err.errors && err.errors[0].validatorKey == "not_unique") {
-                    results = results.map(item => (Object.assign(Object.assign({}, item), { id: (0, uuid_1.v4)().replace(/-/gi, '').substring(0, 15) })));
+                    results = results.map(item => (Object.assign(Object.assign({}, item), { id: (0, helper_1.getFileId)() })));
                     return yield this.insertFileUnique(results, { format, thumb, width, height });
                 }
                 return Promise.reject(errors_1.generalError.BAD_REQUEST);
@@ -678,8 +720,8 @@ class FileUtil {
     }
     remove({ where = {}, delete_object = false, error = true, tags = [], group = undefined } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            where = this.beforeFindFile(where, { tags, group });
-            let files = yield file_1.FileModel.schema(this.ref, "_").findAll({ where, attributes: ['id', 'path', 'thumb'], raw: true });
+            let option = this.beforeFindFile(where, { tags, group, verify: true });
+            let files = yield file_1.FileModel.schema(this.ref, "_").findAll({ where: option.where, attributes: ['id', 'path', 'thumb'], raw: true });
             if (files.length) {
                 let paths = [], id = files.map(i => { paths = paths.concat(this.getFilePath(i)); return i['id']; });
                 yield file_1.FileModel.schema(this.ref, "_").destroy({ where: { id } });

package/utils/helper.d.ts

@@ -17,6 +17,7 @@ export declare const getENVIndex: (index: string, { prefix, force }?: {
     force?: boolean;
 }) => string;
 export declare const getSlug: (length?: number) => string;
+export declare const getFileId: () => string;
 export declare const getDateMysql: (date?: any) => any;
 export declare const getTimestampMysql: (date?: any) => number;
 export declare const getDateTime: (time?: any, { utc }?: {
@@ -27,7 +28,12 @@ export declare const getValueFunctionFile: (key: any) => (value: any, { result,
     json?: {};
     fileUtil?: any;
 }) => Promise<void>;
-export declare const getValueFunctionLang: (key: any) => (value?: {}, { result, transform, spread, spread_all, raw, lang_code }?: {
+export declare const getValueFunctionArray: (key: any) => (value: any, { result }: {
+    result?: {};
+}) => void;
+export declare const getValueFunctionLang: (key: any, { field_type }?: {
+    field_type?: string;
+}) => (value?: {}, { result, transform, spread, spread_all, raw, lang_code }?: {
     result?: {};
     transform?: boolean;
     spread?: boolean;

package/utils/helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripEmoji = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getSlug = exports.getENVIndex = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
+exports.convertCurrency = exports.xorMerge = exports.xorDecode = exports.xorEncode = exports.getInstanceNumber = exports.getDomain = exports.getParent = exports.replaceColon = exports.stripEmoji = exports.stripHtml = exports.slugifyField = exports.slugify = exports.convertToBigEndian = exports.expandTree = exports.buildTree = exports.treeToArray = exports.randomRef = exports.multiExecArray = exports.isBase64 = exports.isNumber = exports.removeAt = exports.removeSpace = exports.formatMobileNumber = exports.getMobileNumber = exports.removeHyphen = exports.signToken = exports.getTokenDataFromTokenBySecret = exports.getUUID32 = exports.getUUID = exports.sleep = exports.getValueByLang = exports.getValueFunctionLang = exports.getValueFunctionArray = exports.getValueFunctionFile = exports.getDateTime = exports.getTimestampMysql = exports.getDateMysql = exports.getFileId = exports.getSlug = exports.getENVIndex = exports.getENV = exports.Joi_date = exports.getDaysBetweenDates = exports.getDateFromString = exports.getDateRangeFormat = void 0;
 const tslib_1 = require("tslib");
 const crypto = require("crypto");
 const dotenv = require("dotenv");
@@ -13,6 +13,7 @@ const date_1 = require("@joi/date");
 const numeral = require("numeral");
 const _ = require("lodash");
 const sha1 = require('js-sha1');
+const uid = new short_unique_id_1.default();
 dotenv.config();
 const getDateRangeFormat = (dates = [], { format: { day = "D", month = "MMM", year = "Y" } = {} } = {}) => {
     dates = dates.map(i => (0, exports.getDateTime)(i));
@@ -65,9 +66,13 @@ const getENVIndex = (index, { prefix = "dev", force = false } = {}) => {
 };
 exports.getENVIndex = getENVIndex;
 const getSlug = (length = 8) => {
-    return new short_unique_id_1.default().randomUUID(length);
+    return uid.rnd(length);
 };
 exports.getSlug = getSlug;
+const getFileId = () => {
+    return uid.rnd(15);
+};
+exports.getFileId = getFileId;
 const getDateMysql = (date = undefined) => {
     try {
         return (0, exports.getDateTime)(date).format("YYYY-MM-DD HH:mm:ss");
@@ -101,7 +106,22 @@ const getValueFunctionFile = (key) => {
     });
 };
 exports.getValueFunctionFile = getValueFunctionFile;
-const getValueFunctionLang = (key) => {
+const getValueFunctionArray = (key) => {
+    return (value, { result = {} }) => {
+        if (value[key]) {
+            try {
+                result[key] = JSON.parse(value[key]);
+            }
+            catch (err) { }
+            ;
+        }
+        if (!(result[key] instanceof Array)) {
+            result[key] = [];
+        }
+    };
+};
+exports.getValueFunctionArray = getValueFunctionArray;
+const getValueFunctionLang = (key, { field_type = "" } = {}) => {
     return (value = {}, { result = {}, transform = true, spread = false, spread_all = false, raw = false, lang_code = "" } = {}) => {
         if (raw || typeof value[key] == "undefined")
             return;
@@ -125,6 +145,9 @@ const getValueFunctionLang = (key) => {
             return;
         }
         result[key] = bol ? (obj[lang_code] || obj['en']) : value[key];
+        if (field_type == "stream") {
+            (0, exports.getValueFunctionArray)(key)({ [key]: result[key] }, { result });
+        }
     };
 };
 exports.getValueFunctionLang = getValueFunctionLang;

package/utils/stream.d.ts

@@ -76,13 +76,14 @@ export declare class StreamUtil {
         include?: any;
         include_only?: boolean;
     }): any;
-    buildStream(slug: string, namespace: string, { query, builder, fetch, label, attribute, attributes, field_exclude, include, include_all }?: {
+    buildStream(slug: string, namespace: string, { query, builder, fetch, label, attribute, attributes, field_option, field_exclude, include, include_all }?: {
         query?: boolean;
         builder?: boolean;
         fetch?: boolean;
         label?: boolean;
         attribute?: boolean;
         attributes?: any;
+        field_option?: {};
         field_exclude?: any[];
         include?: {};
         include_all?: boolean;
@@ -92,10 +93,11 @@ export declare class StreamUtil {
         fetchFn: any;
         attributes: any;
     }>;
-    getBuilder(slug: string, namespace: string, { query, index, builder, field_exclude }?: {
+    getBuilder(slug: string, namespace: string, { query, index, builder, field_option, field_exclude }?: {
         query?: boolean;
         index?: string;
         builder?: boolean;
+        field_option?: {};
         field_exclude?: any[];
     }): Promise<any>;
     getValue(slug: string, namespace: string, value: any, { query, transform, spread, spread_all, raw, lang_code }?: {
@@ -305,7 +307,7 @@ export declare class StreamUtil {
         stripUnknown?: boolean;
         builder?: boolean;
     }): Promise<Joi.ObjectSchema<any>>;
-    validate(slug: string, namespace: string, input: any, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage, builder, field_exclude }?: {
+    validate(slug: string, namespace: string, input: any, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage, builder, field_option, field_exclude }?: {
         req?: Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
         isNew?: boolean;
         default_value?: {};
@@ -315,6 +317,7 @@ export declare class StreamUtil {
         inputLangSeparate?: boolean;
         prefixMessage?: string;
         builder?: boolean;
+        field_option?: {};
         field_exclude?: any[];
     }): Promise<any>;
     validateByField(streams: Array<any>, input: any, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage }?: {

package/utils/stream.js

@@ -235,13 +235,13 @@ class StreamUtil {
         }
         return data;
     }
-    buildStream(slug, namespace, { query = true, builder = true, fetch = false, label = false, attribute = false, attributes = null, field_exclude = [], include = {}, include_all = false } = {}) {
+    buildStream(slug, namespace, { query = true, builder = true, fetch = false, label = false, attribute = false, attributes = null, field_option = {}, field_exclude = [], include = {}, include_all = false } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let build = this.builder[slug + "_" + namespace] || { stream: null, fields: null, fetchFn: [], attributes: null };
             if (!build['fields']) {
                 let data = {};
                 if (query)
-                    data = yield this.findField(slug, namespace, { field_only: false, convert_option: true, field_exclude });
+                    data = yield this.findField(slug, namespace, { field_only: false, convert_option: true, field_option, field_exclude });
                 build['fields'] = data['fields'] || [];
                 build['stream'] = _.omit(data, ['fields']);
             }
@@ -255,7 +255,7 @@ class StreamUtil {
                         delete attributes[field['field_slug']];
                     }
                     if (fetch) {
-                        if (field['is_lang'] == "yes") {
+                        if (field['is_lang'] == "yes" && field['field_type'] != "stream") {
                             label && fetchLabel.push(field);
                             fetchFn.push((0, helper_2.getValueFunctionLang)(field['field_slug']));
                         }
@@ -286,6 +286,15 @@ class StreamUtil {
                                         }
                                     }
                                     break;
+                                case "stream":
+                                    if (include[field['field_slug']] || include_all) {
+                                        label && fetchLabel.push(field);
+                                        fetchFn.push((field['is_lang'] == "yes") ? (0, helper_2.getValueFunctionLang)(field['field_slug'], { field_type: field['field_type'] }) : (0, helper_2.getValueFunctionArray)(field['field_slug']));
+                                    }
+                                    else {
+                                        delete attributes[field['field_slug']];
+                                    }
+                                    break;
                             }
                         }
                     }
@@ -303,9 +312,9 @@ class StreamUtil {
             return build;
         });
     }
-    getBuilder(slug, namespace, { query = true, index = "", builder = true, field_exclude = [] } = {}) {
+    getBuilder(slug, namespace, { query = true, index = "", builder = true, field_option = {}, field_exclude = [] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let result = yield this.buildStream(slug, namespace, { query, builder, field_exclude });
+            let result = yield this.buildStream(slug, namespace, { query, builder, field_option, field_exclude });
             return index ? result[index] : result;
         });
     }
@@ -404,6 +413,15 @@ class StreamUtil {
                 else if (typeof default_value[item['field_slug']] !== 'undefined') {
                     item['field_value'] = default_value[item['field_slug']];
                 }
+                if (item['field_type'] == "stream" && item['field_value']) {
+                    try {
+                        item['field_value'] = JSON.parse(item['field_value']);
+                    }
+                    catch (err) { }
+                    if (!(item['field_value'] instanceof Array)) {
+                        item['field_value'] = [];
+                    }
+                }
                 if (item['instructions']) {
                     (0, helper_2.getValueFunctionLang)('instructions')(item, { result: item, lang_code });
                 }
@@ -468,8 +486,10 @@ class StreamUtil {
                         }
                         return Object.assign({ field_slug: i['lang_code'], field_name: `${convert_option ? (0, i18n_1.__)({ phrase: item['field_name'], locale: lang_code }) : item['field_name']} (${i['lang_code']})`, field_type: item['field_type'], field_name_raw: item['field_name'] ? item['field_name'] : "", is_required: item['is_required'] }, include);
                     });
-                    fields.push(Object.assign(Object.assign({}, item), { field_data }));
-                    continue;
+                    if (item['field_type'] != "stream") {
+                        fields.push(Object.assign(Object.assign({}, item), { field_data }));
+                        continue;
+                    }
                 }
                 if (convert_option) {
                     let obj_value = {};
@@ -661,6 +681,14 @@ class StreamUtil {
                             field_data['range']['field_value'] = default_value[field_data['range']['field_target']];
                         }
                     }
+                    else if (item['field_type'] == "stream") {
+                        if (field_data['choose_stream']) {
+                            let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_namespace'] });
+                            if (stream) {
+                                item['stream'] = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { option, lang_code, field_only: true, convert_option: true });
+                            }
+                        }
+                    }
                 }
                 fields.push(Object.assign(Object.assign({}, item), { field_data }));
             }
@@ -813,7 +841,7 @@ class StreamUtil {
             stream = stream || {};
             let id_stream = stream['id'], stream_prefix = stream['stream_prefix'];
             if (fields && fields.length) {
-                fields = fields.filter(({ is_lang, field_type, field_data }) => field_type && (is_lang == "yes" || (field_type == "multiple" && field_data['self_table'] != "yes") || field_type == "image" || field_type == "file" || field_data['field_type'] == "encrypt"));
+                fields = fields.filter(({ is_lang, field_type, field_data }) => field_type && (is_lang == "yes" || (field_type == "multiple" && field_data['self_table'] != "yes") || field_type == "image" || field_type == "file" || field_data['field_type'] == "encrypt" || field_type == "stream"));
             }
             if (!Object.keys(raw_input).length) {
                 raw_input = input;
@@ -893,6 +921,9 @@ class StreamUtil {
                     else if (field_type == "multiple") {
                         fields_post.push(fields[index]);
                     }
+                    else if (field_type == "stream" && input[field_slug]) {
+                        data[field_slug] = JSON.stringify(input[field_slug]);
+                    }
                 })));
             }
             if (id) {
@@ -956,8 +987,8 @@ class StreamUtil {
             }
             let folder = yield fileUtil.createFolder(index, { parent_id: where_folder['parent_id'] });
             let where_file = { folder_id: folder['id'], is_hidden: "yes" };
-            where_file = fileUtil.beforeFindFile(where_file, { tags, group });
-            let query = yield file_1.FileModel.schema(ref, "_").findAll({ where: where_file, attributes: ['id', 'name'], raw: true });
+            let option_file = fileUtil.beforeFindFile(where_file, { tags, group, verify: true });
+            let query = yield file_1.FileModel.schema(ref, "_").findAll({ where: option_file.where, attributes: ['id', 'name'], raw: true });
             id_files = query.reduce((total, item) => Object.assign(total, { [item['name']]: item['id'] }), {});
             let input_files = [];
             yield Promise.all(fields.map(({ field_type, field_slug, field_data }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1666,6 +1697,12 @@ class StreamUtil {
                                 yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.STRING(20) }, opt));
                             }
                             break;
+                        case "stream":
+                            if (field_data['self_table'] == "yes") {
+                                opt['defaultValue'] = undefined;
+                                yield (0, db_1.addColumn)(`${this.ref}_${table}`, field_slug, Object.assign({ type: sequelize.TEXT('long') }, opt));
+                            }
+                            break;
                     }
                 }
             }
@@ -1826,6 +1863,9 @@ class StreamUtil {
                 }
                 field_data = _.pick(field_data, ['range']);
                 break;
+            case "stream":
+                field_data = _.pick(field_data, ['choose_stream', 'self_table']);
+                break;
             default:
                 field_data = {};
                 break;
@@ -1836,7 +1876,8 @@ class StreamUtil {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let field_lang = [];
             let file = req ? ((req.file ? [req.file] : [].concat(req.files || [])).reduce((total, item) => Object.assign(total, { [item['fieldname']]: item }), {})) : {};
-            streams.forEach(({ field_type, field_slug, is_required, is_lang, field_data, data }) => {
+            for (let val of streams) {
+                let { field_type, field_slug, is_required, is_lang, field_data, data } = val;
                 let field;
                 field_data = field_data || {};
                 is_required = (is_required == "yes" && (isNew || (!input[field_slug] && typeof input[field_slug] != "undefined")));
@@ -1969,6 +2010,18 @@ class StreamUtil {
                         }
                         field = field.regex(/^(\+|-)?(?:90(?:(?:\.0{1,6})?)|(?:[0-9]|[1-8][0-9])(?:(?:\.[0-9]{1,6})?))$/).messages({ 'string.pattern.base': `${field_slug} invalid format` });
                         break;
+                    case "stream":
+                        if (field_data['choose_stream']) {
+                            let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_namespace'] });
+                            if (stream) {
+                                let streams = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { field_only: true, convert_option: true });
+                                let validator = yield this.getValidator(streams, { isNew: true, required: is_required, lang, stripUnknown: true });
+                                field = Joi.array().items(validator);
+                            }
+                        }
+                        field = field || Joi.array();
+                        field = is_required ? field.required().min(1) : field.allow(null);
+                        break;
                 }
                 field = field || Joi.any();
                 if (is_required)
@@ -1976,12 +2029,12 @@ class StreamUtil {
                 if (is_lang == "yes") {
                     if (!lang.length) {
                         field_lang.push({ field_slug, field });
-                        return;
+                        continue;
                     }
                     field = Joi.object().keys(lang.reduce((total, i) => Object.assign(total, { [i['lang_code']]: field }), {}));
                 }
                 schema[field_slug] = field;
-            });
+            }
             if (field_lang.length) {
                 lang = yield this.languageUtil.getLangsLive();
                 for (let item of field_lang) {
@@ -2003,9 +2056,9 @@ class StreamUtil {
             return yield this.getValidator(streams, { req, isNew, required, lang, stripUnknown });
         });
     }
-    validate(slug, namespace, input, { req = {}, isNew = false, default_value = {}, lang = [], stripUnknown = false, inputLang = false, inputLangSeparate = true, prefixMessage = "", builder = true, field_exclude = [] } = {}) {
+    validate(slug, namespace, input, { req = {}, isNew = false, default_value = {}, lang = [], stripUnknown = false, inputLang = false, inputLangSeparate = true, prefixMessage = "", builder = true, field_option = {}, field_exclude = [] } = {}) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            let streams = yield this.getBuilder(slug, namespace, { index: "fields", builder, field_exclude });
+            let streams = yield this.getBuilder(slug, namespace, { index: "fields", builder, field_option, field_exclude });
             return this.validateByField(streams, input, { req, isNew, default_value, lang, stripUnknown, inputLang, inputLangSeparate, prefixMessage });
         });
     }

package/utils/validator.js

@@ -104,8 +104,9 @@ const fileService = (setup, { userfiles = false, required = false, fileSize = 0,
     }
     let option = setup(validate);
     let upload = userfiles ? option.array("userfiles", maxCount) : option.any();
+    let schema = userfiles ? { tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) } : { tags: Joi.any() };
     return upload(req, res, (err) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        return (0, exports.validateService)(Joi.object().keys({ tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) }).unknown(), { field_omit: [] })(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+        return (0, exports.validateService)(Joi.object().keys(schema).unknown(), { field_omit: [] })(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
             try {
                 let field = userfiles ? "userfiles" : undefined;
                 if (err) {