feature: expose the fastly features via 'fastly:' namespaced modules

integration-tests/js-compute/fixtures/async-select/bin/index.js

@@ -1,3 +1,5 @@
+/* eslint-env serviceworker */
+
 addEventListener("fetch", (event) => {
   let requestsData = [
     {

integration-tests/js-compute/fixtures/backend/bin/index.js

@@ -1,3 +1,7 @@
+/* eslint-env serviceworker */
+/* global ReadableStream */
+import { CacheOverride } from 'fastly:cache-override';
+
 async function handleRequest(event) {
   // Get the client request from the event
   let req = event.request;

integration-tests/js-compute/fixtures/btoa/bin/index.js

@@ -1,3 +1,6 @@
+/* eslint-env serviceworker */
+/// <reference path="../../../../../types/index.d.ts" />
+
 addEventListener("fetch", () => {
   try {
     let error;
@@ -330,6 +333,7 @@ addEventListener("fetch", () => {
       if (error) { return error }
       error = assert(btoa("„"), "hA==", `btoa("„")`)
       if (error) { return error }
+      // eslint-disable-next-line no-irregular-whitespace
       error = assert(btoa("…"), "hQ==", `btoa("…")`)
       if (error) { return error }
       error = assert(btoa("†"), "hg==", `btoa("†")`)
@@ -384,6 +388,7 @@ addEventListener("fetch", () => {
       if (error) { return error }
       error = assert(btoa("Ÿ"), "nw==", `btoa("Ÿ")`)
       if (error) { return error }
+      // eslint-disable-next-line no-irregular-whitespace
       error = assert(btoa(" "), "oA==", `btoa(" ")`)
       if (error) { return error }
       error = assert(btoa("¡"), "oQ==", `btoa("¡")`)
@@ -765,33 +770,6 @@ function assert(actual, expected, code) {
   }
 }
 
-async function assertResolves(func) {
-  try {
-    await func()
-  } catch (error) {
-    return fail(`Expected \`${func.toString()}\` to resolve - Found it rejected: ${error.name}: ${error.message}`)
-  }
-}
-
-async function assertRejects(func, errorClass, errorMessage) {
-  try {
-    await func()
-    return fail(`Expected \`${func.toString()}\` to reject - Found it did not reject`)
-  } catch (error) {
-    if (errorClass) {
-      if ((error instanceof errorClass) === false) {
-        return fail(`Expected \`${func.toString()}\` to reject instance of \`${errorClass.name}\` - Found instance of \`${error.name}\``)
-      }
-    }
-
-    if (errorMessage) {
-      if (error.message !== errorMessage) {
-        return fail(`Expected \`${func.toString()}\` to reject error message of \`${errorMessage}\` - Found \`${error.message}\``)
-      }
-    }
-  }
-}
-
 function assertThrows(func, errorClass, errorMessage) {
   try {
     func()

integration-tests/js-compute/fixtures/byte-repeater/bin/index.js

@@ -1,3 +1,7 @@
+/* eslint-env serviceworker */
+/* global ReadableStream */
+import { CacheOverride } from 'fastly:cache-override';
+
 addEventListener("fetch", (event) => {
   let headers = new Headers();
   headers.set("AssemblyScriptHeader", "AssemblyScriptValue");
@@ -26,6 +30,7 @@ addEventListener("fetch", (event) => {
     let body = upstreamResponse.body;
     let streamReader = body.getReader();
 
+    // eslint-disable-next-line no-constant-condition
     while (true) {
       let chunk = await streamReader.read();
 

integration-tests/js-compute/fixtures/config-store/bin/index.js

@@ -1,3 +1,6 @@
+/* eslint-env serviceworker */
+import { ConfigStore } from 'fastly:config-store'
+
 addEventListener("fetch", (event) => {
   let config = new ConfigStore("testconfig");
   let twitterValue = config.get("twitter");

integration-tests/js-compute/fixtures/console/bin/index.js

@@ -1,3 +1,6 @@
+/* eslint-env serviceworker */
+/* global ReadableStream, TransformStream, WritableStream */
+/// <reference path="../../../../../types/index.d.ts" />
 addEventListener("fetch", () => {
     console.log("Happy", "birthday", "Aki", "and", "Yuki!");
     let arg;
@@ -67,7 +70,7 @@ addEventListener("fetch", () => {
     console.log('WeakMap:', arg)
     arg = new WeakSet
     console.log('WeakSet:', arg)
-    arg = new Promise((resolve, reject) => { })
+    arg = new Promise(() => { })
     console.log('Promise:', arg)
     arg = Promise.resolve(9)
     console.log('resolved promise:', arg)

integration-tests/js-compute/fixtures/dynamic-backend/bin/index.js

@@ -1,4 +1,8 @@
+/* eslint-env serviceworker */
 /* global fastly */
+import { Backend } from 'fastly:backend';
+import { CacheOverride } from 'fastly:cache-override';
+
 addEventListener("fetch", event => {
   event.respondWith(app(event))
 })
@@ -666,6 +670,7 @@ routes.set('/', () => {
           let error = assertDoesNotThrow(() => {
             new Backend({ name: 'useSSL-property-valid-boolean' + type, target: 'a', useSSL: type })
           })
+          if (error) { return error }
         }
         let error = assertDoesNotThrow(() => {
           new Backend({ name: 'useSSL-property-valid-boolean-true', target: 'a', useSSL: true })
@@ -867,6 +872,7 @@ routes.set('/', () => {
           let error = assertDoesNotThrow(() => {
             new Backend({ name: 'checkCertificate-property-valid-boolean' + type, target: 'a', checkCertificate: type })
           })
+          if (error) { return error }
         }
         let error = assertDoesNotThrow(() => {
           new Backend({ name: 'checkCertificate-property-valid-boolean-true', target: 'a', checkCertificate: true })

integration-tests/js-compute/fixtures/edge-dictionary/bin/index.js

@@ -1,3 +1,5 @@
+/* eslint-env serviceworker */
+import {Dictionary} from 'fastly:dictionary'
 addEventListener("fetch", (event) => {
   let asDictionary = new Dictionary("edge_dictionary");
   let twitterValue = asDictionary.get("twitter");

integration-tests/js-compute/fixtures/env/bin/index.js

@@ -1,3 +1,5 @@
+/* eslint-env serviceworker */
+/* global fastly */
 addEventListener("fetch", (event) => {
   // Get the request from the client
   let downstreamRequest = event.request;

integration-tests/js-compute/fixtures/error/bin/index.js

@@ -1,6 +1,7 @@
+/* eslint-env serviceworker */
 /* global fastly */
 
-addEventListener("fetch", ()=>{
+addEventListener("fetch", () => {
     console.log(1)
 })
 
@@ -35,4 +36,8 @@ routes.set('/', () => {
 });
 routes.set("/error", async () => {
     throw new Error('uh oh')
-});
+});
+
+function fail(message = '') {
+    return new Response(message, { status: 500 })
+}

integration-tests/js-compute/fixtures/extend-from-builtins/bin/index.js

@@ -1,3 +1,8 @@
+/* eslint-env serviceworker */
+/* global TransformStream CompressionStream */
+import {Dictionary} from 'fastly:dictionary';
+import {CacheOverride} from 'fastly:cache-override';
+import {ObjectStore} from 'fastly:object-store';
 const builtins = [
   TransformStream,
   CompressionStream,

integration-tests/js-compute/fixtures/extend-from-request/bin/index.js

@@ -1,3 +1,4 @@
+/* eslint-env serviceworker */
 class MyRequest extends Request {
   constructor(input, init) {
     super(input, init);

integration-tests/js-compute/fixtures/geoip/bin/index.js

@@ -1,3 +1,4 @@
+/* eslint-env serviceworker */
 /* global fastly */
 addEventListener("fetch", event => {
   event.respondWith(app(event))
@@ -29,14 +30,14 @@ routes.set('/', () => {
 });
 
 routes.set("/fastly/getgeolocationforipaddress/interface", async function () {
-  actual = Reflect.getOwnPropertyDescriptor(fastly, 'getGeolocationForIpAddress')
+  let actual = Reflect.getOwnPropertyDescriptor(fastly, 'getGeolocationForIpAddress')
   expected = {
     writable: true,
     enumerable: true,
     configurable: true,
     value: fastly.getGeolocationForIpAddress
   }
-  error = assert(actual, expected, `Reflect.getOwnPropertyDescriptor(fastly, 'getGeolocationForIpAddress)`)
+  let error = assert(actual, expected, `Reflect.getOwnPropertyDescriptor(fastly, 'getGeolocationForIpAddress)`)
   if (error) { return error }
 
   error = assert(typeof fastly.getGeolocationForIpAddress, 'function', `typeof fastly.getGeolocationForIpAddress`)
@@ -213,33 +214,6 @@ function assert(actual, expected, code) {
   }
 }
 
-async function assertResolves(func) {
-  try {
-    await func()
-  } catch (error) {
-    return fail(`Expected \`${func.toString()}\` to resolve - Found it rejected: ${error.name}: ${error.message}`)
-  }
-}
-
-async function assertRejects(func, errorClass, errorMessage) {
-  try {
-    await func()
-    return fail(`Expected \`${func.toString()}\` to reject - Found it did not reject`)
-  } catch (error) {
-    if (errorClass) {
-      if ((error instanceof errorClass) === false) {
-        return fail(`Expected \`${func.toString()}\` to reject instance of \`${errorClass.name}\` - Found instance of \`${error.name}\``)
-      }
-    }
-
-    if (errorMessage) {
-      if (error.message !== errorMessage) {
-        return fail(`Expected \`${func.toString()}\` to reject error message of \`${errorMessage}\` - Found \`${error.message}\``)
-      }
-    }
-  }
-}
-
 function assertThrows(func, errorClass, errorMessage) {
   try {
     func()

integration-tests/js-compute/fixtures/hello-world/bin/index.js

@@ -1,3 +1,4 @@
+/* eslint-env serviceworker */
 addEventListener("fetch", (event) => {
   // Build a response
   let response = new Response("Hello JS", {

integration-tests/js-compute/fixtures/includeBytes/bin/index.js

@@ -1,3 +1,6 @@
+/* eslint-env serviceworker */
+/* global fastly */
+
 const message = fastly.includeBytes("message.txt");
 
 addEventListener("fetch", (event) => {

integration-tests/js-compute/fixtures/log/bin/index.js

@@ -1,3 +1,5 @@
+/* eslint-env serviceworker */
+/* global fastly */
 addEventListener("fetch", (event) => {
   let logger = fastly.getLogger("ComputeLog");
   logger.log("Hello!");

integration-tests/js-compute/fixtures/object-store/bin/index.js

@@ -1,4 +1,5 @@
-/* global ObjectStore, ObjectStoreEntry, fastly */
+/* eslint-env serviceworker */
+/* global ReadableStream fastly ObjectStore ObjectStoreEntry */
 addEventListener("fetch", event => {
     event.respondWith(app(event))
 })

integration-tests/js-compute/fixtures/random/bin/index.js

@@ -1,3 +1,4 @@
+/* eslint-env serviceworker */
 function random3Decimals() {
   return String(Math.random()).slice(0, 5);
 }

integration-tests/js-compute/fixtures/regex/bin/index.js

@@ -1,3 +1,4 @@
+/* eslint-env serviceworker */
 // The useragent_parser package is MIT licensed at the time this function was
 // inlined into this test:
 // https://github.com/Financial-Times/useragent_parser/blob/fdc6bff8f05cfb8fb8c8cd752f8739b9b356001f/package.json#L13
@@ -380,7 +381,7 @@ function useragent_parser(ua) {
     return { family, major, minor, patch };
   } else if (
     (result =
-      /\/((?:Ant-|)Nutch|[A-z]+[Bb]ot|[A-z]+[Ss]pider|Axtaris|fetchurl|Isara|ShopSalad|Tailsweep)[ \-](\d+)(?:\.(\d+)|)(?:\.(\d+)|)/.exec(
+      /\/((?:Ant-|)Nutch|[A-z]+[Bb]ot|[A-z]+[Ss]pider|Axtaris|fetchurl|Isara|ShopSalad|Tailsweep)[ -](\d+)(?:\.(\d+)|)(?:\.(\d+)|)/.exec(
         ua
       ))
   ) {
@@ -482,7 +483,7 @@ function useragent_parser(ua) {
     return { family, major, minor, patch };
   } else if (
     (result =
-      /(?:\/[A-Za-z0-9\.]+|) {0,5}([A-Za-z0-9 \-_\!\[\]:]{0,50}(?:[Aa]rchiver|[Ii]ndexer|[Ss]craper|[Bb]ot|[Ss]pider|[Cc]rawl[a-z]{0,50}))[/ ](\d+)(?:\.(\d+)(?:\.(\d+)|)|)/.exec(
+      /(?:\/[A-Za-z0-9.]+|) {0,5}([A-Za-z0-9 \-_![\]:]{0,50}(?:[Aa]rchiver|[Ii]ndexer|[Ss]craper|[Bb]ot|[Ss]pider|[Cc]rawl[a-z]{0,50}))[/ ](\d+)(?:\.(\d+)(?:\.(\d+)|)|)/.exec(
         ua
       ))
   ) {
@@ -504,7 +505,7 @@ function useragent_parser(ua) {
     return { family, major, minor, patch };
   } else if (
     (result =
-      /((?:[A-z0-9]{1,50}|[A-z\-]{1,50} ?|)(?: the |)(?:[Ss][Pp][Ii][Dd][Ee][Rr]|[Ss]crape|[Cc][Rr][Aa][Ww][Ll])[A-z0-9]{0,50})(?:(?:[ /]| v)(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)/.exec(
+      /((?:[A-z0-9]{1,50}|[A-z-]{1,50} ?|)(?: the |)(?:[Ss][Pp][Ii][Dd][Ee][Rr]|[Ss]crape|[Cc][Rr][Aa][Ww][Ll])[A-z0-9]{0,50})(?:(?:[ /]| v)(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)/.exec(
         ua
       ))
   ) {
@@ -920,7 +921,7 @@ function useragent_parser(ua) {
   } else if ((result = /(Nintendo 3DS)/.exec(ua))) {
     const family = "NetFront NX";
     return { family, major, minor, patch };
-  } else if ((result = /(Silk)\/(\d+)\.(\d+)(?:\.([0-9\-]+)|)/.exec(ua))) {
+  } else if ((result = /(Silk)\/(\d+)\.(\d+)(?:\.([0-9-]+)|)/.exec(ua))) {
     const family = "Amazon Silk";
     const major = result[2];
     const minor = result[3];
@@ -1068,6 +1069,7 @@ function useragent_parser(ua) {
     const minor = result[3];
     return { family, major, minor, patch };
   } else if (
+    // eslint-disable-next-line no-dupe-else-if
     (result = /(MQQBrowser\/Mini)(?:(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)/.exec(ua))
   ) {
     const family = "QQ Browser Mini";
@@ -1076,6 +1078,7 @@ function useragent_parser(ua) {
     const patch = result[4];
     return { family, major, minor, patch };
   } else if (
+    // eslint-disable-next-line no-dupe-else-if
     (result = /(MQQBrowser)(?:\/(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)/.exec(ua))
   ) {
     const family = "QQ Browser Mobile";
@@ -1084,6 +1087,7 @@ function useragent_parser(ua) {
     const patch = result[4];
     return { family, major, minor, patch };
   } else if (
+    // eslint-disable-next-line no-dupe-else-if
     (result = /(QQBrowser)(?:\/(\d+)(?:\.(\d+)\.(\d+)(?:\.(\d+)|)|)|)/.exec(ua))
   ) {
     const family = "QQ Browser";
@@ -1265,7 +1269,7 @@ function useragent_parser(ua) {
     const patch = result[4];
     return { family, major, minor, patch };
   } else if (
-    (result = /\b(Dolphin)(?: |HDCN\/|\/INT\-)(\d+)\.(\d+)(?:\.(\d+)|)/.exec(
+    (result = /\b(Dolphin)(?: |HDCN\/|\/INT-)(\d+)\.(\d+)(?:\.(\d+)|)/.exec(
       ua
     ))
   ) {
@@ -1450,7 +1454,7 @@ function useragent_parser(ua) {
     const major = result[2];
     const minor = result[3];
     return { family, major, minor, patch };
-  } else if ((result = /(Zune|BeyondPod) (\d+)(?:\.(\d+)|)[\);]/.exec(ua))) {
+  } else if ((result = /(Zune|BeyondPod) (\d+)(?:\.(\d+)|)[);]/.exec(ua))) {
     const family = result[1];
     const major = result[2];
     const minor = result[3];
@@ -1622,7 +1626,7 @@ function useragent_parser(ua) {
   } else if ((result = /(Obigo)InternetBrowser/.exec(ua))) {
     const family = result[1];
     return { family, major, minor, patch };
-  } else if ((result = /(Obigo)\-Browser/.exec(ua))) {
+  } else if ((result = /(Obigo)-Browser/.exec(ua))) {
     const family = result[1];
     return { family, major, minor, patch };
   } else if ((result = /(Obigo|OBIGO)[^\d]*(\d+)(?:.(\d+)|)/.exec(ua))) {
@@ -1911,7 +1915,7 @@ function useragent_parser(ua) {
     const major = "0";
     const minor = result[3];
     return { family, major, minor, patch };
-  } else if ((result = /(SEMC\-Browser)\/(\d+)\.(\d+)/.exec(ua))) {
+  } else if ((result = /(SEMC-Browser)\/(\d+)\.(\d+)/.exec(ua))) {
     const family = result[1];
     const major = result[2];
     const minor = result[3];
@@ -2000,6 +2004,7 @@ function useragent_parser(ua) {
     const patch = result[4];
     return { family, major, minor, patch };
   } else if (
+    // eslint-disable-next-line no-dupe-else-if
     (result = /(Python\/3\.\d{1,3} aiohttp)\/(\d+)\.(\d+)\.(\d+)/.exec(ua))
   ) {
     const family = result[1];

integration-tests/js-compute/fixtures/request-cache-key/bin/index.js

@@ -1,4 +1,5 @@
-/* global Request, RequestEntry, fastly */
+/* eslint-env serviceworker */
+/* global fastly */
 addEventListener("fetch", event => {
     event.respondWith(app(event))
 })
@@ -111,14 +112,6 @@ function assert(actual, expected, code) {
     }
 }
 
-function assertResolves(func) {
-    try {
-        func()
-    } catch (error) {
-        return fail(`Expected \`${func.toString()}\` to resolve - Found it rejected: ${error.name}: ${error.message}`)
-    }
-}
-
 function assertThrows(func, errorClass, errorMessage) {
     try {
         func()