Skip to content

Commit bb135b1

Browse files
FreePhoenix888FreePhoenix888
committed
Return also link ids for insert serial operations getters
1 parent 1aacf11 commit bb135b1

10 files changed

+80
-39
lines changed

‎src/get-device-registration-token-insert-serial-operations.ts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
1212
* @example
1313
* #### Insert {@link LinkName.DeviceRegistrationToken}
1414
```ts
15-
const serialOperations = await getDeviceRegistrationTokenInsertSerialOperations({
15+
const {serialOperations, linkIds} = await getDeviceRegistrationTokenInsertSerialOperations({
1616
deep
1717
});
1818
await deep.serial({
@@ -25,7 +25,7 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
2525
const deviceRegistrationTokenLinkId = reservedLinkIds.pop();
2626
const containLinkId = reservedLinkIds.pop();
2727
28-
const serialOperations = await getDeviceRegistrationTokenInsertSerialOperations({
28+
const {serialOperations, linkIds} = await getDeviceRegistrationTokenInsertSerialOperations({
2929
deep,
3030
deviceRegistrationToken: {
3131
title,
@@ -43,15 +43,17 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
4343
*/
4444
export async function getDeviceRegistrationTokenInsertSerialOperations(
4545
param: GetDeviceRegistrationTokenInsertSerialOperationsParam
46-
): Promise<Array<SerialOperation>> {
46+
): Promise<GetDeviceRegistrationTokenInsertSerialOperationsResult> {
4747
const {
4848
deep,
4949
deviceRegistrationToken,
5050
containValue,
5151
containerLinkId,
5252
} = param;
53-
const { containLinkId, deviceRegistrationTokenLinkId } = await getReservedLinkIds();
54-
const { containTypeLinkId, deviceRegistrationTokenTypeLinkId } = await getTypeLinkIds();
53+
const reservedLinkIds = await getReservedLinkIds();
54+
const { containLinkId, deviceRegistrationTokenLinkId } = reservedLinkIds;
55+
const typeLinkIds = await getTypeLinkIds();
56+
const { containTypeLinkId, deviceRegistrationTokenTypeLinkId } = typeLinkIds;
5557
const serialOperations = [];
5658
const deviceRegistrationTokenInsertSerialOperation = createSerialOperation({
5759
type: 'insert',
@@ -93,7 +95,10 @@ export async function getDeviceRegistrationTokenInsertSerialOperations(
9395
serialOperations.push(valueOfContainInsertSerialOperation);
9496
}
9597

96-
return serialOperations;
98+
return {
99+
serialOperations,
100+
linkIds: reservedLinkIds
101+
};
97102

98103
type GetReservedLinkIdsResult = Required<
99104
Exclude<
@@ -189,3 +194,8 @@ export interface GetDeviceRegistrationTokenInsertSerialOperationsParam {
189194
*/
190195
containValue?: string | undefined;
191196
}
197+
198+
export interface GetDeviceRegistrationTokenInsertSerialOperationsResult {
199+
serialOperations: Array<SerialOperation>,
200+
linkIds: Required<Exclude<GetDeviceRegistrationTokenInsertSerialOperationsParam['reservedLinkIds'], undefined>>,
201+
}

‎src/get-device-registration-token-value-update-serial-operations.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { Link } from '@deep-foundation/deeplinks/imports/minilinks';
1414
* @example
1515
* #### Update {@link LinkName.DeviceRegistrationToken}
1616
```ts
17-
const serialOperations = await getDeviceRegistrationTokenValueInsertSerialOperations({
17+
const serialOperations = await getDeviceRegistrationTokenValueUpdateSerialOperations({
1818
deep,
1919
deviceRegistrationToken: {
2020
title,
@@ -26,7 +26,7 @@ import { Link } from '@deep-foundation/deeplinks/imports/minilinks';
2626
})
2727
```
2828
*/
29-
export async function getDeviceRegistrationTokenValueInsertSerialOperations(
29+
export async function getDeviceRegistrationTokenValueUpdateSerialOperations(
3030
param: GetDeviceRegistrationTokenValueUpdateSerialOperationsParam
3131
): Promise<Array<SerialOperation>> {
3232
const { deep, deviceRegistrationToken } = param;

‎src/get-push-notification-insert-serial-operations.ts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { PushNotification } from './push-notification';
1313
* @example
1414
* #### Insert {@link LinkName.PushNotification}
1515
```ts
16-
const serialOperations = await getPushNotificationInsertSerialOperations({
16+
const {serialOperations, linkIds} = await getPushNotificationInsertSerialOperations({
1717
deep
1818
});
1919
await deep.serial({
@@ -26,7 +26,7 @@ import { PushNotification } from './push-notification';
2626
const pushNotificationLinkId = reservedLinkIds.pop();
2727
const containLinkId = reservedLinkIds.pop();
2828
29-
const serialOperations = await getPushNotificationInsertSerialOperations({
29+
const {serialOperations, linkIds} = await getPushNotificationInsertSerialOperations({
3030
deep,
3131
pushNotification: {
3232
title,
@@ -44,15 +44,17 @@ import { PushNotification } from './push-notification';
4444
*/
4545
export async function getPushNotificationInsertSerialOperations(
4646
param: GetPushNotificationInsertSerialOperationsParam
47-
): Promise<Array<SerialOperation>> {
47+
): Promise<GetPushNotificationInsertSerialOperationsResult> {
4848
const {
4949
deep,
5050
pushNotification,
5151
containValue,
5252
containerLinkId,
5353
} = param;
54-
const { containLinkId, pushNotificationLinkId } = await getReservedLinkIds();
55-
const { containTypeLinkId, pushNotificationTypeLinkId } = await getTypeLinkIds();
54+
const reservedLinkIds = await getReservedLinkIds();
55+
const { containLinkId, pushNotificationLinkId } = reservedLinkIds;
56+
const typeLinkIds = await getTypeLinkIds();
57+
const { containTypeLinkId, pushNotificationTypeLinkId } = typeLinkIds;
5658
const serialOperations = [];
5759
const pushNotificationInsertSerialOperation = createSerialOperation({
5860
type: 'insert',
@@ -94,7 +96,10 @@ export async function getPushNotificationInsertSerialOperations(
9496
serialOperations.push(valueOfContainInsertSerialOperation);
9597
}
9698

97-
return serialOperations;
99+
return {
100+
serialOperations,
101+
linkIds: reservedLinkIds
102+
};
98103

99104
type GetReservedLinkIdsResult = Required<
100105
Exclude<
@@ -190,3 +195,8 @@ export interface GetPushNotificationInsertSerialOperationsParam {
190195
*/
191196
containValue?: string | undefined;
192197
}
198+
199+
export interface GetPushNotificationInsertSerialOperationsResult {
200+
serialOperations: Array<SerialOperation>,
201+
linkIds: Required<Exclude<GetPushNotificationInsertSerialOperationsParam['reservedLinkIds'], undefined>>,
202+
}

‎src/get-push-notification-value-update-serial-operations.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { PushNotification } from './push-notification';
1515
* @example
1616
* #### Update {@link LinkName.PushNotification}
1717
```ts
18-
const serialOperations = await getPushNotificationValueInsertSerialOperations({
18+
const serialOperations = await getPushNotificationValueUpdateSerialOperations({
1919
deep,
2020
pushNotification: {
2121
title,
@@ -27,7 +27,7 @@ import { PushNotification } from './push-notification';
2727
})
2828
```
2929
*/
30-
export async function getPushNotificationValueInsertSerialOperations(
30+
export async function getPushNotificationValueUpdateSerialOperations(
3131
param: GetPushNotificationValueUpdateSerialOperationsParam
3232
): Promise<Array<SerialOperation>> {
3333
const { deep, pushNotification } = param;

‎src/get-service-account-insert-serial-operations.ts‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
1212
* @example
1313
* #### Insert {@link LinkName.ServiceAccount}
1414
```ts
15-
const serialOperations = await getServiceAccountInsertSerialOperations({
15+
const {serialOperations, linkIds} = await getServiceAccountInsertSerialOperations({
1616
deep
1717
});
1818
await deep.serial({
@@ -25,7 +25,7 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
2525
const serviceAccountLinkId = reservedLinkIds.pop();
2626
const containLinkId = reservedLinkIds.pop();
2727
28-
const serialOperations = await getServiceAccountInsertSerialOperations({
28+
const {serialOperations, linkIds} = await getServiceAccountInsertSerialOperations({
2929
deep,
3030
serviceAccount: {
3131
title,
@@ -43,16 +43,18 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
4343
*/
4444
export async function getServiceAccountInsertSerialOperations(
4545
param: GetServiceAccountInsertSerialOperationsParam
46-
): Promise<Array<SerialOperation>> {
46+
): Promise<GetServiceAccountInsertSerialOperationsResult> {
4747
const {
4848
deep,
4949
serviceAccount,
5050
containValue,
5151
containerLinkId,
5252
shouldMakeActive = false
5353
} = param;
54-
const { containLinkId, serviceAccountLinkId ,usesServiceAccountLinkId} = await getReservedLinkIds();
55-
const { containTypeLinkId, serviceAccountTypeLinkId ,usesServiceAccountTypeLinkId} = await getTypeLinkIds();
54+
const reservedLinkIds = await getReservedLinkIds();
55+
const { containLinkId, serviceAccountLinkId, usesServiceAccountLinkId } = reservedLinkIds;
56+
const typeLinkIds = await getTypeLinkIds();
57+
const { containTypeLinkId, serviceAccountTypeLinkId ,usesServiceAccountTypeLinkId} = typeLinkIds;
5658
const serialOperations = [];
5759
const serviceAccountInsertSerialOperation = createSerialOperation({
5860
type: 'insert',
@@ -109,7 +111,10 @@ export async function getServiceAccountInsertSerialOperations(
109111
serialOperations.push(usesServiceAccountInsertSerialOperation);
110112
}
111113

112-
return serialOperations;
114+
return {
115+
serialOperations,
116+
linkIds: reservedLinkIds
117+
};
113118

114119
type GetReservedLinkIdsResult = Required<
115120
Exclude<
@@ -225,3 +230,8 @@ export interface GetServiceAccountInsertSerialOperationsParam {
225230
*/
226231
shouldMakeActive?: boolean;
227232
}
233+
234+
export interface GetServiceAccountInsertSerialOperationsResult {
235+
serialOperations: Array<SerialOperation>,
236+
linkIds: Required<Exclude<GetServiceAccountInsertSerialOperationsParam['reservedLinkIds'], undefined>>,
237+
}

‎src/get-service-account-value-update-serial-operations.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { Link } from '@deep-foundation/deeplinks/imports/minilinks';
1414
* @example
1515
* #### Update {@link LinkName.ServiceAccount}
1616
```ts
17-
const serialOperations = await getServiceAccountValueInsertSerialOperations({
17+
const serialOperations = await getServiceAccountValueUpdateSerialOperations({
1818
deep,
1919
serviceAccount: {
2020
title,
@@ -26,7 +26,7 @@ import { Link } from '@deep-foundation/deeplinks/imports/minilinks';
2626
})
2727
```
2828
*/
29-
export async function getServiceAccountValueInsertSerialOperations(
29+
export async function getServiceAccountValueUpdateSerialOperations(
3030
param: GetServiceAccountValueUpdateSerialOperationsParam
3131
): Promise<Array<SerialOperation>> {
3232
const { deep, serviceAccount } = param;

‎src/get-web-push-certificate-insert-serial-operations.ts‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,18 @@ import { createSerialOperation } from '@deep-foundation/deeplinks/imports/gql';
4343
*/
4444
export async function getWebPushCertificateInsertSerialOperations(
4545
param: GetWebPushCertificateInsertSerialOperationsParam
46-
): Promise<Array<SerialOperation>> {
46+
): Promise<GetWebPushCertificateInsertSerialOperationsResult> {
4747
const {
4848
deep,
4949
webPushCertificate,
5050
containValue,
5151
containerLinkId,
5252
shouldMakeActive = false
5353
} = param;
54-
const { containLinkId, webPushCertificateLinkId , usesWebPushCertificateLinkId} = await getReservedLinkIds();
55-
const { containTypeLinkId, webPushCertificateTypeLinkId, usesWebPushCertificateTypeLinkId } = await getTypeLinkIds();
54+
const reservedLinkIds = await getReservedLinkIds();
55+
const { containLinkId, webPushCertificateLinkId, usesWebPushCertificateLinkId } = reservedLinkIds;
56+
const typeLinkIds = await getTypeLinkIds();
57+
const { containTypeLinkId, webPushCertificateTypeLinkId ,usesWebPushCertificateTypeLinkId} = typeLinkIds;
5658
const serialOperations = [];
5759
const webPushCertificateInsertSerialOperation = createSerialOperation({
5860
type: 'insert',
@@ -106,9 +108,13 @@ export async function getWebPushCertificateInsertSerialOperations(
106108
to_id: webPushCertificateLinkId,
107109
},
108110
})
111+
serialOperations.push(usesWebPushCertificateInsertSerialOperation);
109112
}
110113

111-
return serialOperations;
114+
return {
115+
serialOperations,
116+
linkIds: reservedLinkIds
117+
};
112118

113119
type GetReservedLinkIdsResult = Required<
114120
Exclude<
@@ -224,3 +230,8 @@ export interface GetWebPushCertificateInsertSerialOperationsParam {
224230
*/
225231
shouldMakeActive?: boolean;
226232
}
233+
234+
export interface GetWebPushCertificateInsertSerialOperationsResult {
235+
serialOperations: Array<SerialOperation>,
236+
linkIds: Required<Exclude<GetWebPushCertificateInsertSerialOperationsParam['reservedLinkIds'], undefined>>,
237+
}

‎src/get-web-push-certificate-value-update-serial-operations.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { Link } from '@deep-foundation/deeplinks/imports/minilinks';
1414
* @example
1515
* #### Update {@link LinkName.WebPushCertificate}
1616
```ts
17-
const serialOperations = await getWebPushCertificateValueInsertSerialOperations({
17+
const serialOperations = await getWebPushCertificateValueUpdateSerialOperations({
1818
deep,
1919
webPushCertificate: {
2020
title,
@@ -26,7 +26,7 @@ import { Link } from '@deep-foundation/deeplinks/imports/minilinks';
2626
})
2727
```
2828
*/
29-
export async function getWebPushCertificateValueInsertSerialOperations(
29+
export async function getWebPushCertificateValueUpdateSerialOperations(
3030
param: GetWebPushCertificateValueUpdateSerialOperationsParam
3131
): Promise<Array<SerialOperation>> {
3232
const { deep, webPushCertificate } = param;

‎src/main.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
export {LinkName} from './link-name'
22
export {getPushNotification, type GetPushNotificationParam, type GetPushNotificationResult} from './get-push-notification'
3-
export {getDeviceRegistrationTokenInsertSerialOperations,type GetDeviceRegistrationTokenInsertSerialOperationsParam} from './get-device-registration-token-insert-serial-operations'
4-
export {getDeviceRegistrationTokenValueInsertSerialOperations, type GetDeviceRegistrationTokenValueUpdateSerialOperationsParam} from './get-device-registration-token-value-update-serial-operations'
5-
export {getPushNotificationInsertSerialOperations, type GetPushNotificationInsertSerialOperationsParam} from './get-push-notification-insert-serial-operations'
6-
export {getPushNotificationValueInsertSerialOperations, type GetPushNotificationValueUpdateSerialOperationsParam} from './get-push-notification-value-update-serial-operations'
7-
export {getServiceAccountInsertSerialOperations, type GetServiceAccountInsertSerialOperationsParam} from './get-service-account-insert-serial-operations'
8-
export {getServiceAccountValueInsertSerialOperations, type GetServiceAccountValueUpdateSerialOperationsParam} from './get-service-account-value-update-serial-operations'
9-
export {getWebPushCertificateInsertSerialOperations, type GetWebPushCertificateInsertSerialOperationsParam} from './get-web-push-certificate-insert-serial-operations'
10-
export {getWebPushCertificateValueInsertSerialOperations, type GetWebPushCertificateValueUpdateSerialOperationsParam} from './get-web-push-certificate-value-update-serial-operations'
3+
export {getDeviceRegistrationTokenInsertSerialOperations,type GetDeviceRegistrationTokenInsertSerialOperationsParam,type GetDeviceRegistrationTokenInsertSerialOperationsResult} from './get-device-registration-token-insert-serial-operations'
4+
export {getDeviceRegistrationTokenValueUpdateSerialOperations, type GetDeviceRegistrationTokenValueUpdateSerialOperationsParam} from './get-device-registration-token-value-update-serial-operations'
5+
export {getPushNotificationInsertSerialOperations, type GetPushNotificationInsertSerialOperationsParam, type GetPushNotificationInsertSerialOperationsResult} from './get-push-notification-insert-serial-operations'
6+
export {getPushNotificationValueUpdateSerialOperations, type GetPushNotificationValueUpdateSerialOperationsParam,} from './get-push-notification-value-update-serial-operations'
7+
export {getServiceAccountInsertSerialOperations, type GetServiceAccountInsertSerialOperationsParam, type GetServiceAccountInsertSerialOperationsResult} from './get-service-account-insert-serial-operations'
8+
export {getServiceAccountValueUpdateSerialOperations, type GetServiceAccountValueUpdateSerialOperationsParam} from './get-service-account-value-update-serial-operations'
9+
export {getWebPushCertificateInsertSerialOperations, type GetWebPushCertificateInsertSerialOperationsParam, type GetWebPushCertificateInsertSerialOperationsResult} from './get-web-push-certificate-insert-serial-operations'
10+
export {getWebPushCertificateValueUpdateSerialOperations, type GetWebPushCertificateValueUpdateSerialOperationsParam} from './get-web-push-certificate-value-update-serial-operations'
1111
export {PACKAGE_NAME} from './package-name'
1212
export {PushNotification} from './push-notification'
1313
export {registerDevice, type RegisterDeviceParam} from './register-device'

‎src/register-device.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export async function registerDevice({
9090
if(callback) {
9191
callback({deviceRegistrationToken})
9292
} else {
93-
const serialOperations = await getDeviceRegistrationTokenInsertSerialOperations({
93+
const {serialOperations} = await getDeviceRegistrationTokenInsertSerialOperations({
9494
deep,
9595
deviceRegistrationToken,
9696
containerLinkId: deviceLinkId,

0 commit comments

Comments
 (0)