@ampsec/platform-client 58.3.0 → 58.3.2

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 (21) hide show
  1. package/build/src/dto/assets.dto.d.ts +18 -27
  2. package/build/src/dto/assets.dto.js +3 -3
  3. package/build/src/dto/assets.dto.js.map +1 -1
  4. package/build/src/dto/base.dto.d.ts +2 -2
  5. package/build/src/dto/base.dto.js +4 -4
  6. package/build/src/dto/base.dto.js.map +1 -1
  7. package/build/src/dto/coverage.dto.d.ts +100 -112
  8. package/build/src/dto/coverage.dto.js +4 -4
  9. package/build/src/dto/coverage.dto.js.map +1 -1
  10. package/build/src/dto/saasAssets.dto.d.ts +41 -28
  11. package/build/src/dto/saasAssets.dto.js +3 -4
  12. package/build/src/dto/saasAssets.dto.js.map +1 -1
  13. package/build/src/dto/saasUsers.dto.d.ts +14 -23
  14. package/build/src/dto/saasUsers.dto.js +3 -3
  15. package/build/src/dto/saasUsers.dto.js.map +1 -1
  16. package/package.json +1 -1
  17. package/src/dto/assets.dto.ts +13 -11
  18. package/src/dto/base.dto.ts +4 -4
  19. package/src/dto/coverage.dto.ts +13 -9
  20. package/src/dto/saasAssets.dto.ts +18 -17
  21. package/src/dto/saasUsers.dto.ts +15 -13
package/build/src/dto/assets.dto.d.ts CHANGED
@@ -14,7 +14,7 @@ export declare const _SimpleAssetDto: z.ZodObject<{
14
14
  }>;
15
15
  export type SimpleAssetDto = z.infer<typeof _SimpleAssetDto>;
16
16
  export declare const _AssetUpsertDto: z.ZodObject<{
17
- id: z.ZodOptional<z.ZodString>;
17
+ id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodUndefined]>>;
18
18
  etag: z.ZodString;
