namirasoft-core 1.0.12 → 1.0.14
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.
- package/dist/ConvertService.d.ts +4 -0
- package/dist/ConvertService.js +17 -4
- package/dist/ConvertService.js.map +1 -1
- package/dist/PackageService.d.ts +3 -3
- package/dist/PackageService.js +3 -3
- package/dist/PackageService.js.map +1 -1
- package/package.json +1 -1
- package/src/ConvertService.ts +22 -4
- package/src/PackageService.ts +6 -6
package/dist/ConvertService.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
export declare abstract class ConvertService {
|
|
2
|
+
private mandatory;
|
|
3
|
+
constructor(mandatory?: boolean);
|
|
2
4
|
abstract getNullString(): string | null;
|
|
5
|
+
private checkMandatory;
|
|
6
|
+
protected onMandatoryError(): void;
|
|
3
7
|
getString(_default?: string): string;
|
|
4
8
|
getNullInt(): number | null;
|
|
5
9
|
getInt(_default?: number): number;
|
package/dist/ConvertService.js
CHANGED
|
@@ -1,10 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConvertService = void 0;
|
|
4
|
+
const ErrorOperation_1 = require("./ErrorOperation");
|
|
4
5
|
class ConvertService {
|
|
6
|
+
constructor(mandatory = false) {
|
|
7
|
+
this.mandatory = mandatory;
|
|
8
|
+
}
|
|
9
|
+
checkMandatory(value) {
|
|
10
|
+
if (this.mandatory)
|
|
11
|
+
if (value == null || value == undefined || !value)
|
|
12
|
+
this.onMandatoryError();
|
|
13
|
+
return value;
|
|
14
|
+
}
|
|
15
|
+
onMandatoryError() {
|
|
16
|
+
ErrorOperation_1.ErrorOperation.throwHTTP(500, "Object value can not be converted.");
|
|
17
|
+
}
|
|
5
18
|
getString(_default = "") {
|
|
6
19
|
var _a;
|
|
7
|
-
return (_a = this.getNullString()) !== null && _a !== void 0 ? _a : _default;
|
|
20
|
+
return (_a = this.checkMandatory(this.getNullString())) !== null && _a !== void 0 ? _a : _default;
|
|
8
21
|
}
|
|
9
22
|
getNullInt() {
|
|
10
23
|
let str = this.getString();
|
|
@@ -17,7 +30,7 @@ class ConvertService {
|
|
|
17
30
|
}
|
|
18
31
|
getInt(_default = 0) {
|
|
19
32
|
var _a;
|
|
20
|
-
return (_a = this.getNullInt()) !== null && _a !== void 0 ? _a : _default;
|
|
33
|
+
return (_a = this.checkMandatory(this.getNullInt())) !== null && _a !== void 0 ? _a : _default;
|
|
21
34
|
}
|
|
22
35
|
getNullFloat() {
|
|
23
36
|
let str = this.getString();
|
|
@@ -30,7 +43,7 @@ class ConvertService {
|
|
|
30
43
|
}
|
|
31
44
|
getFloat(_default = 0) {
|
|
32
45
|
var _a;
|
|
33
|
-
return (_a = this.getNullFloat()) !== null && _a !== void 0 ? _a : _default;
|
|
46
|
+
return (_a = this.checkMandatory(this.getNullFloat())) !== null && _a !== void 0 ? _a : _default;
|
|
34
47
|
}
|
|
35
48
|
getNullBoolean() {
|
|
36
49
|
let str = this.getString();
|
|
@@ -45,7 +58,7 @@ class ConvertService {
|
|
|
45
58
|
}
|
|
46
59
|
getBoolean(_default = false) {
|
|
47
60
|
var _a;
|
|
48
|
-
return (_a = this.getNullBoolean()) !== null && _a !== void 0 ? _a : _default;
|
|
61
|
+
return (_a = this.checkMandatory(this.getNullBoolean())) !== null && _a !== void 0 ? _a : _default;
|
|
49
62
|
}
|
|
50
63
|
getStringArray(delimiter = ",") {
|
|
51
64
|
let ans = this.getString("").split(delimiter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConvertService.js","sourceRoot":"","sources":["../src/ConvertService.ts"],"names":[],"mappings":";;;AAAA,MAAsB,cAAc;IAGhC,SAAS,CAAC,WAAmB,EAAE;;QAE3B,OAAO,MAAA,IAAI,CAAC,aAAa,EAAE,mCAAI,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"ConvertService.js","sourceRoot":"","sources":["../src/ConvertService.ts"],"names":[],"mappings":"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"}
|
package/dist/PackageService.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare class PackageService {
|
|
2
|
-
static get(path: string): PackageService
|
|
3
|
-
static getMain(): PackageService
|
|
4
|
-
static getThis(): PackageService
|
|
2
|
+
static get(path: string): PackageService;
|
|
3
|
+
static getMain(): PackageService;
|
|
4
|
+
static getThis(): PackageService;
|
|
5
5
|
private json;
|
|
6
6
|
constructor(json: any);
|
|
7
7
|
getName(): string;
|
package/dist/PackageService.js
CHANGED
|
@@ -13,19 +13,19 @@ class PackageService {
|
|
|
13
13
|
if (json)
|
|
14
14
|
return new PackageService(json);
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
throw new Error("Coundn't find package");
|
|
17
17
|
}
|
|
18
18
|
static getMain() {
|
|
19
19
|
const paths = (0, FindUp_1.FindUp)('package.json');
|
|
20
20
|
if (paths)
|
|
21
21
|
return this.get(paths[paths.length - 1]);
|
|
22
|
-
|
|
22
|
+
throw new Error("Coundn't find package");
|
|
23
23
|
}
|
|
24
24
|
static getThis() {
|
|
25
25
|
const paths = (0, FindUp_1.FindUp)('package.json');
|
|
26
26
|
if (paths)
|
|
27
27
|
return this.get(paths[0]);
|
|
28
|
-
|
|
28
|
+
throw new Error("Coundn't find package");
|
|
29
29
|
}
|
|
30
30
|
constructor(json) {
|
|
31
31
|
this.json = json;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PackageService.js","sourceRoot":"","sources":["../src/PackageService.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,qCAAkC;AAElC,MAAa,cAAc;IAEvB,MAAM,CAAC,GAAG,CAAC,IAAY;QAEnB,IAAI,IAAI,EACR;YACI,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACvD,IAAI,IAAI;gBACJ,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;SACvC;QACD,
|
|
1
|
+
{"version":3,"file":"PackageService.js","sourceRoot":"","sources":["../src/PackageService.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,qCAAkC;AAElC,MAAa,cAAc;IAEvB,MAAM,CAAC,GAAG,CAAC,IAAY;QAEnB,IAAI,IAAI,EACR;YACI,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACvD,IAAI,IAAI;gBACJ,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;SACvC;QACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,CAAC,OAAO;QAEV,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC;QACrC,IAAI,KAAK;YACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,CAAC,OAAO;QAEV,MAAM,KAAK,GAAG,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC;QACrC,IAAI,KAAK;YACL,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC7C,CAAC;IAED,YAAY,IAAS;QAEjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IACD,OAAO;QAEH,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC1B,CAAC;IACD,QAAQ;QAEJ,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IAC3B,CAAC;IACD,cAAc;QAEV,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;IACjC,CAAC;IACD,OAAO;QAEH,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC1B,CAAC;IACD,OAAO;QAEH,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC1B,CAAC;IACD,UAAU;QAEN,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC7B,CAAC;CACJ;AAvDD,wCAuDC"}
|
package/package.json
CHANGED
package/src/ConvertService.ts
CHANGED
|
@@ -1,9 +1,27 @@
|
|
|
1
|
+
import { ErrorOperation } from "./ErrorOperation";
|
|
2
|
+
|
|
1
3
|
export abstract class ConvertService
|
|
2
4
|
{
|
|
5
|
+
private mandatory: boolean;
|
|
6
|
+
constructor(mandatory: boolean = false)
|
|
7
|
+
{
|
|
8
|
+
this.mandatory = mandatory;
|
|
9
|
+
}
|
|
3
10
|
abstract getNullString(): string | null;
|
|
11
|
+
private checkMandatory<D>(value: D): D
|
|
12
|
+
{
|
|
13
|
+
if (this.mandatory)
|
|
14
|
+
if (value == null || value == undefined || !value)
|
|
15
|
+
this.onMandatoryError();
|
|
16
|
+
return value;
|
|
17
|
+
}
|
|
18
|
+
protected onMandatoryError(): void
|
|
19
|
+
{
|
|
20
|
+
ErrorOperation.throwHTTP(500, "Object value can not be converted.");
|
|
21
|
+
}
|
|
4
22
|
getString(_default: string = ""): string
|
|
5
23
|
{
|
|
6
|
-
return this.getNullString() ?? _default;
|
|
24
|
+
return this.checkMandatory(this.getNullString()) ?? _default;
|
|
7
25
|
}
|
|
8
26
|
getNullInt(): number | null
|
|
9
27
|
{
|
|
@@ -17,7 +35,7 @@ export abstract class ConvertService
|
|
|
17
35
|
}
|
|
18
36
|
getInt(_default: number = 0): number
|
|
19
37
|
{
|
|
20
|
-
return this.getNullInt() ?? _default;
|
|
38
|
+
return this.checkMandatory(this.getNullInt()) ?? _default;
|
|
21
39
|
}
|
|
22
40
|
getNullFloat(): number | null
|
|
23
41
|
{
|
|
@@ -31,7 +49,7 @@ export abstract class ConvertService
|
|
|
31
49
|
}
|
|
32
50
|
getFloat(_default: number = 0): number
|
|
33
51
|
{
|
|
34
|
-
return this.getNullFloat() ?? _default;
|
|
52
|
+
return this.checkMandatory(this.getNullFloat()) ?? _default;
|
|
35
53
|
}
|
|
36
54
|
getNullBoolean(): boolean | null
|
|
37
55
|
{
|
|
@@ -47,7 +65,7 @@ export abstract class ConvertService
|
|
|
47
65
|
}
|
|
48
66
|
getBoolean(_default: boolean = false): boolean
|
|
49
67
|
{
|
|
50
|
-
return this.getNullBoolean() ?? _default;
|
|
68
|
+
return this.checkMandatory(this.getNullBoolean()) ?? _default;
|
|
51
69
|
}
|
|
52
70
|
getStringArray(delimiter: string = ","): string[]
|
|
53
71
|
{
|
package/src/PackageService.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { FindUp } from "./FindUp";
|
|
|
3
3
|
|
|
4
4
|
export class PackageService
|
|
5
5
|
{
|
|
6
|
-
static get(path: string): PackageService
|
|
6
|
+
static get(path: string): PackageService
|
|
7
7
|
{
|
|
8
8
|
if (path)
|
|
9
9
|
{
|
|
@@ -11,21 +11,21 @@ export class PackageService
|
|
|
11
11
|
if (json)
|
|
12
12
|
return new PackageService(json);
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
throw new Error("Coundn't find package");
|
|
15
15
|
}
|
|
16
|
-
static getMain(): PackageService
|
|
16
|
+
static getMain(): PackageService
|
|
17
17
|
{
|
|
18
18
|
const paths = FindUp('package.json');
|
|
19
19
|
if (paths)
|
|
20
20
|
return this.get(paths[paths.length - 1]);
|
|
21
|
-
|
|
21
|
+
throw new Error("Coundn't find package");
|
|
22
22
|
}
|
|
23
|
-
static getThis(): PackageService
|
|
23
|
+
static getThis(): PackageService
|
|
24
24
|
{
|
|
25
25
|
const paths = FindUp('package.json');
|
|
26
26
|
if (paths)
|
|
27
27
|
return this.get(paths[0]);
|
|
28
|
-
|
|
28
|
+
throw new Error("Coundn't find package");
|
|
29
29
|
}
|
|
30
30
|
private json: any;
|
|
31
31
|
constructor(json: any)
|