@effection/fetch - npm Package Compare versions

Comparing version 2.0.0-beta.13 to 2.0.0-beta.14

CHANGELOG.md

 # @effection/fetch
 
+## \[2.0.0-beta.14]
+
+- Add labels for fetch operations
+  - [4e6f2b7](https://github.com/thefrontside/effection/commit/4e6f2b758ea131654c531860cf2583dfd558c5b8) Add labels to fetch package on 2021-09-06
+
 ## \[2.0.0-beta.13]
@@ -4,0 +9,0 @@

dist-cjs/fetch.js

@@ -10,10 +10,3 @@ "use strict";
         let controller = new abort_controller_1.AbortController();
-        yield core_1.spawn(function* () {
-            try {
-                yield;
-            }
-            finally {
-                controller.abort();
-            }
-        });
+        yield core_1.ensure(() => { controller.abort(); });
         requestInit.signal = controller.signal;
@@ -23,24 +16,28 @@ let response = yield cross_fetch_1.fetch(info, requestInit);
     }
+    let name = `fetch('${info}')`;
+    let labels = { expand: false, method: requestInit.method || 'GET' };
     return {
+        name,
+        labels,
         init,
-        *arrayBuffer() {
+        arrayBuffer: () => core_1.withLabels(function* () {
             let response = yield { init };
             return yield response.arrayBuffer();
-        },
-        *blob() {
+        }, { name: `${name}.arrayBuffer()`, ...labels }),
+        blob: () => core_1.withLabels(function* () {
             let response = yield { init };
             return yield response.blob();
-        },
-        *formData() {
+        }, { name: `${name}.blob()`, ...labels }),
+        formData: () => core_1.withLabels(function* () {
             let response = yield { init };
             return yield response.formData();
-        },
-        *json() {
+        }, { name: `${name}.formData()`, ...labels }),
+        json: () => core_1.withLabels(function* () {
             let response = yield { init };
             return yield response.json();
-        },
-        *text() {
+        }, { name: `${name}.json()`, ...labels }),
+        text: () => core_1.withLabels(function* () {
             let response = yield { init };
             return yield response.text();
-        },
+        }, { name: `${name}.text()`, ...labels }),
     };
@@ -47,0 +44,0 @@ }

dist-esm/fetch.js

@@ -1,2 +0,2 @@
-import { spawn } from '@effection/core';
+import { ensure, withLabels } from '@effection/core';
 import { fetch as nativeFetch } from 'cross-fetch';
@@ -7,10 +7,3 @@ import { AbortController } from 'abort-controller';
         let controller = new AbortController();
-        yield spawn(function* () {
-            try {
-                yield;
-            }
-            finally {
-                controller.abort();
-            }
-        });
+        yield ensure(() => { controller.abort(); });
         requestInit.signal = controller.signal;
@@ -20,26 +13,30 @@ let response = yield nativeFetch(info, requestInit);
     }
+    let name = `fetch('${info}')`;
+    let labels = { expand: false, method: requestInit.method || 'GET' };
     return {
+        name,
+        labels,
         init,
-        *arrayBuffer() {
+        arrayBuffer: () => withLabels(function* () {
             let response = yield { init };
             return yield response.arrayBuffer();
-        },
-        *blob() {
+        }, { name: `${name}.arrayBuffer()`, ...labels }),
+        blob: () => withLabels(function* () {
             let response = yield { init };
             return yield response.blob();
-        },
-        *formData() {
+        }, { name: `${name}.blob()`, ...labels }),
+        formData: () => withLabels(function* () {
             let response = yield { init };
             return yield response.formData();
-        },
-        *json() {
+        }, { name: `${name}.formData()`, ...labels }),
+        json: () => withLabels(function* () {
             let response = yield { init };
             return yield response.json();
-        },
-        *text() {
+        }, { name: `${name}.json()`, ...labels }),
+        text: () => withLabels(function* () {
             let response = yield { init };
             return yield response.text();
-        },
+        }, { name: `${name}.text()`, ...labels }),
     };
 }
 //# sourceMappingURL=fetch.js.map

package.json

 {
   "name": "@effection/fetch",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.14",
   "description": "Fetch operation for Effection",
@@ -40,3 +40,3 @@ "main": "dist-cjs/index.js",
   "dependencies": {
-    "@effection/core": "2.0.0-beta.11",
+    "@effection/core": "2.0.0-beta.12",
     "abort-controller": "^3.0.0",
@@ -43,0 +43,0 @@ "cross-fetch": "^3.0.4",

src/fetch.ts

@@ -1,2 +0,2 @@
-import { spawn, Operation, Resource } from '@effection/core';
+import { ensure, withLabels, Operation, Resource } from '@effection/core';
 import { fetch as nativeFetch } from 'cross-fetch';
@@ -17,9 +17,3 @@ import { AbortController } from 'abort-controller';
 
-    yield spawn(function*() {
-      try {
-        yield;
-      } finally {
-        controller.abort();
-      }
-    });
+    yield ensure(() => { controller.abort() });
 
@@ -32,25 +26,30 @@ requestInit.signal = controller.signal;
 
+  let name = `fetch('${info}')`;
+  let labels = { expand: false, method: requestInit.method || 'GET' };
+
   return {
+    name,
+    labels,
     init,
-    *arrayBuffer() {
+    arrayBuffer: () => withLabels(function*() {
       let response = yield { init };
       return yield response.arrayBuffer();
-    },
-    *blob() {
+    }, { name: `${name}.arrayBuffer()`, ...labels }),
+    blob: () => withLabels(function*() {
       let response = yield { init };
       return yield response.blob();
-    },
-    *formData() {
+    }, { name: `${name}.blob()`, ...labels }),
+    formData: () => withLabels(function*() {
       let response = yield { init };
       return yield response.formData();
-    },
-    *json() {
+    }, { name: `${name}.formData()`, ...labels }),
+    json: () => withLabels(function*() {
       let response = yield { init };
       return yield response.json();
-    },
-    *text() {
+    }, { name: `${name}.json()`, ...labels }),
+    text: () => withLabels(function*() {
       let response = yield { init };
       return yield response.text();
-    },
+    }, { name: `${name}.text()`, ...labels }),
   };
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

20500

increased by14.58%

Worsened metrics

Lines of code

161

decreased by-4.73%

Dependency changes

• + Added@effection/core@2.0.0-beta.12(transitive)

• - Removed@effection/core@2.0.0-beta.11(transitive)

• Updated@effection/core@2.0.0-beta.12