@nsshunt/stsutils 1.10.5 → 1.11.1

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 (11) hide show
  1. package/.github/workflows/npm-publish.yml +2 -2
  2. package/dist/stsoptionsbase.js +0 -1
  3. package/dist/stsoptionsbase.js.map +1 -1
  4. package/dist/validate.js.map +1 -1
  5. package/package.json +3 -2
  6. package/stsoptionsbase.ts +5 -3
  7. package/types/stsoptionsbase.d.ts +3 -2
  8. package/types/stsoptionsbase.d.ts.map +1 -1
  9. package/types/validate.d.ts +2 -1
  10. package/types/validate.d.ts.map +1 -1
  11. package/validate.ts +7 -4
package/.github/workflows/npm-publish.yml CHANGED
@@ -16,7 +16,7 @@ jobs:
16
16
  - uses: actions/checkout@v2
17
17
  - uses: actions/setup-node@v2
18
18
  with:
19
- node-version: 17
19
+ node-version: 18
20
20
  - run: npm ci
21
21
  - run: npm run lint
22
22
  - run: npm test
@@ -28,7 +28,7 @@ jobs:
28
28
  - uses: actions/checkout@v2
29
29
  - uses: actions/setup-node@v2
30
30
  with:
31
- node-version: 17
31
+ node-version: 18
32
32
  registry-url: https://registry.npmjs.org/
33
33
  - run: npm ci
34
34
  - run: npm run build
package/dist/stsoptionsbase.js CHANGED
@@ -4,7 +4,6 @@ exports.STSOptionsBase = void 0;
4
4
  const validate_js_1 = require("./validate.js");
