namirasoft-site 1.4.34 → 1.4.35

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 (5) hide show
  1. package/dist/NSBaseMetaTable.d.ts +7 -13
  2. package/dist/NSBaseMetaTable.js +30 -19
  3. package/dist/NSBaseMetaTable.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/NSBaseMetaTable.ts +26 -15
package/dist/NSBaseMetaTable.d.ts CHANGED
@@ -1,22 +1,16 @@
1
- import { BaseMetaTable, BaseUUID } from "namirasoft-core";
1
+ import { BaseMetaTable, BaseUUID, NamingConvention } from "namirasoft-core";
2
2
  import { NSBaseMetaTable_Frontend } from "./NSBaseMetaTable_Frontend";
3
3
  import { NSBaseMetaDatabase } from "./NSBaseMetaDatabase";
4
4
  import { NSBaseMetaTable_Backend } from "./NSBaseMetaTable_Backend";
5
5
  import { NSBaseServer } from "./NSBaseServer";
6
6
  export declare abstract class NSBaseMetaTable<Server extends NSBaseServer, Row> extends BaseMetaTable {
7
7
  private static cft_tables;
8
- static getTableAndCFTsIfExists(tables: {
9
- [name: string]: any;
10
- }, name: string): string[];
11
- static getTableAndCFTs(name: string): string[];
12
- static getCFTTablesIfExists(tables: {
13
- [name: string]: any;
14
- }, name: string): string[];
15
- static getCFTTables(name: string): string[];
16
- static HasCFTTable(tables: {
17
- [name: string]: any;
18
- }, name: string): boolean;
19
- static IsCFTTable(name: string): boolean;
8
+ static getTableAndCFTsIfExists(naming: NamingConvention, tables: string[], name: string): string[];
9
+ static getTableAndCFTs(naming: NamingConvention, name: string): string[];
10
+ static getCFTTablesIfExists(naming: NamingConvention, tables: string[], name: string): string[];
11
+ static getCFTTables(naming: NamingConvention, name: string): string[];
12
+ static HasCFTTable(naming: NamingConvention, tables: string[], name: string): boolean;
13
+ static IsCFTTable(naming: NamingConvention, name: string): boolean;
20
14
  database: NSBaseMetaDatabase<Server>;
21
15
  uuid: BaseUUID;
22
16
  front_end: NSBaseMetaTable_Frontend;
package/dist/NSBaseMetaTable.js CHANGED
@@ -5,24 +5,35 @@ const namirasoft_core_1 = require("namirasoft-core");
5
5
  const NSBaseMetaTable_Frontend_1 = require("./NSBaseMetaTable_Frontend");
6
6
  const NSBaseMetaTable_Backend_1 = require("./NSBaseMetaTable_Backend");
7
7
  class NSBaseMetaTable extends namirasoft_core_1.BaseMetaTable {
8
- static getTableAndCFTsIfExists(tables, name) {
9
- return NSBaseMetaTable.getTableAndCFTs(name).filter(t => tables[t]);
10
- }
11
- static getTableAndCFTs(name) {
12
- return [name, ...NSBaseMetaTable.getCFTTables(name)];
13
- }
14
- static getCFTTablesIfExists(tables, name) {
15
- return NSBaseMetaTable.getCFTTables(name).filter(t => tables[t]);
16
- }
17
- static getCFTTables(name) {
18
- return NSBaseMetaTable.cft_tables.map(cft => name + "_" + cft);
19
- }
20
- static HasCFTTable(tables, name) {
21
- return NSBaseMetaTable.getCFTTables(name).some(cft => tables[cft]);
22
- }
23
- static IsCFTTable(name) {
8
+ static getTableAndCFTsIfExists(naming, tables, name) {
9
+ name = namirasoft_core_1.NamingConvention.auto.convert(name, naming);
10
+ tables = tables.map(t => namirasoft_core_1.NamingConvention.auto.convert(t, naming));
11
+ return NSBaseMetaTable.getTableAndCFTs(naming, name).filter(t => tables.includes(t));
12
+ }
13
+ static getTableAndCFTs(naming, name) {
14
+ name = namirasoft_core_1.NamingConvention.auto.convert(name, naming);
15
+ return [name, ...NSBaseMetaTable.getCFTTables(naming, name)];
16
+ }
17
+ static getCFTTablesIfExists(naming, tables, name) {
18
+ name = namirasoft_core_1.NamingConvention.auto.convert(name, naming);
19
+ tables = tables.map(t => namirasoft_core_1.NamingConvention.auto.convert(t, naming));
20
+ return NSBaseMetaTable.getCFTTables(naming, name).filter(t => tables.includes(t));
21
+ }
22
+ static getCFTTables(naming, name) {
23
+ name = namirasoft_core_1.NamingConvention.auto.convert(name, naming);
24
+ let tables = NSBaseMetaTable.cft_tables.map(cft => name + "_" + cft);
25
+ return tables.map(t => namirasoft_core_1.NamingConvention.auto.convert(t, naming));
26
+ }
27
+ static HasCFTTable(naming, tables, name) {
28
+ name = namirasoft_core_1.NamingConvention.auto.convert(name, naming);
29
+ tables = tables.map(t => namirasoft_core_1.NamingConvention.auto.convert(t, naming));
30
+ return NSBaseMetaTable.getCFTTables(naming, name).some(t => tables.includes(t));
31
+ }
32
+ static IsCFTTable(naming, name) {
33
+ name = namirasoft_core_1.NamingConvention.auto.convert(name, naming);
24
34
  for (let i = 0; i < NSBaseMetaTable.cft_tables.length; i++) {
25
- const table = NSBaseMetaTable.cft_tables[i];
35
+ let table = NSBaseMetaTable.cft_tables[i];
36
+ table = namirasoft_core_1.NamingConvention.auto.convert(table, naming);
26
37
  if (name !== table)
27
38
  if (name.endsWith("_" + table))
28
39
  return true;
@@ -37,11 +48,11 @@ class NSBaseMetaTable extends namirasoft_core_1.BaseMetaTable {
37
48
  this.back_end = new NSBaseMetaTable_Backend_1.NSBaseMetaTable_Backend();
38
49
  }
39
50
  isCFTTable() {
40
- return NSBaseMetaTable.IsCFTTable(this.name);
51
+ return NSBaseMetaTable.IsCFTTable(namirasoft_core_1.NamingConvention.lower_case_dash, this.name);
41
52
  }
42
53
  hasFieldTables() {
43
54
  if (this.database)
44
- return NSBaseMetaTable.HasCFTTable(this.database.tables, this.name);
55
+ return NSBaseMetaTable.HasCFTTable(namirasoft_core_1.NamingConvention.lower_case_dash, Object.keys(this.database.tables), this.name);
45
56
  return false;
46
57
  }
47
58
  }
package/dist/NSBaseMetaTable.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NSBaseMetaTable.js","sourceRoot":"","sources":["../src/NSBaseMetaTable.ts"],"names":[],"mappings":";;;AAAA,qDAA0D;AAC1D,yEAAsE;AAEtE,uEAAoE;AAGpE,MAAsB,eAAkD,SAAQ,+BAAa;IAGzF,MAAM,CAAC,uBAAuB,CAAC,MAA+B,EAAE,IAAY;QAExE,OAAO,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,MAAM,CAAC,eAAe,CAAC,IAAY;QAE/B,OAAO,CAAC,IAAI,EAAE,GAAG,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,CAAC,oBAAoB,CAAC,MAA+B,EAAE,IAAY;QAErE,OAAO,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,CAAC,YAAY,CAAC,IAAY;QAE5B,OAAO,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,MAA+B,EAAE,IAAY;QAE5D,OAAO,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,IAAY;QAE1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAC1D,CAAC;YACG,MAAM,KAAK,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC5C,IAAI,IAAI,KAAK,KAAK;gBACd,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC;oBAC1B,OAAO,IAAI,CAAC;QACxB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAMD,YAAY,QAAoC,EAAE,IAAY,EAAE,IAAY,EAAE,IAAc;QAExF,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,IAAI,mDAAwB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,QAAQ,GAAG,IAAI,iDAAuB,EAAO,CAAC;IACvD,CAAC;IACD,UAAU;QAEN,OAAO,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IACD,cAAc;QAEV,IAAI,IAAI,CAAC,QAAQ;YACb,OAAO,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,OAAO,KAAK,CAAC;IACjB,CAAC;;AAxDL,0CAyDC;AAvDkB,0BAAU,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAuD5D,CAAC"}
1
+ {"version":3,"file":"NSBaseMetaTable.js","sourceRoot":"","sources":["../src/NSBaseMetaTable.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.34",
11
+ "version": "1.4.35",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
package/src/NSBaseMetaTable.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { BaseMetaTable, BaseUUID } from "namirasoft-core";
1
+ import { BaseMetaTable, BaseUUID, NamingConvention } from "namirasoft-core";
2
2
  import { NSBaseMetaTable_Frontend } from "./NSBaseMetaTable_Frontend";
3
3
  import { NSBaseMetaDatabase } from "./NSBaseMetaDatabase";
4
4
  import { NSBaseMetaTable_Backend } from "./NSBaseMetaTable_Backend";
@@ -7,31 +7,42 @@ import { NSBaseServer } from "./NSBaseServer";
7
7
  export abstract class NSBaseMetaTable<Server extends NSBaseServer, Row> extends BaseMetaTable
8
8
  {
9
9
  private static cft_tables = ["category", "field", "tag"];
10
- static getTableAndCFTsIfExists(tables: { [name: string]: any }, name: string): string[]
10
+ static getTableAndCFTsIfExists(naming: NamingConvention, tables: string[], name: string): string[]
11
11
  {
12
- return NSBaseMetaTable.getTableAndCFTs(name).filter(t => tables[t]);
12
+ name = NamingConvention.auto.convert(name, naming);
13
+ tables = tables.map(t => NamingConvention.auto.convert(t, naming));
14
+ return NSBaseMetaTable.getTableAndCFTs(naming, name).filter(t => tables.includes(t));
13
15
  }
14
- static getTableAndCFTs(name: string): string[]
16
+ static getTableAndCFTs(naming: NamingConvention, name: string): string[]
15
17
  {
16
- return [name, ...NSBaseMetaTable.getCFTTables(name)];
18
+ name = NamingConvention.auto.convert(name, naming);
19
+ return [name, ...NSBaseMetaTable.getCFTTables(naming, name)];
17
20
  }
18
- static getCFTTablesIfExists(tables: { [name: string]: any }, name: string): string[]
21
+ static getCFTTablesIfExists(naming: NamingConvention, tables: string[], name: string): string[]
19
22
  {
20
- return NSBaseMetaTable.getCFTTables(name).filter(t => tables[t]);
23
+ name = NamingConvention.auto.convert(name, naming);
24
+ tables = tables.map(t => NamingConvention.auto.convert(t, naming));
25
+ return NSBaseMetaTable.getCFTTables(naming, name).filter(t => tables.includes(t));
21
26
  }
22
- static getCFTTables(name: string): string[]
27
+ static getCFTTables(naming: NamingConvention, name: string): string[]
23
28
  {
24
- return NSBaseMetaTable.cft_tables.map(cft => name + "_" + cft);
29
+ name = NamingConvention.auto.convert(name, naming);
30
+ let tables = NSBaseMetaTable.cft_tables.map(cft => name + "_" + cft);
31
+ return tables.map(t => NamingConvention.auto.convert(t, naming));
25
32
  }
26
- static HasCFTTable(tables: { [name: string]: any }, name: string): boolean
33
+ static HasCFTTable(naming: NamingConvention, tables: string[], name: string): boolean
27
34
  {
28
- return NSBaseMetaTable.getCFTTables(name).some(cft => tables[cft]);
35
+ name = NamingConvention.auto.convert(name, naming);
36
+ tables = tables.map(t => NamingConvention.auto.convert(t, naming))
37
+ return NSBaseMetaTable.getCFTTables(naming, name).some(t => tables.includes(t));
29
38
  }
30
- static IsCFTTable(name: string): boolean
39
+ static IsCFTTable(naming: NamingConvention, name: string): boolean
31
40
  {
41
+ name = NamingConvention.auto.convert(name, naming);
32
42
  for (let i = 0; i < NSBaseMetaTable.cft_tables.length; i++)
33
43
  {
34
- const table = NSBaseMetaTable.cft_tables[i];
44
+ let table = NSBaseMetaTable.cft_tables[i];
45
+ table = NamingConvention.auto.convert(table, naming);
35
46
  if (name !== table)
36
47
  if (name.endsWith("_" + table))
37
48
  return true;
@@ -53,12 +64,12 @@ export abstract class NSBaseMetaTable<Server extends NSBaseServer, Row> extends
53
64
  }
54
65
  isCFTTable(): boolean
55
66
  {
56
- return NSBaseMetaTable.IsCFTTable(this.name);
67
+ return NSBaseMetaTable.IsCFTTable(NamingConvention.lower_case_dash, this.name);
57
68
  }
58
69
  hasFieldTables(): boolean
59
70
  {
60
71
  if (this.database)
61
- return NSBaseMetaTable.HasCFTTable(this.database.tables, this.name);
72
+ return NSBaseMetaTable.HasCFTTable(NamingConvention.lower_case_dash, Object.keys(this.database.tables), this.name);
62
73
  return false;
63
74
  }
64
75
  };