namirasoft-field-node 1.3.16 → 1.3.18

package/dist/controller/NSFListController.d.ts

@@ -2,12 +2,12 @@ import { Includeable, WhereOptions } from "sequelize";
 import { FieldDatabaseTables } from "../database/FieldDatabaseTables";
 import { BaseMySqlDatabase } from "namirasoft-node-mysql";
 export declare class NSFListController {
-    static handle_getTables(tables: {
+    static handle_getTables(name: string, tables: {
         [table: string]: string[];
-    }, name: string): {
+    }): {
         [table: string]: string[];
     };
-    static handle_getIncludes<D extends BaseMySqlDatabase>(includes: Includeable[], conditions: {
+    static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], conditions: {
         [table: string]: WhereOptions[];
     }, tables: FieldDatabaseTables<D>): Includeable[];
 }

package/dist/controller/NSFListController.js

@@ -3,33 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NSFListController = void 0;
 const sequelize_1 = require("sequelize");
 class NSFListController {
-    static handle_getTables(tables, name) {
+    static handle_getTables(name, tables) {
         let ans = Object.assign({}, tables);
         ans[name] = [];
-        ans["category"] = [`${name}.id`, `${name}_category.entity_id`];
-        ans["field"] = [`${name}.id`, `${name}_field.entity_id`];
-        ans["tag"] = [`${name}.id`, `${name}_tag.entity_id`];
+        ans[`${name}_category`] = [`${name}.id`, `${name}_category.entity_id`];
+        ans[`${name}_field`] = [`${name}.id`, `${name}_field.entity_id`];
+        ans[`${name}_tag`] = [`${name}.id`, `${name}_tag.entity_id`];
         return ans;
     }
-    static handle_getIncludes(includes, conditions, tables) {
+    static handle_getIncludes(name, includes, conditions, tables) {
         let ans = [...includes];
-        if (conditions["category"].length > 0)
+        if (conditions[`${name}_category`].length > 0)
             ans.push({
                 model: tables.entity_category.model,
                 attributes: [],
-                where: { [sequelize_1.Op.and]: conditions["category"] }
+                where: { [sequelize_1.Op.and]: conditions[`${name}_category`] }
             });
-        if (conditions["field"].length > 0)
+        if (conditions[`${name}_field`].length > 0)
             ans.push({
                 model: tables.entity_field.model,
                 attributes: [],
-                where: { [sequelize_1.Op.and]: conditions["field"] }
+                where: { [sequelize_1.Op.and]: conditions[`${name}_field`] }
             });
-        if (conditions["tag"].length > 0)
+        if (conditions[`${name}_tag`].length > 0)
             ans.push({
                 model: tables.entity_tag.model,
                 attributes: [],
-                where: { [sequelize_1.Op.and]: conditions["tag"] }
+                where: { [sequelize_1.Op.and]: conditions[`${name}_tag`] }
             });
         return ans;
     }

package/dist/controller/NSFListController.js.map

@@ -1 +1 @@
-{"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAAA,yCAA+B;AAK/B,MAAa,iBAAiB;IAE1B,MAAM,CAAC,gBAAgB,CAAC,MAAsC,EAAE,IAAY;QAExE,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,IAAI,qBAAqB,CAAC,CAAC;QAC/D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,IAAI,kBAAkB,CAAC,CAAC;QACzD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,IAAI,gBAAgB,CAAC,CAAC;QACrD,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,kBAAkB,CAA8B,QAAuB,EAAE,UAAgD,EAAE,MAA8B;QAE5J,IAAI,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QACxB,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC;YACjC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,KAAK;gBACnC,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE;aAC9C,CAAC,CAAC;QACP,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;gBAChC,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;aAC3C,CAAC,CAAC;QACP,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC;YAC5B,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;gBAC9B,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE;aACzC,CAAC,CAAC;QACP,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAlCD,8CAkCC"}
+{"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAAA,yCAA+B;AAK/B,MAAa,iBAAiB;IAE1B,MAAM,CAAC,gBAAgB,CAAC,IAAY,EAAE,MAAsC;QAExE,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,GAAG,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,IAAI,qBAAqB,CAAC,CAAC;QACvE,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,IAAI,kBAAkB,CAAC,CAAC;QACjE,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,KAAK,EAAE,GAAG,IAAI,gBAAgB,CAAC,CAAC;QAC7D,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,kBAAkB,CAA8B,IAAY,EAAE,QAAuB,EAAE,UAAgD,EAAE,MAA8B;QAE1K,IAAI,GAAG,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;QACxB,IAAI,UAAU,CAAC,GAAG,IAAI,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;YACzC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,KAAK;gBACnC,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,WAAW,CAAC,EAAE;aACtD,CAAC,CAAC;QACP,IAAI,UAAU,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC;YACtC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;gBAChC,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,QAAQ,CAAC,EAAE;aACnD,CAAC,CAAC;QACP,IAAI,UAAU,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC;YACpC,GAAG,CAAC,IAAI,CAAC;gBACL,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;gBAC9B,UAAU,EAAE,EAAE;gBACd,KAAK,EAAE,EAAE,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE;aACjD,CAAC,CAAC;QACP,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAlCD,8CAkCC"}

package/dist/database/FieldDatabaseTables.js

@@ -18,12 +18,15 @@ class FieldDatabaseTables {
         this.entity_category.define(this.name + "_category", EntityCategoryAttributes_1.EntityCategoryAttributes);
         this.entity_field.define(this.name + "_field", EntityFieldAttributes_1.EntityFieldAttributes);
         this.entity_tag.define(this.name + "_tag", EntityTagAttributes_1.EntityTagAttributes);
+        model.hasMany(this.entity_tag.model);
         this.entity_tag.model.belongsTo(model, {
             foreignKey: { name: "entity_id", allowNull: false },
         });
+        model.hasMany(this.entity_field.model);
         this.entity_field.model.belongsTo(model, {
             foreignKey: { name: "entity_id", allowNull: false },
         });
+        model.hasMany(this.entity_category.model);
         this.entity_category.model.belongsTo(model, {
             foreignKey: { name: "entity_id", allowNull: false },
         });

package/dist/database/FieldDatabaseTables.js.map

@@ -1 +1 @@
-{"version":3,"file":"FieldDatabaseTables.js","sourceRoot":"","sources":["../../src/database/FieldDatabaseTables.ts"],"names":[],"mappings":";;;AACA,qEAAkE;AAClE,+DAA4D;AAC5D,2DAAwD;AAExD,0EAAuE;AACvE,8EAA2E;AAC3E,oFAAiF;AAGjF,MAAa,mBAAmB;IAM5B,YAAY,GAAiC,EAAE,QAAkB;QAE7D,IAAI,CAAC,eAAe,GAAG,IAAI,yCAAmB,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;QACxE,IAAI,CAAC,YAAY,GAAG,IAAI,mCAAgB,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,+BAAc,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,CAA+B,KAAmB;QAElD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW,EAAE,mDAAwB,CAAC,CAAC;QAC/E,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,EAAE,6CAAqB,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,yCAAmB,CAAC,CAAC;QAGhE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE;YACnC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE;SACtD,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE;YACrC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE;SACtD,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE;YACxC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE;SACtD,CAAC,CAAC;IACP,CAAC;CACJ;AA9BD,kDA8BC"}
+{"version":3,"file":"FieldDatabaseTables.js","sourceRoot":"","sources":["../../src/database/FieldDatabaseTables.ts"],"names":[],"mappings":";;;AACA,qEAAkE;AAClE,+DAA4D;AAC5D,2DAAwD;AAExD,0EAAuE;AACvE,8EAA2E;AAC3E,oFAAiF;AAGjF,MAAa,mBAAmB;IAM5B,YAAY,GAAiC,EAAE,QAAkB;QAE7D,IAAI,CAAC,eAAe,GAAG,IAAI,yCAAmB,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;QACxE,IAAI,CAAC,YAAY,GAAG,IAAI,mCAAgB,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,+BAAc,CAAW,GAAG,EAAE,QAAQ,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,CAA+B,KAAmB;QAElD,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW,EAAE,mDAAwB,CAAC,CAAC;QAC/E,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,QAAQ,EAAE,6CAAqB,CAAC,CAAC;QACtE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,yCAAmB,CAAC,CAAC;QAGhE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE;YACnC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE;SACtD,CAAC,CAAC;QAEH,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE;YACrC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE;SACtD,CAAC,CAAC;QAEH,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE;YACxC,UAAU,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE;SACtD,CAAC,CAAC;IACP,CAAC;CACJ;AAnCD,kDAmCC"}

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.3.16",
+    "version": "1.3.18",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/index.js",

package/src/controller/NSFListController.ts

@@ -5,35 +5,35 @@ import { BaseMySqlDatabase } from "namirasoft-node-mysql";
 
 export class NSFListController
 {
-    static handle_getTables(tables: { [table: string]: string[]; }, name: string): { [table: string]: string[]; }
+    static handle_getTables(name: string, tables: { [table: string]: string[]; }): { [table: string]: string[]; }
     {
         let ans = { ...tables };
         ans[name] = [];
-        ans["category"] = [`${name}.id`, `${name}_category.entity_id`];
-        ans["field"] = [`${name}.id`, `${name}_field.entity_id`];
-        ans["tag"] = [`${name}.id`, `${name}_tag.entity_id`];
+        ans[`${name}_category`] = [`${name}.id`, `${name}_category.entity_id`];
+        ans[`${name}_field`] = [`${name}.id`, `${name}_field.entity_id`];
+        ans[`${name}_tag`] = [`${name}.id`, `${name}_tag.entity_id`];
         return ans;
     }
-    static handle_getIncludes<D extends BaseMySqlDatabase>(includes: Includeable[], conditions: { [table: string]: WhereOptions[]; }, tables: FieldDatabaseTables<D>): Includeable[]
+    static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], conditions: { [table: string]: WhereOptions[]; }, tables: FieldDatabaseTables<D>): Includeable[]
     {
         let ans = [...includes];
-        if (conditions["category"].length > 0)
+        if (conditions[`${name}_category`].length > 0)
             ans.push({
                 model: tables.entity_category.model,
                 attributes: [],
-                where: { [Op.and]: conditions["category"] }
+                where: { [Op.and]: conditions[`${name}_category`] }
             });
-        if (conditions["field"].length > 0)
+        if (conditions[`${name}_field`].length > 0)
             ans.push({
                 model: tables.entity_field.model,
                 attributes: [],
-                where: { [Op.and]: conditions["field"] }
+                where: { [Op.and]: conditions[`${name}_field`] }
             });
-        if (conditions["tag"].length > 0)
+        if (conditions[`${name}_tag`].length > 0)
             ans.push({
                 model: tables.entity_tag.model,
                 attributes: [],
-                where: { [Op.and]: conditions["tag"] }
+                where: { [Op.and]: conditions[`${name}_tag`] }
             });
         return ans;
     }

package/src/database/FieldDatabaseTables.ts

@@ -28,12 +28,17 @@ export class FieldDatabaseTables<Database extends BaseMySqlDatabase>
         this.entity_tag.define(this.name + "_tag", EntityTagAttributes);
 
         // set foreignKeys
+        model.hasMany(this.entity_tag.model);
         this.entity_tag.model.belongsTo(model, {
             foreignKey: { name: "entity_id", allowNull: false },
         });
+
+        model.hasMany(this.entity_field.model);
         this.entity_field.model.belongsTo(model, {
             foreignKey: { name: "entity_id", allowNull: false },
         });
+
+        model.hasMany(this.entity_category.model);
         this.entity_category.model.belongsTo(model, {
             foreignKey: { name: "entity_id", allowNull: false },
         });