@aerogear/apollo-voyager-conflicts - npm Package Compare versions

Comparing version 0.2.7-rc1 to 0.2.7-rc2

dist/api/ConflictResolution.d.ts

@@ -44,3 +44,3 @@ import { GraphQLError } from 'graphql';
     resolvedState?: ObjectStateData;
-    constructor(resolvedOnServer: boolean, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData);
+    constructor(resolvedOnServer: boolean, serverState: ObjectStateData, clientState: ObjectStateData);
 }
@@ -47,0 +47,0 @@ /**

dist/api/ConflictResolution.js

@@ -12,3 +12,3 @@ "use strict";
 class ConflictResolution {
-    constructor(resolvedOnServer, serverState, clientState, baseState) {
+    constructor(resolvedOnServer, serverState, clientState) {
         this.payload = new ObjectConflictError({
@@ -15,0 +15,0 @@ resolvedOnServer,

dist/api/ConflictResolutionStrategy.d.ts

@@ -8,2 +8,2 @@ import { ObjectStateData } from './ObjectStateData';
  */
-export declare type ConflictResolutionStrategy = (serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData) => Promise<ObjectStateData> | ObjectStateData;
+export declare type ConflictResolutionStrategy = (serverState: ObjectStateData, clientState: ObjectStateData) => Promise<ObjectStateData> | ObjectStateData;

dist/api/ObjectState.d.ts

@@ -27,3 +27,2 @@ import { ConflictLogger } from './ConflictLogger';
      * @param clientState the state of the object the client wishes to perform some mutation with
-     * @param baseState the base object state that the client state is based off.
      */
@@ -35,5 +34,4 @@ resolveOnClient(serverState: ObjectStateData, clientState: ObjectStateData): ConflictResolution;
      * @param clientState the state of the object the client wishes to perform some mutation with
-     * @param baseState the base object state that the client state is based off.
      */
-    resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData): Promise<ConflictResolution>;
+    resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData): Promise<ConflictResolution>;
     /**
@@ -40,0 +38,0 @@ * Enable logging for conflict resolution package

dist/states/HashObjectState.d.ts

@@ -16,4 +16,4 @@ import { ConflictLogger } from '../api/ConflictLogger';
     resolveOnClient(serverState: ObjectStateData, clientState: ObjectStateData): ConflictResolution;
-    resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData): Promise<ConflictResolution>;
+    resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData): Promise<ConflictResolution>;
     enableLogging(logger: ConflictLogger): void;
 }

dist/states/HashObjectState.js

@@ -29,4 +29,4 @@ "use strict";
     }
-    async resolveOnServer(strategy, serverState, clientState, baseState) {
-        let resolvedState = strategy(serverState, clientState, baseState);
+    async resolveOnServer(strategy, serverState, clientState) {
+        let resolvedState = strategy(serverState, clientState);
         if (resolvedState instanceof Promise) {
@@ -36,3 +36,3 @@ resolvedState = await resolvedState;
         resolvedState = this.nextState(resolvedState);
-        return new ConflictResolution_1.ConflictResolution(true, resolvedState, clientState, baseState);
+        return new ConflictResolution_1.ConflictResolution(true, resolvedState, clientState);
     }
@@ -39,0 +39,0 @@ enableLogging(logger) {

dist/states/VersionedObjectState.d.ts

@@ -23,3 +23,3 @@ import { ConflictLogger } from '../api/ConflictLogger';
     resolveOnClient(serverState: ObjectStateData, clientState: ObjectStateData): ConflictResolution;
-    resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData): Promise<ConflictResolution>;
+    resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData): Promise<ConflictResolution>;
     enableLogging(logger: ConflictLogger): void;
@@ -26,0 +26,0 @@ }

dist/states/VersionedObjectState.js

@@ -46,4 +46,4 @@ "use strict";
     }
-    async resolveOnServer(strategy, serverState, clientState, baseState) {
-        let resolvedState = strategy(serverState, clientState, baseState);
+    async resolveOnServer(strategy, serverState, clientState) {
+        let resolvedState = strategy(serverState, clientState);
         if (resolvedState instanceof Promise) {
@@ -54,3 +54,3 @@ resolvedState = await resolvedState;
         resolvedState = this.nextState(resolvedState);
-        return new ConflictResolution_1.ConflictResolution(true, resolvedState, clientState, baseState);
+        return new ConflictResolution_1.ConflictResolution(true, resolvedState, clientState);
     }
@@ -57,0 +57,0 @@ enableLogging(logger) {

package.json

 {
   "name": "@aerogear/apollo-voyager-conflicts",
-  "version": "0.2.7-rc1",
+  "version": "0.2.7-rc2",
   "description": "A package to provide conflict handler framework for GraphQL server",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/api/ConflictResolution.ts

@@ -52,3 +52,3 @@ import { GraphQLError } from 'graphql'
 
-  constructor(resolvedOnServer: boolean, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData) {
+  constructor(resolvedOnServer: boolean, serverState: ObjectStateData, clientState: ObjectStateData) {
     this.payload = new ObjectConflictError({
@@ -55,0 +55,0 @@ resolvedOnServer,

src/api/ConflictResolutionStrategy.ts

@@ -9,2 +9,2 @@ import { ObjectStateData } from './ObjectStateData'
  */
