namirasoft-field-node 1.4.30 → 1.4.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/controller/NSFListController.d.ts +3 -2
  2. package/dist/controller/NSFListController.js +37 -4
  3. package/dist/controller/NSFListController.js.map +1 -1
  4. package/dist/controller/entity_category/List.js +1 -1
  5. package/dist/controller/entity_field/List.js +2 -1
  6. package/dist/controller/entity_field/List.js.map +1 -1
  7. package/dist/controller/entity_tag/List.js +1 -1
  8. package/package.json +6 -6
  9. package/src/controller/NSFListController.ts +39 -5
  10. package/src/controller/entity_category/List.ts +1 -1
  11. package/src/controller/entity_field/List.ts +2 -1
  12. package/src/controller/entity_tag/List.ts +1 -1
package/dist/controller/NSFListController.d.ts CHANGED
@@ -1,11 +1,12 @@
1
1
  import { Includeable, WhereOptions } from "sequelize";
2
2
  import { NSFTables } from "../database/NSFTables";
3
3
  import { BaseMySqlDatabase } from "namirasoft-node-mysql";
4
+ import { BaseDatabase_FilterTable } from "namirasoft-node";
4
5
  export declare class NSFListController {
5
6
  static handle_getTables(name: string, tables: {
6
- [table: string]: string[];
7
+ [table: string]: BaseDatabase_FilterTable;
7
8
  }): {
8
- [table: string]: string[];
9
+ [table: string]: BaseDatabase_FilterTable;
9
10
  };
10
11
  static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], conditions: {
11
12
  [table: string]: WhereOptions[];
package/dist/controller/NSFListController.js CHANGED
@@ -5,10 +5,43 @@ const sequelize_1 = require("sequelize");
5
5
  class NSFListController {
6
6
  static handle_getTables(name, tables) {
7
7
  let ans = Object.assign({}, tables);
8
- ans[name] = [];
9
- ans[`${name}_category`] = [`${name}.id`, `${name}_category.entity_id`];
10
- ans[`${name}_field`] = [`${name}.id`, `${name}_field.entity_id`];
11
- ans[`${name}_tag`] = [`${name}.id`, `${name}_tag.entity_id`];
8
+ ans[name] = {};
9
+ ans[`${name}_category`] = {
10
+ join_conditions: {
11
+ main: {
12
+ table: name,
13
+ column: "id",
14
+ },
15
+ secondary: {
16
+ table: `${name}_category`,
17
+ column: "entity_id",
18
+ }
19
+ }
20
+ };
21
+ ans[`${name}_field`] = {
22
+ join_conditions: {
23
+ main: {
24
+ table: name,
25
+ column: "id",
26
+ },
27
+ secondary: {
28
+ table: `${name}_field`,
29
+ column: "entity_id",
30
+ }
31
+ }
32
+ };
33
+ ans[`${name}_tag`] = {
34
+ join_conditions: {
35
+ main: {
36
+ table: name,
37
+ column: "id",
38
+ },
39
+ secondary: {
40
+ table: `${name}_tag`,
41
+ column: "entity_id",
42
+ }
43
+ }
44
+ };
12
45
  return ans;
13
46
  }
14
47
  static handle_getIncludes(name, includes, conditions, tables) {
package/dist/controller/NSFListController.js.map CHANGED
@@ -1 +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,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,MAAoB;QAEhK,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"}
1
+ {"version":3,"file":"NSFListController.js","sourceRoot":"","sources":["../../src/controller/NSFListController.ts"],"names":[],"mappings":";;;AAAA,yCAA+B;AAM/B,MAAa,iBAAiB;IAE1B,MAAM,CAAC,gBAAgB,CAAC,IAAY,EAAE,MAAsD;QAExF,IAAI,GAAG,qBAAQ,MAAM,CAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,GAAG,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG;YACtB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,WAAW;oBACzB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,GAAG;YACnB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,QAAQ;oBACtB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;YACjB,eAAe,EAAE;gBACb,IAAI,EAAE;oBACF,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAI;iBACf;gBACD,SAAS,EAAE;oBACP,KAAK,EAAE,GAAG,IAAI,MAAM;oBACpB,MAAM,EAAE,WAAW;iBACtB;aACJ;SACJ,CAAC;QACF,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,kBAAkB,CAA8B,IAAY,EAAE,QAAuB,EAAE,UAAgD,EAAE,MAAoB;QAEhK,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;AAnED,8CAmEC"}
package/dist/controller/entity_category/List.js CHANGED
@@ -57,7 +57,7 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
57
57
  }
58
58
  handle() {
59
59
  return __awaiter(this, void 0, void 0, function* () {
60
- let tables = { entity_category: [] };
60
+ let tables = { entity_category: {} };
61
61
  let q = namirasoft_account_node_1.NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
62
62
  let conditions = this.database.getFiltersConditions(tables, q.filters);
63
63
  return yield this.tables.entity_category.list({
package/dist/controller/entity_field/List.js CHANGED
@@ -57,7 +57,8 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
57
57
  }
58
58
  handle() {
59
59
  return __awaiter(this, void 0, void 0, function* () {
60
- let tables = { entity_field: [] };
60
+ this.database;
61
+ let tables = { entity_field: {} };
61
62
  let q = namirasoft_account_node_1.NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
62
63
  let conditions = this.database.getFiltersConditions(tables, q.filters);
63
64
  return yield this.tables.entity_field.list({
package/dist/controller/entity_field/List.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_field/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAsE;IAEtF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO;YAC7B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,aAAa;YACrC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,aAAa;SACpD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/F,CAAC;KAAA;IACc,QAAQ;;YAEtB,OAAO;gBACN,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,KAAK;aACpB,CAAC;QACH,CAAC;KAAA;IACQ,KAAK;QAEb,OAAO,IAAI,CAAC;IACb,CAAC;IACc,MAAM;;YAEpB,IAAI,MAAM,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;YAElC,IAAI,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEvE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC1C,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;aACpC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AApDD,oBAoDC"}
1
+ {"version":3,"file":"List.js","sourceRoot":"","sources":["../../../src/controller/entity_field/List.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA+B;AAC/B,qDAA6C;AAC7C,4EAAyE;AAEzE,qEAAwF;AAExF,MAAa,IAAK,SAAQ,qDAAsE;IAEtF,OAAO;QAEf,OAAO;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,IAAI,CAAC,SAAS,GAAG,OAAO;YAC7B,MAAM,EAAE,4BAAU,CAAC,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,UAAU,GAAG,aAAa;YACrC,OAAO,EAAE,eAAe,IAAI,CAAC,UAAU,aAAa;SACpD,CAAC;IACH,CAAC;IACc,mBAAmB;;YAEjC,OAAO,EAAE,CAAC;QACX,CAAC;KAAA;IACc,gBAAgB;;YAE9B,OAAO,2CAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,CAAC;KAAA;IACc,aAAa;;YAE3B,OAAO,IAAI,CAAC;QACb,CAAC;KAAA;IACc,eAAe;;YAE7B,OAAO,2CAAiB,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/F,CAAC;KAAA;IACc,QAAQ;;YAEtB,OAAO;gBACN,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,KAAK;aACpB,CAAC;QACH,CAAC;KAAA;IACQ,KAAK;QAEb,OAAO,IAAI,CAAC;IACb,CAAC;IACc,MAAM;;YAEpB,IAAI,CAAC,QAAQ,CAAC;YACd,IAAI,MAAM,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;YAElC,IAAI,CAAC,GAA+B,2CAAiB,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAE1G,IAAI,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;YAEvE,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC1C,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;aACpC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AArDD,oBAqDC"}
package/dist/controller/entity_tag/List.js CHANGED
@@ -57,7 +57,7 @@ class List extends BaseEntityFieldController_1.BaseEntityFieldController {
57
57
  }
58
58
  handle() {
59
59
  return __awaiter(this, void 0, void 0, function* () {
60
- let tables = { entity_tag: [] };
60
+ let tables = { entity_tag: {} };
61
61
  let q = namirasoft_account_node_1.NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
62
62
  let conditions = this.database.getFiltersConditions(tables, q.filters);
63
63
  return yield this.tables.entity_tag.list({
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.30",
11
+ "version": "1.4.31",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
@@ -18,11 +18,11 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "namirasoft-access": "^1.4.37",
21
- "namirasoft-account-node": "^1.4.71",
22
- "namirasoft-core": "^1.4.40",
23
- "namirasoft-field": "^1.4.10",
24
- "namirasoft-node": "^1.4.35",
25
- "namirasoft-node-mysql": "^1.4.15",
21
+ "namirasoft-account-node": "^1.4.74",
22
+ "namirasoft-core": "^1.4.41",
23
+ "namirasoft-field": "^1.4.11",
24
+ "namirasoft-node": "^1.4.39",
25
+ "namirasoft-node-mysql": "^1.4.20",
26
26
  "namirasoft-schema": "^1.4.22"
27
27
  },
28
28
  "bin": {
package/src/controller/NSFListController.ts CHANGED
@@ -2,16 +2,50 @@ import { Op } from "sequelize";
2
2
  import { Includeable, WhereOptions } from "sequelize";
3
3
  import { NSFTables } from "../database/NSFTables";
4
4
  import { BaseMySqlDatabase } from "namirasoft-node-mysql";
5
+ import { BaseDatabase_FilterTable } from "namirasoft-node";
5
6
 
6
7
  export class NSFListController
7
8
  {
8
- static handle_getTables(name: string, tables: { [table: string]: string[]; }): { [table: string]: string[]; }
9
+ static handle_getTables(name: string, tables: { [table: string]: BaseDatabase_FilterTable; }): { [table: string]: BaseDatabase_FilterTable; }
9
10
  {
10
11
  let ans = { ...tables };
11
- ans[name] = [];
12
- ans[`${name}_category`] = [`${name}.id`, `${name}_category.entity_id`];
13
- ans[`${name}_field`] = [`${name}.id`, `${name}_field.entity_id`];
14
- ans[`${name}_tag`] = [`${name}.id`, `${name}_tag.entity_id`];
12
+ ans[name] = {};
13
+ ans[`${name}_category`] = {
14
+ join_conditions: {
15
+ main: {
16
+ table: name,
17
+ column: "id",
18
+ },
19
+ secondary: {
20
+ table: `${name}_category`,
21
+ column: "entity_id",
22
+ }
23
+ }
24
+ };
25
+ ans[`${name}_field`] = {
26
+ join_conditions: {
27
+ main: {
28
+ table: name,
29
+ column: "id",
30
+ },
31
+ secondary: {
32
+ table: `${name}_field`,
33
+ column: "entity_id",
34
+ }
35
+ }
36
+ };
37
+ ans[`${name}_tag`] = {
38
+ join_conditions: {
39
+ main: {
40
+ table: name,
41
+ column: "id",
42
+ },
43
+ secondary: {
44
+ table: `${name}_tag`,
45
+ column: "entity_id",
46
+ }
47
+ }
48
+ };
15
49
  return ans;
16
50
  }
17
51
  static handle_getIncludes<D extends BaseMySqlDatabase>(name: string, includes: Includeable[], conditions: { [table: string]: WhereOptions[]; }, tables: NSFTables<D>): Includeable[]
package/src/controller/entity_category/List.ts CHANGED
@@ -45,7 +45,7 @@ export class List extends BaseEntityFieldController<{ rows: EntityCategoryModel[
45
45
  }
46
46
  override async handle()
47
47
  {
48
- let tables = { entity_category: [] };
48
+ let tables = { entity_category: {} };
49
49
 
50
50
  let q: NSAControllerListQueryType = NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
51
51
 
package/src/controller/entity_field/List.ts CHANGED
@@ -45,7 +45,8 @@ export class List extends BaseEntityFieldController<{ rows: EntityFieldModel[],
45
45
  }
46
46
  override async handle()
47
47
  {
48
- let tables = { entity_field: [] };
48
+ this.database;
49
+ let tables = { entity_field: {} };
49
50
 
50
51
  let q: NSAControllerListQueryType = NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
51
52
 
package/src/controller/entity_tag/List.ts CHANGED
@@ -45,7 +45,7 @@ export class List extends BaseEntityFieldController<{ rows: EntityTagModel[], co
45
45
  }
46
46
  override async handle()
47
47
  {
48
- let tables = { entity_tag: [] };
48
+ let tables = { entity_tag: {} };
49
49
 
50
50
  let q: NSAControllerListQueryType = NSAControllerList.handle_GetQueries(this, this.props.access.owner_id);
51
51