19
19
  extKeys: z.ZodObject<{
20
20
  extId: z.ZodOptional<z.ZodString>;
@@ -56,27 +56,9 @@ export declare const _AssetUpsertDto: z.ZodObject<{
56
56
  assetType?: GlobalAssetType | undefined;
57
57
  }>;
58
58
  export type AssetUpsertDto = z.infer<typeof _AssetUpsertDto>;
59
- export declare const _AssetDto: z.ZodIntersection<z.ZodObject<{
60
- id: z.ZodString;
61
- createdAt: z.ZodString;
62
- updatedAt: z.ZodString;
63
- deletedAt: z.ZodNullable<z.ZodString>;
64
- etag: z.ZodString;
65
- }, "strip", z.ZodTypeAny, {
66
- id: string;
67
- createdAt: string;
68
- updatedAt: string;
69
- deletedAt: string | null;
70
- etag: string;
71
- }, {
72
- id: string;
73
- createdAt: string;
74
- updatedAt: string;
75
- deletedAt: string | null;
76
- etag: string;
77
- }>, z.ZodObject<{
78
- id: z.ZodOptional<z.ZodString>;
79
- etag: z.ZodString;
59
+ export declare const _AssetDto: z.ZodObject<{
60
+ uid: z.ZodOptional<z.ZodString>;
61
+ displayValue: z.ZodString;
80
62
  extKeys: z.ZodObject<{
81
63
  extId: z.ZodOptional<z.ZodString>;
82
64
  sn: z.ZodOptional<z.ZodString>;
@@ -90,10 +72,17 @@ export declare const _AssetDto: z.ZodIntersection<z.ZodObject<{
90
72
  extId?: string | undefined;
91
73
  sn?: string | undefined;
92
74
  }>;
93
- displayValue: z.ZodString;
94
- uid: z.ZodOptional<z.ZodString>;
95
75
  assetType: z.ZodOptional<z.ZodNativeEnum<typeof GlobalAssetType>>;
76
+ id: z.ZodString;
77
+ createdAt: z.ZodString;
78
+ updatedAt: z.ZodString;
79
+ deletedAt: z.ZodNullable<z.ZodString>;
80
+ etag: z.ZodString;
96
81
  }, "strip", z.ZodTypeAny, {
82
+ id: string;
83
+ createdAt: string;
84
+ updatedAt: string;
85
+ deletedAt: string | null;
97
86
  etag: string;
98
87
  displayValue: string;
99
88
  extKeys: {
@@ -101,10 +90,13 @@ export declare const _AssetDto: z.ZodIntersection<z.ZodObject<{
101
90
  extId?: string | undefined;
102
91
  sn?: string | undefined;
103
92
  };
104
- id?: string | undefined;
105
93
  uid?: string | undefined;
106
94
  assetType?: GlobalAssetType | undefined;
107
95
  }, {
96
+ id: string;
97
+ createdAt: string;
98
+ updatedAt: string;
99
+ deletedAt: string | null;
108
100
  etag: string;
109
101
  displayValue: string;
110
102
  extKeys: {
@@ -112,8 +104,7 @@ export declare const _AssetDto: z.ZodIntersection<z.ZodObject<{
112
104
  extId?: string | undefined;
113
105
  sn?: string | undefined;
114
106
  };
115
- id?: string | undefined;
116
107
  uid?: string | undefined;
117
108
  assetType?: GlobalAssetType | undefined;
118
- }>>;
109
+ }>;
119
110
  export type AssetDto = z.infer<typeof _AssetDto>;
package/build/src/dto/assets.dto.js CHANGED
@@ -11,7 +11,7 @@ exports._SimpleAssetDto = zod_1.z.object({
11
11
  /** Human readable name of the asset */
12
12
  displayValue: zod_1.z.string().optional(),
13
13
  });
14
- exports._AssetUpsertDto = base_dto_1._ChangeAwareUpsertDto.extend({
14
+ exports._AssetUpsertDto = base_dto_1._ChangeAwareUpsertDto.merge(zod_1.z.object({
15
15
  /** External Keys */
16
16
  extKeys: assetKeys_1._AssetKeys,
17
17
  /** Asset display value */
@@ -20,6 +20,6 @@ exports._AssetUpsertDto = base_dto_1._ChangeAwareUpsertDto.extend({
20
20
  uid: zod_1.z.string().optional(),
21
21
  /** Asset type */
22
22
  assetType: zod_1.z.nativeEnum(globalAsset_type_1.GlobalAssetType).optional(),
23
- });
24
- exports._AssetDto = base_dto_1._ChangeAwareDto.and(exports._AssetUpsertDto);
23
+ }));
24
+ exports._AssetDto = exports._AssetUpsertDto.merge(base_dto_1._ChangeAwareDto);
25
25
  //# sourceMappingURL=assets.dto.js.map
package/build/src/dto/assets.dto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"assets.dto.js","sourceRoot":"","sources":["../../../src/dto/assets.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,2CAAuC;AACvC,yCAAkE;AAClE,+DAAyD;AAE5C,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,sBAAsB;IACtB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzB,uCAAuC;IACvC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC;AAIU,QAAA,eAAe,GAAG,gCAAqB,CAAC,MAAM,CAAC;IAC1D,oBAAoB;IACpB,OAAO,EAAE,sBAAU;IACnB,0BAA0B;IAC1B,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,iCAAiC;IACjC,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,iBAAiB;IACjB,SAAS,EAAE,OAAC,CAAC,UAAU,CAAC,kCAAe,CAAC,CAAC,QAAQ,EAAE;CACpD,CAAC,CAAC;AAIU,QAAA,SAAS,GAAG,0BAAe,CAAC,GAAG,CAAC,uBAAe,CAAC,CAAC"}
1
+ {"version":3,"file":"assets.dto.js","sourceRoot":"","sources":["../../../src/dto/assets.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,2CAAuC;AACvC,yCAAkE;AAClE,+DAAyD;AAE5C,QAAA,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,sBAAsB;IACtB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzB,uCAAuC;IACvC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC;AAIU,QAAA,eAAe,GAAG,gCAAqB,CAAC,KAAK,CACxD,OAAC,CAAC,MAAM,CAAC;IACP,oBAAoB;IACpB,OAAO,EAAE,sBAAU;IACnB,0BAA0B;IAC1B,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,iCAAiC;IACjC,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,iBAAiB;IACjB,SAAS,EAAE,OAAC,CAAC,UAAU,CAAC,kCAAe,CAAC,CAAC,QAAQ,EAAE;CACpD,CAAC,CACH,CAAC;AAIW,QAAA,SAAS,GAAG,uBAAe,CAAC,KAAK,CAAC,0BAAe,CAAC,CAAC"}
package/build/src/dto/base.dto.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { z } from 'zod';
2
2
  export declare const _BaseUpsertDto: z.ZodObject<{
3
- id: z.ZodOptional<z.ZodString>;
3
+ id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodUndefined]>>;
4
4
  }, "strip", z.ZodTypeAny, {
5
5
  id?: string | undefined;
6
6
  }, {
@@ -25,7 +25,7 @@ export declare const _BaseDto: z.ZodObject<{
25
25
  }>;
26
26
  export type BaseDto = z.infer<typeof _BaseDto>;
27
27
  export declare const _ChangeAwareUpsertDto: z.ZodObject<{
28
- id: z.ZodOptional<z.ZodString>;
28
+ id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodUndefined]>>;
29
29
  etag: z.ZodString;
30
30
  }, "strip", z.ZodTypeAny, {
31
31
  etag: string;
package/build/src/dto/base.dto.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports._ChangeAwareDto = exports._ChangeAwareUpsertDto = exports._BaseDto = exports._BaseUpsertDto = void 0;
4
4
  const zod_1 = require("zod");
5
5
  exports._BaseUpsertDto = zod_1.z.object({
6
- id: zod_1.z.string().optional(),
6
+ id: zod_1.z.union([zod_1.z.string(), zod_1.z.undefined()]).optional(),
7
7
  });
8
8
  exports._BaseDto = zod_1.z.object({
9
9
  id: zod_1.z.string(),
@@ -11,7 +11,7 @@ exports._BaseDto = zod_1.z.object({
11
11
  updatedAt: zod_1.z.string(),
12
12
  deletedAt: zod_1.z.string().nullable(),
13
13
  });
14
- const WithEtag = { etag: zod_1.z.string() };
15
- exports._ChangeAwareUpsertDto = exports._BaseUpsertDto.extend(WithEtag);
16
- exports._ChangeAwareDto = exports._BaseDto.extend(WithEtag);
14
+ const WithEtag = zod_1.z.object({ etag: zod_1.z.string() });
15
+ exports._ChangeAwareUpsertDto = exports._BaseUpsertDto.merge(WithEtag);
16
+ exports._ChangeAwareDto = exports._BaseDto.merge(WithEtag);
17
17
  //# sourceMappingURL=base.dto.js.map
package/build/src/dto/base.dto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.dto.js","sourceRoot":"","sources":["../../../src/dto/base.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AAET,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;AAIU,QAAA,QAAQ,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/B,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAIH,MAAM,QAAQ,GAAG,EAAC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,EAAC,CAAC;AAEvB,QAAA,qBAAqB,GAAG,sBAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAIxD,QAAA,eAAe,GAAG,gBAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC"}
1
+ {"version":3,"file":"base.dto.js","sourceRoot":"","sources":["../../../src/dto/base.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AAET,QAAA,cAAc,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;CACpD,CAAC,CAAC;AAIU,QAAA,QAAQ,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/B,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;IACd,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAIH,MAAM,QAAQ,GAAG,OAAC,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,EAAC,CAAC,CAAC;AAEjC,QAAA,qBAAqB,GAAG,sBAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAIvD,QAAA,eAAe,GAAG,gBAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC"}
package/build/src/dto/coverage.dto.d.ts CHANGED
@@ -39,50 +39,12 @@ export declare const _UserCoverageReport: z.ZodObject<{
39
39
  score: z.ZodOptional<z.ZodNumber>;
40
40
  firstName: z.ZodOptional<z.ZodString>;
41
41
  lastName: z.ZodOptional<z.ZodString>;
42
- userAccounts: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodIntersection<z.ZodObject<{
43
- id: z.ZodString;
44
- createdAt: z.ZodString;
45
- updatedAt: z.ZodString;
46
- deletedAt: z.ZodNullable<z.ZodString>;
47
- etag: z.ZodString;
48
- }, "strip", z.ZodTypeAny, {
49
- id: string;
50
- createdAt: string;
51
- updatedAt: string;
52
- deletedAt: string | null;
53
- etag: string;
54
- }, {
55
- id: string;
56
- createdAt: string;
57
- updatedAt: string;
58
- deletedAt: string | null;
59
- etag: string;
60
- }>, z.ZodObject<{
61
- id: z.ZodOptional<z.ZodString>;
62
- etag: z.ZodString;
63
- uid: z.ZodString;
42
+ userAccounts: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodObject<{
64
43
  cid: z.ZodString;
44
+ uid: z.ZodString;
65
45
  email: z.ZodString;
66
46
  extId: z.ZodString;
67
47
  meta: z.ZodUnknown;
68
- }, "strip", z.ZodTypeAny, {
69
- cid: string;
70
- uid: string;
71
- email: string;
72
- etag: string;
73
- extId: string;
74
- id?: string | undefined;
75
- meta?: unknown;
76
- }, {
77
- cid: string;
78
- uid: string;
79
- email: string;
80
- etag: string;
81
- extId: string;
82
- id?: string | undefined;
83
- meta?: unknown;
84
- }>>, "many">>;
85
- assetAccounts: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodIntersection<z.ZodObject<{
86
48
  id: z.ZodString;
87
49
  createdAt: z.ZodString;
88
50
  updatedAt: z.ZodString;
@@ -90,42 +52,46 @@ export declare const _UserCoverageReport: z.ZodObject<{
90
52
  etag: z.ZodString;
91
53
  }, "strip", z.ZodTypeAny, {
92
54
  id: string;
55
+ cid: string;
56
+ uid: string;
93
57
  createdAt: string;
94
58
  updatedAt: string;
95
59
  deletedAt: string | null;
96
- etag: string;
97
- }, {
98
- id: string;
99
- createdAt: string;
100
- updatedAt: string;
101
- deletedAt: string | null;
102
- etag: string;
103
- }>, z.ZodObject<{
104
- id: z.ZodOptional<z.ZodString>;
105
- etag: z.ZodString;
106
- uid: z.ZodString;
107
- cid: z.ZodString;
108
- email: z.ZodString;
109
- extId: z.ZodString;
110
- meta: z.ZodUnknown;
111
- }, "strip", z.ZodTypeAny, {
112
- cid: string;
113
- uid: string;
114
60
  email: string;
115
61
  etag: string;
116
62
  extId: string;
117
- id?: string | undefined;
118
63
  meta?: unknown;
119
64
  }, {
65
+ id: string;
120
66
  cid: string;
121
67
  uid: string;
68
+ createdAt: string;
69
+ updatedAt: string;
70
+ deletedAt: string | null;
122
71
  email: string;
123
72
  etag: string;
124
73
  extId: string;
125
- id?: string | undefined;
126
74
  meta?: unknown;
127
- }>>, "many">>;
128
- assets: z.ZodArray<z.ZodIntersection<z.ZodObject<{
75
+ }>, "many">>;
76
+ assetAccounts: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodObject<{
77
+ cid: z.ZodString;
78
+ uid: z.ZodOptional<z.ZodString>;
79
+ aid: z.ZodString;
80
+ displayValue: z.ZodString;
81
+ extKeys: z.ZodObject<{
82
+ extId: z.ZodOptional<z.ZodString>;
83
+ sn: z.ZodOptional<z.ZodString>;
84
+ macs: z.ZodArray<z.ZodString, "many">;
85
+ }, "strip", z.ZodTypeAny, {
86
+ macs: string[];
87
+ extId?: string | undefined;
88
+ sn?: string | undefined;
89
+ }, {
90
+ macs: string[];
91
+ extId?: string | undefined;
92
+ sn?: string | undefined;
93
+ }>;
94
+ meta: z.ZodUnknown;
129
95
  id: z.ZodString;
130
96
  createdAt: z.ZodString;
131
97
  updatedAt: z.ZodString;
@@ -133,19 +99,40 @@ export declare const _UserCoverageReport: z.ZodObject<{
133
99
  etag: z.ZodString;
134
100
  }, "strip", z.ZodTypeAny, {
135
101
  id: string;
102
+ cid: string;
103
+ aid: string;
136
104
  createdAt: string;
137
105
  updatedAt: string;
138
106
  deletedAt: string | null;
139
107
  etag: string;
108
+ displayValue: string;
109
+ extKeys: {
110
+ macs: string[];
111
+ extId?: string | undefined;
112
+ sn?: string | undefined;
113
+ };
114
+ uid?: string | undefined;
115
+ meta?: unknown;
140
116
  }, {
141
117
  id: string;
118
+ cid: string;
119
+ aid: string;
142
120
  createdAt: string;
143
121
  updatedAt: string;
144
122
  deletedAt: string | null;
145
123
  etag: string;
146
- }>, z.ZodObject<{
147
- id: z.ZodOptional<z.ZodString>;
148
- etag: z.ZodString;
124
+ displayValue: string;
125
+ extKeys: {
126
+ macs: string[];
127
+ extId?: string | undefined;
128
+ sn?: string | undefined;
129
+ };
130
+ uid?: string | undefined;
131
+ meta?: unknown;
132
+ }>, "many">>;
133
+ assets: z.ZodArray<z.ZodObject<{
134
+ uid: z.ZodOptional<z.ZodString>;
135
+ displayValue: z.ZodString;
149
136
  extKeys: z.ZodObject<{
150
137
  extId: z.ZodOptional<z.ZodString>;
151
138
  sn: z.ZodOptional<z.ZodString>;
@@ -159,10 +146,17 @@ export declare const _UserCoverageReport: z.ZodObject<{
159
146
  extId?: string | undefined;
160
147
  sn?: string | undefined;
161
148
  }>;
162
- displayValue: z.ZodString;
163
- uid: z.ZodOptional<z.ZodString>;
164
149
  assetType: z.ZodOptional<z.ZodNativeEnum<typeof import("./enums").GlobalAssetType>>;
150
+ id: z.ZodString;
151
+ createdAt: z.ZodString;
152
+ updatedAt: z.ZodString;
153
+ deletedAt: z.ZodNullable<z.ZodString>;
154
+ etag: z.ZodString;
165
155
  }, "strip", z.ZodTypeAny, {
156
+ id: string;
157
+ createdAt: string;
158
+ updatedAt: string;
159
+ deletedAt: string | null;
166
160
  etag: string;
167
161
  displayValue: string;
168
162
  extKeys: {
@@ -170,10 +164,13 @@ export declare const _UserCoverageReport: z.ZodObject<{
170
164
  extId?: string | undefined;
171
165
  sn?: string | undefined;
172
166
  };
173
- id?: string | undefined;
174
167
  uid?: string | undefined;
175
168
  assetType?: import("./enums").GlobalAssetType | undefined;
176
169
  }, {
170
+ id: string;
171
+ createdAt: string;
172
+ updatedAt: string;
173
+ deletedAt: string | null;
177
174
  etag: string;
178
175
  displayValue: string;
179
176
  extKeys: {
@@ -181,59 +178,54 @@ export declare const _UserCoverageReport: z.ZodObject<{
181
178
  extId?: string | undefined;
182
179
  sn?: string | undefined;
183
180
  };
184
- id?: string | undefined;
185
181
  uid?: string | undefined;
186
182
  assetType?: import("./enums").GlobalAssetType | undefined;
187
- }>>, "many">;
183
+ }>, "many">;
188
184
  }, "strip", z.ZodTypeAny, {
189
- userAccounts: Record<string, ({
185
+ userAccounts: Record<string, {
190
186
  id: string;
187
+ cid: string;
188
+ uid: string;
191
189
  createdAt: string;
192
190
  updatedAt: string;
193
191
  deletedAt: string | null;
194
- etag: string;
195
- } & {
196
- cid: string;
197
- uid: string;
198
192
  email: string;
199
193
  etag: string;
200
194
  extId: string;
201
- id?: string | undefined;
202
195
  meta?: unknown;
203
- })[]>;
204
- assetAccounts: Record<string, ({
196
+ }[]>;
197
+ assetAccounts: Record<string, {
205
198
  id: string;
199
+ cid: string;
200
+ aid: string;
206
201
  createdAt: string;
207
202
  updatedAt: string;
208
203
  deletedAt: string | null;
209
204
  etag: string;
210
- } & {
211
- cid: string;
212
- uid: string;
213
- email: string;
214
- etag: string;
215
- extId: string;
216
- id?: string | undefined;
205
+ displayValue: string;
206
+ extKeys: {
207
+ macs: string[];
208
+ extId?: string | undefined;
209
+ sn?: string | undefined;
210
+ };
211
+ uid?: string | undefined;
217
212
  meta?: unknown;
218
- })[]>;
219
- assets: ({
213
+ }[]>;
214
+ assets: {
220
215
  id: string;
221
216
  createdAt: string;
222
217
  updatedAt: string;
223
218
  deletedAt: string | null;
224
219
  etag: string;
225
- } & {
226
- etag: string;
227
220
  displayValue: string;
228
221
  extKeys: {
229
222
  macs: string[];
230
223
  extId?: string | undefined;
231
224
  sn?: string | undefined;
232
225
  };
233
- id?: string | undefined;
234
226
  uid?: string | undefined;
235
227
  assetType?: import("./enums").GlobalAssetType | undefined;
236
- })[];
228
+ }[];
237
229
  id?: string | undefined;
238
230
  organization?: string | undefined;
239
231
  department?: string | undefined;
@@ -242,54 +234,50 @@ export declare const _UserCoverageReport: z.ZodObject<{
242
234
  firstName?: string | undefined;
243
235
  lastName?: string | undefined;
244
236
  }, {
245
- userAccounts: Record<string, ({
237
+ userAccounts: Record<string, {
246
238
  id: string;
239
+ cid: string;
240
+ uid: string;
247
241
  createdAt: string;
248
242
  updatedAt: string;
249
243
  deletedAt: string | null;
250
- etag: string;
251
- } & {
252
- cid: string;
253
- uid: string;
254
244
  email: string;
255
245
  etag: string;
256
246
  extId: string;
257
- id?: string | undefined;
258
247
  meta?: unknown;
259
- })[]>;
260
- assetAccounts: Record<string, ({
248
+ }[]>;
249
+ assetAccounts: Record<string, {
261
250
  id: string;
251
+ cid: string;
252
+ aid: string;
262
253
  createdAt: string;
263
254
  updatedAt: string;
264
255
  deletedAt: string | null;
265
256
  etag: string;
266
- } & {
267
- cid: string;
268
- uid: string;
269
- email: string;
270
- etag: string;
271
- extId: string;
272
- id?: string | undefined;
257
+ displayValue: string;
258
+ extKeys: {
259
+ macs: string[];
260
+ extId?: string | undefined;
261
+ sn?: string | undefined;
262
+ };
263
+ uid?: string | undefined;
273
264
  meta?: unknown;
274
- })[]>;
275
- assets: ({
265
+ }[]>;
266
+ assets: {
276
267
  id: string;
277
268
  createdAt: string;
278
269
  updatedAt: string;
279
270
  deletedAt: string | null;
280
271
  etag: string;
281
- } & {
282
- etag: string;
283
272
  displayValue: string;
284
273
  extKeys: {
285
274
  macs: string[];
286
275
  extId?: string | undefined;
287
276
  sn?: string | undefined;
288
277
  };
289
- id?: string | undefined;
290
278
  uid?: string | undefined;
291
279
  assetType?: import("./enums").GlobalAssetType | undefined;
292
- })[];
280
+ }[];
293
281
  id?: string | undefined;
294
282
  organization?: string | undefined;
295
283
  department?: string | undefined;
package/build/src/dto/coverage.dto.js CHANGED
@@ -6,13 +6,13 @@ const assets_dto_1 = require("./assets.dto");
6
6
  const saasAssets_dto_1 = require("./saasAssets.dto");
7
7
  const saasUsers_dto_1 = require("./saasUsers.dto");
8
8
  const users_dto_1 = require("./users.dto");
9
- exports._UserCoverageSummary = users_dto_1._SimpleUserDto.extend({
9
+ exports._UserCoverageSummary = users_dto_1._SimpleUserDto.merge(zod_1.z.object({
10
10
  userAccounts: zod_1.z.record(zod_1.z.number()),
11
11
  assetAccounts: zod_1.z.record(zod_1.z.number()),
12
- });
13
- exports._UserCoverageReport = users_dto_1._SimpleUserDto.extend({
12
+ }));
13
+ exports._UserCoverageReport = users_dto_1._SimpleUserDto.merge(zod_1.z.object({
14
14
  userAccounts: zod_1.z.record(zod_1.z.array(saasUsers_dto_1._SaasUserDto)),
15
15
  assetAccounts: zod_1.z.record(zod_1.z.array(saasAssets_dto_1._SaasAssetDto)),
16
16
  assets: zod_1.z.array(assets_dto_1._AssetDto),
17
- });
17
+ }));
18
18
  //# sourceMappingURL=coverage.dto.js.map
package/build/src/dto/coverage.dto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"coverage.dto.js","sourceRoot":"","sources":["../../../src/dto/coverage.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,6CAAuC;AACvC,qDAA+C;AAC/C,mDAA6C;AAC7C,2CAA2C;AAE9B,QAAA,oBAAoB,GAAG,0BAAc,CAAC,MAAM,CAAC;IACxD,YAAY,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;IAClC,aAAa,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;CACpC,CAAC,CAAC;AAIU,QAAA,mBAAmB,GAAG,0BAAc,CAAC,MAAM,CAAC;IACvD,YAAY,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,KAAK,CAAC,4BAAY,CAAC,CAAC;IAC7C,aAAa,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,KAAK,CAAC,8BAAa,CAAC,CAAC;IAC/C,MAAM,EAAE,OAAC,CAAC,KAAK,CAAC,sBAAS,CAAC;CAC3B,CAAC,CAAC"}
1
+ {"version":3,"file":"coverage.dto.js","sourceRoot":"","sources":["../../../src/dto/coverage.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,6CAAuC;AACvC,qDAA+C;AAC/C,mDAA6C;AAC7C,2CAA2C;AAE9B,QAAA,oBAAoB,GAAG,0BAAc,CAAC,KAAK,CACtD,OAAC,CAAC,MAAM,CAAC;IACP,YAAY,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;IAClC,aAAa,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;CACpC,CAAC,CACH,CAAC;AAIW,QAAA,mBAAmB,GAAG,0BAAc,CAAC,KAAK,CACrD,OAAC,CAAC,MAAM,CAAC;IACP,YAAY,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,KAAK,CAAC,4BAAY,CAAC,CAAC;IAC7C,aAAa,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,KAAK,CAAC,8BAAa,CAAC,CAAC;IAC/C,MAAM,EAAE,OAAC,CAAC,KAAK,CAAC,sBAAS,CAAC;CAC3B,CAAC,CACH,CAAC"}
package/build/src/dto/saasAssets.dto.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { z } from 'zod';
2
- import { _SaasUserDto } from './saasUsers.dto';
3
2
  export declare const _SaasAssetUpsertDto: z.ZodObject<{
4
- id: z.ZodOptional<z.ZodString>;
3
+ id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodUndefined]>>;
5
4
  etag: z.ZodString;
6
5
  extKeys: z.ZodObject<{
7
6
  extId: z.ZodOptional<z.ZodString>;
@@ -49,7 +48,25 @@ export declare const _SaasAssetUpsertDto: z.ZodObject<{
49
48
  meta?: unknown;
50
49
  }>;
51
50
  export type SaasAssetUpsertDto = z.infer<typeof _SaasAssetUpsertDto>;
52
- export declare const _SaasAssetDto: z.ZodIntersection<z.ZodObject<{
51
+ export declare const _SaasAssetDto: z.ZodObject<{
52
+ cid: z.ZodString;
53
+ uid: z.ZodOptional<z.ZodString>;
54
+ aid: z.ZodString;
55
+ displayValue: z.ZodString;
56
+ extKeys: z.ZodObject<{
57
+ extId: z.ZodOptional<z.ZodString>;
58
+ sn: z.ZodOptional<z.ZodString>;
59
+ macs: z.ZodArray<z.ZodString, "many">;
60
+ }, "strip", z.ZodTypeAny, {
61
+ macs: string[];
62
+ extId?: string | undefined;
63
+ sn?: string | undefined;
64
+ }, {
65
+ macs: string[];
66
+ extId?: string | undefined;
67
+ sn?: string | undefined;
68
+ }>;
69
+ meta: z.ZodUnknown;
53
70
  id: z.ZodString;
54
71
  createdAt: z.ZodString;
55
72
  updatedAt: z.ZodString;
@@ -57,39 +74,35 @@ export declare const _SaasAssetDto: z.ZodIntersection<z.ZodObject<{
57
74
  etag: z.ZodString;
58
75
  }, "strip", z.ZodTypeAny, {
59
76
  id: string;
77
+ cid: string;
78
+ aid: string;
60
79
  createdAt: string;
61
80
  updatedAt: string;
62
81
  deletedAt: string | null;
63
82
  etag: string;
83
+ displayValue: string;
84
+ extKeys: {
85
+ macs: string[];
86
+ extId?: string | undefined;
87
+ sn?: string | undefined;
88
+ };
89
+ uid?: string | undefined;
90
+ meta?: unknown;
64
91
  }, {
65
92
  id: string;
93
+ cid: string;
94
+ aid: string;
66
95
  createdAt: string;
67
96
  updatedAt: string;
68
97
  deletedAt: string | null;
69
98
  etag: string;
70
- }>, z.ZodObject<{
71
- id: z.ZodOptional<z.ZodString>;
72
- etag: z.ZodString;
73
- uid: z.ZodString;
74
- cid: z.ZodString;
75
- email: z.ZodString;
76
- extId: z.ZodString;
77
- meta: z.ZodUnknown;
78
- }, "strip", z.ZodTypeAny, {
79
- cid: string;
80
- uid: string;
81
- email: string;
82
- etag: string;
83
- extId: string;
84
- id?: string | undefined;
85
- meta?: unknown;
86
- }, {
87
- cid: string;
88
- uid: string;
89
- email: string;
90
- etag: string;
91
- extId: string;
92
- id?: string | undefined;
99
+ displayValue: string;
100
+ extKeys: {
101
+ macs: string[];
102
+ extId?: string | undefined;
103
+ sn?: string | undefined;
104
+ };
105
+ uid?: string | undefined;
93
106
  meta?: unknown;
94
- }>>;
95
- export type SaasAssetDto = z.infer<typeof _SaasUserDto>;
107
+ }>;
108
+ export type SaasAssetDto = z.infer<typeof _SaasAssetDto>;
package/build/src/dto/saasAssets.dto.js CHANGED
@@ -4,8 +4,7 @@ exports._SaasAssetDto = exports._SaasAssetUpsertDto = void 0;
4
4
  const zod_1 = require("zod");
5
5
  const assetKeys_1 = require("./assetKeys");
6
6
  const base_dto_1 = require("./base.dto");
7
- const saasUsers_dto_1 = require("./saasUsers.dto");
8
- exports._SaasAssetUpsertDto = base_dto_1._ChangeAwareUpsertDto.extend({
7
+ exports._SaasAssetUpsertDto = base_dto_1._ChangeAwareUpsertDto.merge(zod_1.z.object({
9
8
  /** External Ids */
10
9
  extKeys: assetKeys_1._AssetKeys,
11
10
  /** Connector Id */
@@ -18,6 +17,6 @@ exports._SaasAssetUpsertDto = base_dto_1._ChangeAwareUpsertDto.extend({
18
17
  displayValue: zod_1.z.string(),
19
18
  /** Information specific to this asset */
20
19
  meta: zod_1.z.unknown(),
21
- });
22
- exports._SaasAssetDto = base_dto_1._ChangeAwareDto.and(saasUsers_dto_1._SaasUserUpsertDto);
20
+ }));
21
+ exports._SaasAssetDto = exports._SaasAssetUpsertDto.merge(base_dto_1._ChangeAwareDto);
23
22
  //# sourceMappingURL=saasAssets.dto.js.map
package/build/src/dto/saasAssets.dto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"saasAssets.dto.js","sourceRoot":"","sources":["../../../src/dto/saasAssets.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,2CAAuC;AACvC,yCAAkE;AAClE,mDAAiE;AAEpD,QAAA,mBAAmB,GAAG,gCAAqB,CAAC,MAAM,CAAC;IAC9D,mBAAmB;IACnB,OAAO,EAAE,sBAAU;IACnB,mBAAmB;IACnB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,eAAe;IACf,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,cAAc;IACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,0BAA0B;IAC1B,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,yCAAyC;IACzC,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;CAClB,CAAC,CAAC;AAIU,QAAA,aAAa,GAAG,0BAAe,CAAC,GAAG,CAAC,kCAAkB,CAAC,CAAC"}
1
+ {"version":3,"file":"saasAssets.dto.js","sourceRoot":"","sources":["../../../src/dto/saasAssets.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,2CAAuC;AACvC,yCAAkE;AAErD,QAAA,mBAAmB,GAAG,gCAAqB,CAAC,KAAK,CAC5D,OAAC,CAAC,MAAM,CAAC;IACP,mBAAmB;IACnB,OAAO,EAAE,sBAAU;IACnB,mBAAmB;IACnB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,eAAe;IACf,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,cAAc;IACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,0BAA0B;IAC1B,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,yCAAyC;IACzC,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;CAClB,CAAC,CACH,CAAC;AAIW,QAAA,aAAa,GAAG,2BAAmB,CAAC,KAAK,CAAC,0BAAe,CAAC,CAAC"}
package/build/src/dto/saasUsers.dto.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { z } from 'zod';
2
2
  export declare const _SaasUserUpsertDto: z.ZodObject<{
3
- id: z.ZodOptional<z.ZodString>;
3
+ id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodUndefined]>>;
4
4
  etag: z.ZodString;
5
5
  uid: z.ZodString;
6
6
  cid: z.ZodString;
@@ -25,7 +25,12 @@ export declare const _SaasUserUpsertDto: z.ZodObject<{
25
25
  meta?: unknown;
26
26
  }>;
27
27
  export type SaasUserUpsertDto = z.infer<typeof _SaasUserUpsertDto>;
28
- export declare const _SaasUserDto: z.ZodIntersection<z.ZodObject<{
28
+ export declare const _SaasUserDto: z.ZodObject<{
29
+ cid: z.ZodString;
30
+ uid: z.ZodString;
31
+ email: z.ZodString;
32
+ extId: z.ZodString;
33
+ meta: z.ZodUnknown;
29
34
  id: z.ZodString;
30
35
  createdAt: z.ZodString;
31
36
  updatedAt: z.ZodString;
@@ -33,39 +38,25 @@ export declare const _SaasUserDto: z.ZodIntersection<z.ZodObject<{
33
38
  etag: z.ZodString;
34
39
  }, "strip", z.ZodTypeAny, {
35
40
  id: string;
41
+ cid: string;
42
+ uid: string;
36
43
  createdAt: string;
37
44
  updatedAt: string;
38
45
  deletedAt: string | null;
39
- etag: string;
40
- }, {
41
- id: string;
42
- createdAt: string;
43
- updatedAt: string;
44
- deletedAt: string | null;
45
- etag: string;
46
- }>, z.ZodObject<{
47
- id: z.ZodOptional<z.ZodString>;
48
- etag: z.ZodString;
49
- uid: z.ZodString;
50
- cid: z.ZodString;
51
- email: z.ZodString;
52
- extId: z.ZodString;
53
- meta: z.ZodUnknown;
54
- }, "strip", z.ZodTypeAny, {
55
- cid: string;
56
- uid: string;
57
46
  email: string;
58
47
  etag: string;
59
48
  extId: string;
60
- id?: string | undefined;
61
49
  meta?: unknown;
62
50
  }, {
51
+ id: string;
63
52
  cid: string;
64
53
  uid: string;
54
+ createdAt: string;
55
+ updatedAt: string;
56
+ deletedAt: string | null;
65
57
  email: string;
66
58
  etag: string;
67
59
  extId: string;
68
- id?: string | undefined;
69
60
  meta?: unknown;
70
- }>>;
61
+ }>;
71
62
  export type SaasUserDto = z.infer<typeof _SaasUserDto>;
package/build/src/dto/saasUsers.dto.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports._SaasUserDto = exports._SaasUserUpsertDto = void 0;
4
4
  const zod_1 = require("zod");
5
5
  const base_dto_1 = require("./base.dto");
6
- exports._SaasUserUpsertDto = base_dto_1._ChangeAwareUpsertDto.extend({
6
+ exports._SaasUserUpsertDto = base_dto_1._ChangeAwareUpsertDto.merge(zod_1.z.object({
7
7
  /** User Id */
8
8
  uid: zod_1.z.string(),
9
9
  /** Connector Id */
@@ -14,6 +14,6 @@ exports._SaasUserUpsertDto = base_dto_1._ChangeAwareUpsertDto.extend({
14
14
  extId: zod_1.z.string(),
15
15
  /** Additional information specific to this Saas User */
16
16
  meta: zod_1.z.unknown(),
17
- });
18
- exports._SaasUserDto = base_dto_1._ChangeAwareDto.and(exports._SaasUserUpsertDto);
17
+ }));
18
+ exports._SaasUserDto = exports._SaasUserUpsertDto.merge(base_dto_1._ChangeAwareDto);
19
19
  //# sourceMappingURL=saasUsers.dto.js.map
package/build/src/dto/saasUsers.dto.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"saasUsers.dto.js","sourceRoot":"","sources":["../../../src/dto/saasUsers.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,yCAAkE;AAErD,QAAA,kBAAkB,GAAG,gCAAqB,CAAC,MAAM,CAAC;IAC7D,cAAc;IACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,mBAAmB;IACnB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,qBAAqB;IACrB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,kBAAkB;IAClB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,wDAAwD;IACxD,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;CAClB,CAAC,CAAC;AAIU,QAAA,YAAY,GAAG,0BAAe,CAAC,GAAG,CAAC,0BAAkB,CAAC,CAAC"}
1
+ {"version":3,"file":"saasUsers.dto.js","sourceRoot":"","sources":["../../../src/dto/saasUsers.dto.ts"],"names":[],"mappings":";;;AAAA,6BAAsB;AACtB,yCAAkE;AAErD,QAAA,kBAAkB,GAAG,gCAAqB,CAAC,KAAK,CAC3D,OAAC,CAAC,MAAM,CAAC;IACP,cAAc;IACd,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,mBAAmB;IACnB,GAAG,EAAE,OAAC,CAAC,MAAM,EAAE;IACf,qBAAqB;IACrB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,kBAAkB;IAClB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,wDAAwD;IACxD,IAAI,EAAE,OAAC,CAAC,OAAO,EAAE;CAClB,CAAC,CACH,CAAC;AAIW,QAAA,YAAY,GAAG,0BAAkB,CAAC,KAAK,CAAC,0BAAe,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ampsec/platform-client",
3
- "version": "58.3.0",
3
+ "version": "58.3.2",
4
4
  "description": "",
5
5
  "main": "build/src/index.js",
6
6
  "runkitExampleFilename": "example/main.js",
package/src/dto/assets.dto.ts CHANGED
@@ -12,19 +12,21 @@ export const _SimpleAssetDto = z.object({
12
12
 
13
13
  export type SimpleAssetDto = z.infer<typeof _SimpleAssetDto>;
14
14
 
15
- export const _AssetUpsertDto = _ChangeAwareUpsertDto.extend({
16
- /** External Keys */
17
- extKeys: _AssetKeys,
18
- /** Asset display value */
19
- displayValue: z.string(),
20
- /** User Id of the asset owner */
21
- uid: z.string().optional(),
22
- /** Asset type */
23
- assetType: z.nativeEnum(GlobalAssetType).optional(),
24
- });
15
+ export const _AssetUpsertDto = _ChangeAwareUpsertDto.merge(
16
+ z.object({
17
+ /** External Keys */
18
+ extKeys: _AssetKeys,
19
+ /** Asset display value */
20
+ displayValue: z.string(),
21
+ /** User Id of the asset owner */
22
+ uid: z.string().optional(),
23
+ /** Asset type */
24
+ assetType: z.nativeEnum(GlobalAssetType).optional(),
25
+ })
26
+ );
25
27
 
26
28
  export type AssetUpsertDto = z.infer<typeof _AssetUpsertDto>;
27
29
 
28
- export const _AssetDto = _ChangeAwareDto.and(_AssetUpsertDto);
30
+ export const _AssetDto = _AssetUpsertDto.merge(_ChangeAwareDto);
29
31
 
30
32
  export type AssetDto = z.infer<typeof _AssetDto>;
package/src/dto/base.dto.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import {z} from 'zod';
2
2
 
3
3
  export const _BaseUpsertDto = z.object({
4
- id: z.string().optional(),
4
+ id: z.union([z.string(), z.undefined()]).optional(),
5
5
  });
6
6
 
7
7
  export type BaseUpsertDto = z.infer<typeof _BaseUpsertDto>;
@@ -15,11 +15,11 @@ export const _BaseDto = z.object({
15
15
 
16
16
  export type BaseDto = z.infer<typeof _BaseDto>;
17
17
 
18
- const WithEtag = {etag: z.string()};
18
+ const WithEtag = z.object({etag: z.string()});
19
19
 
20
- export const _ChangeAwareUpsertDto = _BaseUpsertDto.extend(WithEtag);
20
+ export const _ChangeAwareUpsertDto = _BaseUpsertDto.merge(WithEtag);
21
21
 
22
22
  export type ChangeAwareUpsertDto = z.infer<typeof _ChangeAwareUpsertDto>;
23
23
 
24
- export const _ChangeAwareDto = _BaseDto.extend(WithEtag);
24
+ export const _ChangeAwareDto = _BaseDto.merge(WithEtag);
25
25
  export type ChangeAwareDto = z.infer<typeof _ChangeAwareDto>;
package/src/dto/coverage.dto.ts CHANGED
@@ -4,17 +4,21 @@ import {_SaasAssetDto} from './saasAssets.dto';
4
4
  import {_SaasUserDto} from './saasUsers.dto';
5
5
  import {_SimpleUserDto} from './users.dto';
6
6
 
7
- export const _UserCoverageSummary = _SimpleUserDto.extend({
8
- userAccounts: z.record(z.number()),
9
- assetAccounts: z.record(z.number()),
10
- });
7
+ export const _UserCoverageSummary = _SimpleUserDto.merge(
8
+ z.object({
9
+ userAccounts: z.record(z.number()),
10
+ assetAccounts: z.record(z.number()),
11
+ })
12
+ );
11
13
 
12
14
  export type UserCoverageSummary = z.infer<typeof _UserCoverageSummary>;
13
15
 
14
- export const _UserCoverageReport = _SimpleUserDto.extend({
15
- userAccounts: z.record(z.array(_SaasUserDto)),
16
- assetAccounts: z.record(z.array(_SaasAssetDto)),
17
- assets: z.array(_AssetDto),
18
- });
16
+ export const _UserCoverageReport = _SimpleUserDto.merge(
17
+ z.object({
18
+ userAccounts: z.record(z.array(_SaasUserDto)),
19
+ assetAccounts: z.record(z.array(_SaasAssetDto)),
20
+ assets: z.array(_AssetDto),
21
+ })
22
+ );
19
23
 
20
24
  export type UserCoverageReport = z.infer<typeof _UserCoverageReport>;
package/src/dto/saasAssets.dto.ts CHANGED
@@ -1,25 +1,26 @@
1
1
  import {z} from 'zod';
2
2
  import {_AssetKeys} from './assetKeys';
3
3
  import {_ChangeAwareDto, _ChangeAwareUpsertDto} from './base.dto';
4
- import {_SaasUserDto, _SaasUserUpsertDto} from './saasUsers.dto';
5
4
 
6
- export const _SaasAssetUpsertDto = _ChangeAwareUpsertDto.extend({
7
- /** External Ids */
8
- extKeys: _AssetKeys,
9
- /** Connector Id */
10
- cid: z.string(),
11
- /** Asset Id */
12
- aid: z.string(),
13
- /** User Id */
14
- uid: z.string().optional(),
15
- /** Asset display value */
16
- displayValue: z.string(),
17
- /** Information specific to this asset */
18
- meta: z.unknown(),
19
- });
5
+ export const _SaasAssetUpsertDto = _ChangeAwareUpsertDto.merge(
6
+ z.object({
7
+ /** External Ids */
8
+ extKeys: _AssetKeys,
9
+ /** Connector Id */
10
+ cid: z.string(),
11
+ /** Asset Id */
12
+ aid: z.string(),
13
+ /** User Id */
14
+ uid: z.string().optional(),
15
+ /** Asset display value */
16
+ displayValue: z.string(),
17
+ /** Information specific to this asset */
18
+ meta: z.unknown(),
19
+ })
20
+ );
20
21
 
21
22
  export type SaasAssetUpsertDto = z.infer<typeof _SaasAssetUpsertDto>;
22
23
 
23
- export const _SaasAssetDto = _ChangeAwareDto.and(_SaasUserUpsertDto);
24
+ export const _SaasAssetDto = _SaasAssetUpsertDto.merge(_ChangeAwareDto);
24
25
 
25
- export type SaasAssetDto = z.infer<typeof _SaasUserDto>;
26
+ export type SaasAssetDto = z.infer<typeof _SaasAssetDto>;
package/src/dto/saasUsers.dto.ts CHANGED
@@ -1,21 +1,23 @@
1
1
  import {z} from 'zod';
2
2
  import {_ChangeAwareDto, _ChangeAwareUpsertDto} from './base.dto';
3
3
 
4
- export const _SaasUserUpsertDto = _ChangeAwareUpsertDto.extend({
5
- /** User Id */
6
- uid: z.string(),
7
- /** Connector Id */
8
- cid: z.string(),
9
- /** External email */
10
- email: z.string(),
11
- /** External Id */
12
- extId: z.string(),
13
- /** Additional information specific to this Saas User */
14
- meta: z.unknown(),
15
- });
4
+ export const _SaasUserUpsertDto = _ChangeAwareUpsertDto.merge(
5
+ z.object({
6
+ /** User Id */
7
+ uid: z.string(),
8
+ /** Connector Id */
9
+ cid: z.string(),
10
+ /** External email */
11
+ email: z.string(),
12
+ /** External Id */
13
+ extId: z.string(),
14
+ /** Additional information specific to this Saas User */
15
+ meta: z.unknown(),
16
+ })
17
+ );
16
18
 
17
19
  export type SaasUserUpsertDto = z.infer<typeof _SaasUserUpsertDto>;
18
20
 
19
- export const _SaasUserDto = _ChangeAwareDto.and(_SaasUserUpsertDto);
21
+ export const _SaasUserDto = _SaasUserUpsertDto.merge(_ChangeAwareDto);
20
22
 
21
23
  export type SaasUserDto = z.infer<typeof _SaasUserDto>;