ts-glitter 22.5.2 → 22.5.3

package/lowcode/cms-plugin/shopping-setting-basic.js

@@ -1748,6 +1748,7 @@ export class ShoppingSettingBasic {
           </div>
         `;
             }
+            return ``;
             return BgWidget.mainCard(html `
         ${drawTitle("預設服務時長", "", "defaultServiceDuration")}
         <div class="tx_700">

package/lowcode/cms-plugin/shopping-setting-basic.ts

@@ -1976,6 +1976,7 @@ export class ShoppingSettingBasic {
           </div>
         `
       }
+      return  ``
       return BgWidget.mainCard(html`
         ${drawTitle("預設服務時長" , "" , "defaultServiceDuration")}
         <div class="tx_700">

package/lowcode/glitter-base/route/public-config.js

@@ -27,7 +27,7 @@ export class PublicConfig {
     }
 }
 function getConfig() {
-    const saasConfig = window.saasConfig;
+    const saasConfig = window.parent.saasConfig;
     return saasConfig;
 }
 function getBaseUrl() {

package/lowcode/glitter-base/route/public-config.ts

@@ -31,7 +31,7 @@ export class PublicConfig {
 }
 
 function getConfig() {
-    const saasConfig: { config: any; api: any } = (window as any).saasConfig;
+    const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
     return saasConfig
 }
 

package/lowcode/public-components/product/pd-card-03.ts

@@ -15,6 +15,7 @@ export class ProductCard03 {
     let label: any = {};
     let loading = false;
     const titleFontColor = glitter.share.globalValue['theme_color.0.title'] ?? '#333333';
+
     const vm = {
       quantity: '1',
       data: prod,

package/lowcode/public-components/product/product-list.js

@@ -208,7 +208,7 @@ export class ProductList {
                             else {
                                 return title;
                             }
-                        })(), array: array, product_id: product_id !== null && product_id !== void 0 ? product_id : [], checked: false, parentTitles: parentTitles.length ? [...parentTitles] : [], allCollections: parentTitles.length ? [...topLevelCollections] : [], subCollections: array.map(subCol => (() => {
+                        })(), array: array, product_id: product_id !== null && product_id !== void 0 ? product_id : [], checked: false, parentTitles: parentTitles.length ? [...parentTitles] : [], allCollections: parentTitles.length ? [...topLevelCollections] : [], subCollections: (array !== null && array !== void 0 ? array : []).map(subCol => (() => {
                             const language_data = subCol.language_data;
                             if (language_data &&
                                 language_data[Language.getLanguage()] &&
@@ -237,7 +237,7 @@ export class ProductList {
                         })) {
                         flattened.push(flattenedCol);
                     }
-                    if (array.length) {
+                    if (array && array.length) {
                         flattened = flattened.concat(flattenCollections(array, [
                             ...parentTitles,
                             (() => {
@@ -343,10 +343,14 @@ export class ProductList {
             </div>`;
                     }
                     function renderItem(item, depth, index) {
+                        var _a, _b;
                         let subHTML = '';
+                        item.array = (_a = item.array) !== null && _a !== void 0 ? _a : [];
                         try {
                             if (item.array.length > 0) {
-                                item.array.map((col, index) => {
+                                ((_b = item.array) !== null && _b !== void 0 ? _b : []).map((col, index) => {
+                                    var _a;
+                                    col.array = (_a = col.array) !== null && _a !== void 0 ? _a : [];
                                     if (!Boolean(col.hidden)) {
                                         subHTML += col.array.length > 0 ? renderItem(col, depth + 1, index) : printUL(col);
                                     }
@@ -625,7 +629,7 @@ export class ProductList {
                                     appName: window.appName,
                                     tag: 'product_widget',
                                     gvc: gvc,
-                                    subData: item,
+                                    subData: item.content,
                                 })}
                                   </div>
                                 </div>`;

package/lowcode/public-components/product/product-list.ts

@@ -398,7 +398,7 @@ export class ProductList {
             checked: false,
             parentTitles: parentTitles.length ? [...parentTitles] : [],
             allCollections: parentTitles.length ? [...topLevelCollections] : [],
-            subCollections: array.map(subCol =>
+            subCollections: (array ?? []).map(subCol =>
               (() => {
                 const language_data = subCol.language_data;
                 if (
@@ -435,7 +435,7 @@ export class ProductList {
           ) {
             flattened.push(flattenedCol);
           }
-          if (array.length) {
+          if (array && array.length) {
             flattened = flattened.concat(
               flattenCollections(
                 array,
@@ -565,10 +565,11 @@ export class ProductList {
 
           function renderItem(item: Collection, depth: number, index: number) {
             let subHTML = '';
-
+            item.array=item.array ?? []
             try {
               if (item.array.length > 0) {
-                item.array.map((col: Collection, index: number) => {
+                (item.array ?? []).map((col: Collection, index: number) => {
+                  col.array=col.array ?? []
                   if (!Boolean(col.hidden)) {
                     subHTML += col.array.length > 0 ? renderItem(col, depth + 1, index) : printUL(col);
                   }
@@ -861,7 +862,7 @@ export class ProductList {
                                       appName: (window as any).appName,
                                       tag: 'product_widget',
                                       gvc: gvc,
-                                      subData: item,
+                                      subData: item.content,
                                     })}
                                   </div>
                                 </div>`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "22.5.2",
+  "version": "22.5.3",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/services/collection.d.ts

@@ -0,0 +1,3 @@
+export declare class ProductCollection {
+    static updateProductCollection(app: string, product_list: any[]): Promise<void>;
+}

package/src/api-public/services/collection.js

@@ -0,0 +1,100 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProductCollection = void 0;
+const database_js_1 = __importDefault(require("../../modules/database.js"));
+const manager_js_1 = require("./manager.js");
+class ProductCollection {
+    static async updateProductCollection(app, product_list) {
+        var _a, _b, _c, _d;
+        const config = (_b = ((_a = (await manager_js_1.Manager.getConfig({
+            appName: app,
+            key: 'collection',
+            language: 'zh-TW'
+        }))[0]) !== null && _a !== void 0 ? _a : {})['value']) !== null && _b !== void 0 ? _b : [];
+        const update_collection_list = [];
+        function loopDelete(array, root) {
+            array.map((dd) => {
+                var _a;
+                const path = [root, dd.title].filter((d1) => d1).join(' / ');
+                dd.product_id = (_a = dd.product_id) !== null && _a !== void 0 ? _a : [];
+                dd.product_id = dd.product_id.filter((d1) => {
+                    return !product_list.find((d2) => { return d2.id === d1; });
+                });
+                if (dd.array) {
+                    loopDelete(dd.array, path);
+                }
+            });
+        }
+        loopDelete(config, '');
+        await database_js_1.default.query(`delete from \`${app}\`.t_collection where product_id in (${product_list.map((dd) => dd.id).join(',')})`, []);
+        for (const product of product_list) {
+            product.collection = ((_c = product.collection) !== null && _c !== void 0 ? _c : []).map((dd) => {
+                return dd.split('/')
+                    .map((segment) => segment.trim())
+                    .join(' / ');
+            }).filter((dd) => {
+                return dd;
+            });
+            ((_d = product.collection) !== null && _d !== void 0 ? _d : []).map((dd) => {
+                update_collection_list.push([product.id, dd]);
+            });
+            await database_js_1.default.query(`replace into \`${app}\`.t_collection (product_id,collection) values ?`, [
+                update_collection_list.map((dd) => {
+                    return dd;
+                })
+            ]);
+            function insertNestedData(array, path, product_id, index) {
+                var _a;
+                let find = array.find((dd) => {
+                    return dd.title === path[index];
+                });
+                if (!find) {
+                    function getEmptyLanguageData() {
+                        return {
+                            title: path[index],
+                            seo: {
+                                domain: '',
+                                title: path[index],
+                                content: '',
+                            },
+                        };
+                    }
+                    find = {
+                        title: path[index],
+                        array: [],
+                        product_id: [],
+                        parentTitles: [],
+                        subCollections: [],
+                        checked: false,
+                        seo_title: '',
+                        seo_content: '',
+                        language_data: {
+                            'zh-CN': getEmptyLanguageData(),
+                            'zh-TW': getEmptyLanguageData(),
+                            'en-US': getEmptyLanguageData(),
+                        },
+                        seo_image: '',
+                        code: path[index]
+                    };
+                    array.push(find);
+                }
+                if (index === path.length - 1) {
+                    return find;
+                }
+                else {
+                    find.array = (_a = find.array) !== null && _a !== void 0 ? _a : [];
+                    return insertNestedData(find.array, path, product_id, index + 1);
+                }
+            }
+            product.collection.map((dd) => {
+                insertNestedData(config, dd.split(' / '), product.id, 0).product_id.push(product.id);
+            });
+        }
+        await database_js_1.default.query(`update \`${app}\`.public_config set value=? where \`key\`='collection'`, [JSON.stringify(config)]);
+    }
+}
+exports.ProductCollection = ProductCollection;
+//# sourceMappingURL=collection.js.map

package/src/api-public/services/collection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collection.js","sourceRoot":"","sources":["collection.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/collection.ts

@@ -0,0 +1,98 @@
+import db from '../../modules/database.js';
+import { Manager } from './manager.js';
+import fs from 'fs';
+
+export class ProductCollection {
+
+  public static async updateProductCollection(app:string,product_list:any[]){
+    const config:any=((
+      await  Manager.getConfig({
+        appName: app,
+        key: 'collection',
+        language:'zh-TW'
+      })
+    )[0] ?? {})['value'] ?? [];
+
+    const update_collection_list:any[]=[]
+    //先刪除分類裡面有相關的商品ID內容，清理資料
+    function loopDelete(array:[],root:string){
+      array.map((dd:any)=>{
+        const path=[root,dd.title].filter((d1:any)=>d1).join(' / ')
+        dd.product_id=dd.product_id ?? [];
+        dd.product_id=dd.product_id.filter((d1:any)=>{
+return !product_list.find((d2)=>{return d2.id === d1})
+        })
+        if(dd.array){
+          loopDelete(dd.array,path)
+        }
+      })
+    }
+    loopDelete(config,'')
+    await db.query(`delete from \`${app}\`.t_collection where product_id in (${product_list.map((dd:any)=>dd.id).join(',')})`,[]);
+    for (const product of product_list){
+      product.collection=(product.collection ?? []).map((dd:any)=>{
+        return dd.split('/') // 拆分所有層級
+          .map((segment:string) => segment.trim()) // 去除空白
+          .join(' / ') // 統一格式為「空白/空白」;
+      }).filter((dd:any)=>{
+        return dd
+      });
+      (product.collection ?? []).map((dd:any)=>{
+        update_collection_list.push([product.id,dd])
+      })
+      await db.query(`replace into \`${app}\`.t_collection (product_id,collection) values ?`,[
+        update_collection_list.map((dd)=>{
+          return dd
+        })
+      ]);
+
+      function insertNestedData(array:any, path:string[], product_id:any,index:number):any {
+        let find=array.find((dd:any)=>{
+          return dd.title === path[index]
+        });
+        if(!find){
+          function getEmptyLanguageData() {
+            return {
+              title: path[index],
+              seo: {
+                domain: '',
+                title: path[index],
+                content: '',
+              },
+            };
+          }
+          find={
+            title: path[index],
+            array: [],
+            product_id: [],
+            parentTitles: [],
+            subCollections: [],
+            checked: false,
+            seo_title: '',
+            seo_content: '',
+            language_data: {
+              'zh-CN': getEmptyLanguageData(),
+              'zh-TW': getEmptyLanguageData(),
+              'en-US': getEmptyLanguageData(),
+            },
+            seo_image: '',
+            code: path[index]
+          }
+          array.push(find)
+        }
+        if(index===path.length-1){
+          return find
+        }else{
+          find.array = find.array ?? []
+          return insertNestedData(find.array,path,product_id,index+1)
+        }
+      }
+      product.collection.map((dd:any)=>{
+        insertNestedData(config, dd.split(' / '),product.id,0).product_id.push(product.id)
+      })
+    }
+
+    await db.query(`update \`${app}\`.public_config set value=? where \`key\`='collection'`,[JSON.stringify(config)])
+  }
+}
+

package/src/api-public/services/data-analyze.d.ts

@@ -10,7 +10,7 @@ export declare class DataAnalyze {
         type: string;
         divisor: number;
         executionTime: string;
-        queryStatus: "error" | "success";
+        queryStatus: "success" | "error";
         queryData: any;
     } | {
         type: string;

package/src/api-public/services/manager.d.ts

@@ -12,6 +12,7 @@ export declare class Manager {
         key: string;
         language: LanguageLocation;
     }): Promise<any[]>;
-    static checkData(data: any[], language: LanguageLocation): Promise<any[]>;
+    static checkSaveData(appName: string, key: string, value: any): Promise<any[]>;
+    static checkData(app: string, data: any[], language: LanguageLocation): Promise<any[]>;
     constructor(token: IToken);
 }

package/src/api-public/services/manager.js

@@ -9,10 +9,10 @@ const database_js_1 = __importDefault(require("../../modules/database.js"));
 class Manager {
     async setConfig(config) {
         try {
-            await database_js_1.default.execute(`replace
-            into \`${config.appName}\`.public_config (\`key\`,\`value\`,updated_at)
+            await database_js_1.default.query(`replace
+        into \`${config.appName}\`.public_config (\`key\`,\`value\`,updated_at)
             values (?,?,?)
-            `, [config.key, config.value, new Date()]);
+        `, [config.key, JSON.stringify(await Manager.checkSaveData(config.appName, config.key, config.value)), new Date()]);
         }
         catch (e) {
             console.error(e);
@@ -21,34 +21,88 @@ class Manager {
     }
     static async getConfig(config) {
         try {
-            return await this.checkData(await database_js_1.default.execute(`select *
-            from \`${config.appName}\`.public_config
-            where \`key\` = ${database_js_1.default.escape(config.key)}
-            `, []), config.language);
+            return await this.checkData(config.appName, await database_js_1.default.query(`select *
+           from \`${config.appName}\`.public_config
+           where \`key\` = ${database_js_1.default.escape(config.key)}
+          `, []), config.language);
         }
         catch (e) {
             console.error(e);
             throw exception_js_1.default.BadRequestError('ERROR', 'getConfig ERROR: ' + e, null);
         }
     }
-    static async checkData(data, language) {
+    static async checkSaveData(appName, key, value) {
+        const data = typeof value === 'string' ? JSON.parse(value) : value;
+        const path_list = [];
+        if (key === 'collection') {
+            async function loop(array, delete_action) {
+                for (const dd of array) {
+                    if (dd.deleted || delete_action) {
+                        if (dd.array && dd.array.length) {
+                            await loop(dd.array, true);
+                        }
+                        await database_js_1.default.query(`delete from \`${appName}\`.t_collection
+                            where collection = ?`, [dd.og_path]);
+                    }
+                    else {
+                        if (dd.array && dd.array.length) {
+                            await loop(dd.array, false);
+                        }
+                        await database_js_1.default.query(`delete from \`${appName}\`.t_collection
+                            where collection = ?`, [dd.og_path]);
+                        if (dd.product_id && dd.product_id.length) {
+                            await database_js_1.default.query(`replace INTO \`${appName}\`.t_collection (collection, product_id) VALUES ?`, [
+                                dd.product_id.map((d1) => {
+                                    return [dd.new_path, d1];
+                                })
+                            ]);
+                        }
+                        path_list.push(dd.new_path);
+                        dd.product_id = (await database_js_1.default.query(`SELECT product_id 
+FROM \`${appName}\`.t_collection where collection = ?;`, [dd.new_path])).map((dd) => {
+                            return dd.product_id;
+                        }).map((dd) => {
+                            return parseInt(dd);
+                        });
+                    }
+                }
+            }
+            await loop(data, false);
+            await database_js_1.default.query(`delete from \`${appName}\`.t_collection
+                            where collection not in (${path_list.map((dd, index) => { return database_js_1.default.escape(dd); }).join(',')})`, []);
+        }
+        function loop2(array) {
+            return array.map((dd) => {
+                if (dd.deleted) {
+                    return undefined;
+                }
+                if (dd.array && dd.array.length) {
+                    dd.array = loop2(dd.array);
+                }
+                return dd;
+            }).filter(dd => dd);
+        }
+        return loop2(data);
+    }
+    static async checkData(app, data, language) {
         if (data[0]) {
             let data_ = data[0];
             switch (data_.key) {
                 case 'collection':
-                    function loop(array) {
+                    function loop(array, path) {
                         array.map(dd => {
+                            const path_ = [path, dd.title].filter((dd) => { return dd; }).join(' / ');
                             if (dd.language_data && dd.language_data[language]) {
                                 dd.code = dd.language_data[language].seo.domain || dd.code;
                                 dd.seo_content = dd.language_data[language].seo.content || dd.seo_content;
                                 dd.seo_title = dd.language_data[language].seo.title || dd.seo_title;
-                                if (dd.array) {
-                                    loop(dd.array);
-                                }
+                            }
+                            if (dd.array) {
+                                loop(dd.array, path_);
                             }
                         });
                     }
-                    loop(data_.value);
+                    loop(data_.value, '');
                     break;
             }
         }

package/src/api-public/services/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["manager.ts"],"names":[],"mappings":";;;;;;AACA,8EAAmD;AACnD,4EAA2C;AAG3C,MAAa,OAAO;IAGX,KAAK,CAAC,SAAS,CAAC,MAAoD;QACzE,IAAI,CAAC;YACH,MAAM,qBAAE,CAAC,OAAO,CACd;qBACa,MAAM,CAAC,OAAO;;aAEtB,EACL,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,CACvC,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,MAAM,sBAAS,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAoE;QAChG,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,SAAS,CACzB,MAAM,qBAAE,CAAC,OAAO,CACd;qBACW,MAAM,CAAC,OAAO;8BACL,qBAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;aACtC,EACH,EAAE,CACH,EACD,MAAM,CAAC,QAAQ,CAChB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,MAAM,sBAAS,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAW,EAAE,QAA0B;QACnE,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YACZ,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,QAAQ,KAAK,CAAC,GAAG,EAAE,CAAC;gBAClB,KAAK,YAAY;oBACf,SAAS,IAAI,CAAC,KAAY;wBACxB,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;4BACb,IAAI,EAAE,CAAC,aAAa,IAAI,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gCACnD,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,IAAI,CAAC;gCAC3D,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,WAAW,CAAC;gCAC1E,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC;gCACpE,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC;oCACb,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;gCACjB,CAAC;4BACH,CAAC;wBACH,CAAC,CAAC,CAAC;oBACL,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAClB,MAAM;YACV,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,KAAa;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AA/DD,0BA+DC"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["manager.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/manager.ts

@@ -8,12 +8,12 @@ export class Manager {
 
   public async setConfig(config: { appName: string; key: string; value: any }) {
     try {
-      await db.execute(
+      await db.query(
         `replace
-            into \`${config.appName}\`.public_config (\`key\`,\`value\`,updated_at)
+        into \`${config.appName}\`.public_config (\`key\`,\`value\`,updated_at)
             values (?,?,?)
-            `,
-        [config.key, config.value, new Date()]
+        `,
+        [config.key, JSON.stringify(await Manager.checkSaveData(config.appName, config.key, config.value)), new Date()]
       );
     } catch (e) {
       console.error(e);
@@ -24,11 +24,12 @@ export class Manager {
   public static async getConfig(config: { appName: string; key: string; language: LanguageLocation }) {
     try {
       return await this.checkData(
-        await db.execute(
+        config.appName,
+        await db.query(
           `select *
-            from \`${config.appName}\`.public_config
-            where \`key\` = ${db.escape(config.key)}
-            `,
+           from \`${config.appName}\`.public_config
+           where \`key\` = ${db.escape(config.key)}
+          `,
           []
         ),
         config.language
@@ -39,24 +40,95 @@ export class Manager {
     }
   }
 
-  public static async checkData(data: any[], language: LanguageLocation) {
+  public static async checkSaveData(appName: string, key: string, value: any) {
+    const data = typeof value === 'string' ? JSON.parse(value) : value;
+    const path_list:string[]=[]
+    if (key === 'collection') {
+      async function loop(array: any[],delete_action:boolean) {
+        for (const dd of array) {
+
+          if (dd.deleted||delete_action) {
+            if (dd.array && dd.array.length) {
+              await loop(dd.array,true);
+            }
+            await db.query(
+              `delete from \`${appName}\`.t_collection
+                            where collection = ?`,
+              [dd.og_path]
+            );
+          } else{
+            if (dd.array && dd.array.length) {
+              await loop(dd.array,false);
+            }
+            await db.query(
+              `delete from \`${appName}\`.t_collection
+                            where collection = ?`,
+              [dd.og_path]
+            );
+            if(dd.product_id && dd.product_id.length){
+              await db.query(`replace INTO \`${appName}\`.t_collection (collection, product_id) VALUES ?`,[
+                dd.product_id.map((d1:string)=>{
+                  return [dd.new_path,d1]
+                })
+              ]);
+            }
+            path_list.push(dd.new_path)
+            dd.product_id=(await db.query(`SELECT product_id 
+FROM \`${appName}\`.t_collection where collection = ?;`,[dd.new_path])).map((dd:any)=>{
+  return dd.product_id
+            }).map((dd:any)=>{
+              return parseInt(dd)
+            })
+          }
+
+        }
+      }
+      await loop(data,false);
+      await db.query(
+        `delete from \`${appName}\`.t_collection
+                            where collection not in (${path_list.map((dd, index) => { return db.escape(dd) }).join(',')})`,
+        []
+      );
+    }
+    function loop2(array: any[]){
+      return array.map((dd)=>{
+        if(dd.deleted){
+          return undefined
+        }
+        if (dd.array && dd.array.length) {
+          dd.array = loop2(dd.array)
+        }
+        return  dd
+      }).filter(dd=>dd)
+    }
+
+    return loop2(data);
+  }
+
+  public static async checkData(app:string,data: any[], language: LanguageLocation) {
     if (data[0]) {
       let data_ = data[0];
+
+
       switch (data_.key) {
         case 'collection':
-          function loop(array: any[]) {
+          function loop(array: any[],path:string) {
             array.map(dd => {
+              const path_=[path,dd.title].filter((dd)=>{return dd}).join(' / ')
               if (dd.language_data && dd.language_data[language]) {
                 dd.code = dd.language_data[language].seo.domain || dd.code;
                 dd.seo_content = dd.language_data[language].seo.content || dd.seo_content;
                 dd.seo_title = dd.language_data[language].seo.title || dd.seo_title;
-                if (dd.array) {
-                  loop(dd.array);
-                }
               }
+              // dd.product_count=count.find((dd:any)=>{return dd.collection===path_})?.count||0;
+              if (dd.array) {
+                loop(dd.array,path_);
+              }
+              // dd.product_id=[]
             });
           }
-          loop(data_.value);
+
+          loop(data_.value,'');
           break;
       }
     }