5
5
  class STSOptionsBase {
6
6
  constructor(options = null) {
7
- this._options = null;
8
7
  this._options = options;
9
8
  if (options !== null) {
10
9
  if (typeof options.validator === 'undefined') {
package/dist/stsoptionsbase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stsoptionsbase.js","sourceRoot":"","sources":["../stsoptionsbase.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,MAAa,cAAc;IAI1B,YAAY,UAAe,IAAI;QAFvB,aAAQ,GAAQ,IAAI,CAAC;QAIzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAE3B,IAAI,OAAO,KAAK,IAAI,EAAE;YACrB,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,yGAAyG,CAAC,CAAA;aACxH;iBAAM;gBACN,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aACrC;SACD;IACF,CAAC;IAED,IAAI,OAAO;QAEV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD;AAtBD,wCAsBC"}
1
+ {"version":3,"file":"stsoptionsbase.js","sourceRoot":"","sources":["../stsoptionsbase.ts"],"names":[],"mappings":";;;AAAA,+CAAwC;AAIxC,MAAa,cAAc;IAI1B,YAAY,UAAsB,IAAI;QAElC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAE3B,IAAI,OAAO,KAAK,IAAI,EAAE;YACrB,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;gBAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,KAAK,CAAC,yGAAyG,CAAC,CAAA;aACxH;iBAAM;gBACN,IAAA,sBAAQ,EAAC,OAAO,CAAC,SAAmB,EAAE,OAAO,CAAC,CAAC;aAC/C;SACD;IACF,CAAC;IAED,IAAI,OAAO;QAEV,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;CACD;AAtBD,wCAsBC"}
package/dist/validate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validate.js","sourceRoot":"","sources":["../validate.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA0C;AAE1C,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,SAAc,EAAE,OAAY,EAAO,EAAE;IACvD,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,SAAS,CAAC,MAAM,CAAC;KACxB;SAAM;QACN,OAAO,IAAI,CAAC;KACZ;IACD;;;;;;UAMG;AACJ,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAc;IACrD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B;;;;OAIG;AAEJ,CAAC;AARD,8BAQC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,OAAe;IACrD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACrC,OAAO,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAHD,4BAGC"}
1
+ {"version":3,"file":"validate.js","sourceRoot":"","sources":["../validate.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA0C;AAK1C,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,SAAuC,EAAE,OAAmB,EAAc,EAAE;IAC9F,MAAM,KAAK,GAAY,SAAS,CAAC,OAAO,CAAY,CAAC;IACrD,IAAI,CAAC,KAAK,EAAE;QACX,OAAO,SAAS,CAAC,MAAM,CAAC;KACxB;SAAM;QACN,OAAO,IAAI,CAAC;KACZ;IACD;;;;;;UAMG;AACJ,CAAC,CAAC;AAEF,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAc;IACrD,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5B;;;;OAIG;AAEJ,CAAC;AARD,8BAQC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,OAAmB;IACzD,MAAM,SAAS,GAAiC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACnE,OAAO,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAHD,4BAGC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nsshunt/stsutils",
3
- "version": "1.10.5",
3
+ "version": "1.11.1",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -35,9 +35,10 @@
35
35
  "eslint": "^8.14.0",
36
36
  "jest": "^28.0.2",
37
37
  "supertest": "^6.2.2",
38
- "typescript": "^4.6.3"
38
+ "typescript": "^4.6.4"
39
39
  },
40
40
  "dependencies": {
41
+ "@nsshunt/stsconfig": "^1.24.2",
41
42
  "ajv": "^8.11.0",
42
43
  "axios": "^0.27.2",
43
44
  "colors": "^1.4.0",
package/stsoptionsbase.ts CHANGED
@@ -1,10 +1,12 @@
1
1
  import { Validate } from './validate.js'
2
2
 
3
+ import { JSONObject } from '@nsshunt/stsconfig'
4
+
3
5
  export class STSOptionsBase
4
6
  {
5
- private _options: any = null;
7
+ private _options: JSONObject
6
8
 
7
- constructor(options: any = null)
9
+ constructor(options: JSONObject = null)
8
10
  {
9
11
  this._options = options;
10
12
 
@@ -13,7 +15,7 @@ export class STSOptionsBase
13
15
  console.log(JSON.stringify(options));
14
16
  console.trace("Options Here ------------------------------------------------------------------------------------------")
15
17
  } else {
16
- Validate(options.validator, options);
18
+ Validate(options.validator as string, options);
17
19
  }
18
20
  }
19
21
  }
package/types/stsoptionsbase.d.ts CHANGED
@@ -1,6 +1,7 @@
1
+ import { JSONObject } from '@nsshunt/stsconfig';
1
2
  export declare class STSOptionsBase {
2
3
  private _options;
3
- constructor(options?: any);
4
- get options(): any;
4
+ constructor(options?: JSONObject);
5
+ get options(): JSONObject;
5
6
  }
6
7
  //# sourceMappingURL=stsoptionsbase.d.ts.map
package/types/stsoptionsbase.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stsoptionsbase.d.ts","sourceRoot":"","sources":["../stsoptionsbase.ts"],"names":[],"mappings":"AAEA,qBAAa,cAAc;IAE1B,OAAO,CAAC,QAAQ,CAAa;gBAEjB,OAAO,GAAE,GAAU;IAc/B,IAAI,OAAO,QAGV;CACD"}
1
+ {"version":3,"file":"stsoptionsbase.d.ts","sourceRoot":"","sources":["../stsoptionsbase.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,qBAAa,cAAc;IAE1B,OAAO,CAAC,QAAQ,CAAY;gBAEhB,OAAO,GAAE,UAAiB;IActC,IAAI,OAAO,eAGV;CACD"}
package/types/validate.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { Schema } from 'ajv/dist/jtd';
2
+ import { JSONObject } from '@nsshunt/stsconfig';
2
3
  export declare function AddSchema(name: string, schema: Schema): void;
3
- export declare function Validate(name: string, payload: string): any;
4
+ export declare function Validate(name: string, payload: JSONObject): any;
4
5
  //# sourceMappingURL=validate.d.ts.map
package/types/validate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../validate.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAoB1C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAQ5D;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,CAG3D"}
1
+ {"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../validate.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAqB/C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAQ5D;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,GAAG,CAG/D"}
package/validate.ts CHANGED
@@ -1,9 +1,12 @@
1
1
  import Ajv, { Schema } from 'ajv/dist/jtd'
2
2
 
3
+ import { JSONObject } from '@nsshunt/stsconfig'
4
+ import { AnyValidateFunction } from 'ajv/dist/core';
5
+
3
6
  const ajv = new Ajv();
4
7
 
5
- const _Validate = (validator: any, payload: any): any => {
6
- const valid = validator(payload);
8
+ const _Validate = (validator: AnyValidateFunction<unknown>, payload: JSONObject): any | null => {
9
+ const valid: boolean = validator(payload) as boolean;
7
10
  if (!valid) {
8
11
  return validator.errors;
9
12
  } else {
@@ -28,7 +31,7 @@ export function AddSchema(name: string, schema: Schema): void {
28
31
 
29
32
  }
30
33
 
31
- export function Validate(name: string, payload: string): any {
32
- const validator = ajv.getSchema(name)
34
+ export function Validate(name: string, payload: JSONObject): any {
35
+ const validator: AnyValidateFunction<unknown> = ajv.getSchema(name)
33
36
  return _Validate(validator, payload);
34
37
  }