namirasoft-node 1.3.29 → 1.3.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.
@@ -1,4 +1,4 @@
1
- import { ArraySchema, BaseTypeSchema, BaseVariableSchema, ObjectSchema } from "namirasoft-schema";
1
+ import { ArraySchema, BaseTypeSchema, ObjectSchema } from "namirasoft-schema";
2
2
  import { BaseDatabase } from "./BaseDatabase";
3
3
  export declare abstract class BaseTable<D extends BaseDatabase, ModelColumnOption> {
4
4
  database: D;
@@ -7,13 +7,14 @@ export declare abstract class BaseTable<D extends BaseDatabase, ModelColumnOptio
7
7
  getSecureColumns(): string[];
8
8
  getReadOnlyColumns(): string[];
9
9
  secure(obj: any): any;
10
- getArraySchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ArraySchema;
11
- getSchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ObjectSchema;
10
+ getArraySchema(require: boolean, name?: string): ArraySchema;
11
+ getSchema(require: boolean, name?: string): ObjectSchema;
12
12
  protected abstract forEachColumn(handler: (name: string, column: ModelColumnOption) => void): void;
13
13
  private getVariableSchema;
14
14
  protected abstract getTypeSchema(element: ModelColumnOption): BaseTypeSchema;
15
15
  protected getExamples(): {
16
16
  [name: string]: string;
17
17
  };
18
- abstract getSchemaByName(name: string): ObjectSchema;
18
+ abstract getSchemaByName(require: boolean, name: string): ObjectSchema;
19
+ getArraySchemaByName(require: boolean, name: string): ArraySchema;
19
20
  }
package/dist/BaseTable.js CHANGED
@@ -19,21 +19,18 @@ class BaseTable {
19
19
  cols.forEach(col => delete obj[col]);
20
20
  return obj;
21
21
  }
