@kubun/with-apollo 0.3.0 → 0.4.0

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgC,MAAM,gBAAgB,CAAA;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAgBhD,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,WAAW,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAuBzD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAc,MAAM,gBAAgB,CAAA;AAEvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAsBhD,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,WAAW,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,UAAU,CAgCzD"}

package/lib/index.js

@@ -1,6 +1,6 @@
 import { ApolloLink, Observable } from '@apollo/client';
-import { checkDocument, getMainDefinition, print } from '@apollo/client/utilities';
-function toObversable(promise) {
+import { getMainDefinition, print } from '@apollo/client/utilities';
+function toObservable(promise) {
     return new Observable((observer)=>{
         promise.then((result)=>{
             observer.next(result);
@@ -10,29 +10,33 @@ function toObversable(promise) {
         });
     });
 }
+function observableWithError(error) {
+    return new Observable((subscriber)=>{
+        subscriber.error(error);
+    });
+}
 export function createLink(params) {
     const { client, graphID } = params;
     return new ApolloLink((operation)=>{
-        const query = checkDocument(operation.query);
-        const definition = getMainDefinition(query);
+        const definition = getMainDefinition(operation.query);
         if (definition.kind !== 'OperationDefinition') {
-            return null;
+            return observableWithError(new Error(`Invalid definition: ${definition.kind}, expected OperationDefinition`));
         }
         switch(definition.operation){
             case 'query':
-                return toObversable(client.queryGraph({
+                return toObservable(client.queryGraph({
                     id: graphID,
-                    text: print(query),
+                    text: print(operation.query),
                     variables: operation.variables
                 }));
             case 'mutation':
-                return toObversable(client.mutateGraph({
+                return toObservable(client.mutateGraph({
                     id: graphID,
-                    text: print(query),
+                    text: print(operation.query),
                     variables: operation.variables
                 }));
             default:
-                throw new Error(`Unsupported operation: ${definition.operation}`);
+                return observableWithError(new Error(`Unsupported operation: ${definition.operation}`));
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/with-apollo",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",
@@ -15,11 +15,11 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@apollo/client": "^3.13.6",
-    "graphql": "^16.9.0"
+    "@apollo/client": "^4.0.12",
+    "graphql": "^16.12.0"
   },
   "devDependencies": {
-    "@kubun/client": "^0.3.0"
+    "@kubun/client": "^0.4.0"
   },
   "scripts": {
     "build:clean": "del lib",
@@ -28,7 +28,7 @@
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "test:types": "tsc --noEmit",
-    "test:unit": "node --experimental-vm-modules ../../node_modules/jest/bin/jest.js",
+    "test:unit": "vitest run",
     "test": "pnpm run test:types && pnpm run test:unit"
   }
 }