-export type ConflictResolutionStrategy = (serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData) => Promise<ObjectStateData> | ObjectStateData
+export type ConflictResolutionStrategy = (serverState: ObjectStateData, clientState: ObjectStateData) => Promise<ObjectStateData> | ObjectStateData

src/api/ObjectState.ts

@@ -31,3 +31,2 @@ import { ConflictLogger } from './ConflictLogger'
    * @param clientState the state of the object the client wishes to perform some mutation with
-   * @param baseState the base object state that the client state is based off.
    */
@@ -40,5 +39,4 @@ resolveOnClient(serverState: ObjectStateData, clientState: ObjectStateData): ConflictResolution
    * @param clientState the state of the object the client wishes to perform some mutation with
-   * @param baseState the base object state that the client state is based off.
    */
-  resolveOnServer (strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData): Promise<ConflictResolution>
+  resolveOnServer (strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData): Promise<ConflictResolution>
 
@@ -45,0 +43,0 @@ /**

src/states/HashObjectState.ts

@@ -39,4 +39,4 @@ import { ConflictLogger } from '../api/ConflictLogger'
 
-  public async resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData) {
-    let resolvedState = strategy(serverState, clientState, baseState)
+  public async resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData) {
+    let resolvedState = strategy(serverState, clientState)
 
@@ -49,3 +49,3 @@ if (resolvedState instanceof Promise) {
 
-    return new ConflictResolution(true, resolvedState, clientState, baseState)
+    return new ConflictResolution(true, resolvedState, clientState)
   }
@@ -52,0 +52,0 @@

src/states/VersionedObjectState.ts

@@ -54,4 +54,4 @@ import { ConflictLogger } from '../api/ConflictLogger'
 
-  public async resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData, baseState?: ObjectStateData) {
-    let resolvedState = strategy(serverState, clientState, baseState)
+  public async resolveOnServer(strategy: ConflictResolutionStrategy, serverState: ObjectStateData, clientState: ObjectStateData) {
+    let resolvedState = strategy(serverState, clientState)
 
@@ -65,3 +65,3 @@ if (resolvedState instanceof Promise) {
 
-    return new ConflictResolution(true, resolvedState, clientState, baseState)
+    return new ConflictResolution(true, resolvedState, clientState)
   }
@@ -68,0 +68,0 @@

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Number of medium supply chain risk alerts

1

decreased by-50%

Worsened metrics

Total package byte prevSize

37568

decreased by-2.11%

Lines of code

828

decreased by-0.48%

No dependency changes