22
- getArraySchema(require, name, excludeColumns, joins) {
23
- let ans = this.getSchema(require, name, excludeColumns, joins);
22
+ getArraySchema(require, name) {
23
+ let ans = this.getSchema(require, name);
24
24
  return new namirasoft_schema_1.ArraySchema(require, [ans]);
25
25
  }
26
- getSchema(require, name, excludeColumns, joins) {
26
+ getSchema(require, name) {
27
27
  let secureColumns = this.getSecureColumns();
28
28
  let readOnlyColumns = this.getReadOnlyColumns();
29
29
  let ans = new namirasoft_schema_1.ObjectSchema(name !== null && name !== void 0 ? name : this.getName(), require, null);
30
30
  this.forEachColumn((name, element) => {
31
31
  if (!secureColumns.includes(name))
32
- if (!excludeColumns || !excludeColumns.includes(name))
33
- ans.addField(this.getVariableSchema(name, element, readOnlyColumns.includes(name)));
32
+ ans.addField(this.getVariableSchema(name, element, readOnlyColumns.includes(name)));
34
33
  });
35
- if (joins)
36
- ans.addField(...joins);
37
34
  return ans;
38
35
  }
39
36
  getVariableSchema(name, element, read_only) {
@@ -47,6 +44,10 @@ class BaseTable {
47
44
  getExamples() {
48
45
  return {};
49
46
  }
47
+ getArraySchemaByName(require, name) {
48
+ let ans = this.getSchemaByName(require, name);
49
+ return new namirasoft_schema_1.ArraySchema(require, [ans]);
50
+ }
50
51
  }
51
52
  exports.BaseTable = BaseTable;
52
53
  //# sourceMappingURL=BaseTable.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BaseTable.js","sourceRoot":"","sources":["../src/BaseTable.ts"],"names":[],"mappings":";;;AAAA,yDAAkG;AAGlG,MAAsB,SAAS;IAG3B,YAAY,QAAW;QAEnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAEM,gBAAgB;QAEnB,OAAO,EAAE,CAAC;IACd,CAAC;IACM,kBAAkB;QAErB,OAAO,EAAE,CAAC;IACd,CAAC;IACM,MAAM,CAAC,GAAQ;QAElB,IAAI,GAAG,CAAC,UAAU;YACd,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC;QACzB,IAAI,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACf,CAAC;IACM,cAAc,CAAC,OAAgB,EAAE,IAAa,EAAE,cAAyB,EAAE,KAA4B;QAE1G,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;QAC/D,OAAO,IAAI,+BAAW,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IACM,SAAS,CAAC,OAAgB,EAAE,IAAa,EAAE,cAAyB,EAAE,KAA4B;QAErG,IAAI,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5C,IAAI,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChD,IAAI,GAAG,GAAG,IAAI,gCAAY,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAEjC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC7B,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACjD,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;QACH,IAAI,KAAK;YACL,GAAG,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC;QAC3B,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,iBAAiB,CAAC,IAAY,EAAE,OAA0B,EAAE,SAAkB;;QAElF,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAC7B,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,OAAO,GAAG,MAAA,EAAE,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;QAChC,OAAO,IAAI,sCAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAES,WAAW;QAEjB,OAAO,EAAE,CAAC;IACd,CAAC;CAEJ;AA3DD,8BA2DC"}
1
+ {"version":3,"file":"BaseTable.js","sourceRoot":"","sources":["../src/BaseTable.ts"],"names":[],"mappings":";;;AAAA,yDAAkG;AAGlG,MAAsB,SAAS;IAG3B,YAAY,QAAW;QAEnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAEM,gBAAgB;QAEnB,OAAO,EAAE,CAAC;IACd,CAAC;IACM,kBAAkB;QAErB,OAAO,EAAE,CAAC;IACd,CAAC;IACM,MAAM,CAAC,GAAQ;QAElB,IAAI,GAAG,CAAC,UAAU;YACd,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC;QACzB,IAAI,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACf,CAAC;IACM,cAAc,CAAC,OAAgB,EAAE,IAAa;QAEjD,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxC,OAAO,IAAI,+BAAW,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IACM,SAAS,CAAC,OAAgB,EAAE,IAAa;QAE5C,IAAI,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5C,IAAI,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChD,IAAI,GAAG,GAAG,IAAI,gCAAY,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAEjC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC7B,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,iBAAiB,CAAC,IAAY,EAAE,OAA0B,EAAE,SAAkB;;QAElF,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAC7B,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,OAAO,GAAG,MAAA,EAAE,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;QAChC,OAAO,IAAI,sCAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAES,WAAW;QAEjB,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,oBAAoB,CAAC,OAAgB,EAAE,IAAY;QAEtD,IAAI,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9C,OAAO,IAAI,+BAAW,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;CACJ;AA7DD,8BA6DC"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.3.29",
11
+ "version": "1.3.31",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
@@ -31,7 +31,7 @@
31
31
  "joi": "^17.13.1",
32
32
  "namirasoft-core": "^1.3.29",
33
33
  "namirasoft-log": "^1.3.18",
34
- "namirasoft-schema": "^1.3.10",
34
+ "namirasoft-schema": "^1.3.11",
35
35
  "nodemailer": "^6.9.13",
36
36
  "nodemailer-smtp-transport": "^2.7.4",
37
37
  "request-ip": "^3.3.0",
package/src/BaseTable.ts CHANGED
@@ -25,12 +25,12 @@ export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
25
25
  cols.forEach(col => delete obj[col]);
26
26
  return obj;
27
27
  }
28
- public getArraySchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ArraySchema
28
+ public getArraySchema(require: boolean, name?: string): ArraySchema
29
29
  {
30
- let ans = this.getSchema(require, name, excludeColumns, joins);
30
+ let ans = this.getSchema(require, name);
31
31
  return new ArraySchema(require, [ans]);
32
32
  }
33
- public getSchema(require: boolean, name?: string, excludeColumns?: string[], joins?: BaseVariableSchema[]): ObjectSchema
33
+ public getSchema(require: boolean, name?: string): ObjectSchema
34
34
  {
35
35
  let secureColumns = this.getSecureColumns();
36
36
  let readOnlyColumns = this.getReadOnlyColumns();
@@ -38,11 +38,8 @@ export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
38
38
  this.forEachColumn((name, element) =>
39
39
  {
40
40
  if (!secureColumns.includes(name))
41
- if (!excludeColumns || !excludeColumns.includes(name))
42
- ans.addField(this.getVariableSchema(name, element, readOnlyColumns.includes(name)));
41
+ ans.addField(this.getVariableSchema(name, element, readOnlyColumns.includes(name)));
43
42
  });
44
- if (joins)
45
- ans.addField(...joins);
46
43
  return ans;
47
44
  }
48
45
  protected abstract forEachColumn(handler: (name: string, column: ModelColumnOption) => void): void;
@@ -59,5 +56,10 @@ export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption>
59
56
  {
60
57
  return {};
61
58
  }
62
- public abstract getSchemaByName(name: string): ObjectSchema;
59
+ public abstract getSchemaByName(require: boolean, name: string): ObjectSchema;
60
+ public getArraySchemaByName(require: boolean, name: string): ArraySchema
61
+ {
62
+ let ans = this.getSchemaByName(require, name);
63
+ return new ArraySchema(require, [ans]);
64
+ }
63
65
  }