Simplify import maps web platform tests

* Use import.meta.resolve() and <base> trickery, instead of a service worker + sometimes Chromium internals. * Remove the parsing tests that used Chromium internals. We should convert these into resolution tests eventually, but for now they just make wpt.fyi look sad and are confusing for other engines. We leave the JSON files here for now in anticipation of that upcoming conversion. * Use <meta name="variant"> instead of a loop over the JSON files. This avoids the need for <meta timeout="long"> and possibly allows some parallelism. * Renamed data-base-url.json to be data-url-prefix.json and update the test description to reflect the intent. This confusion originates from the original JS to JSON conversion at WICG/import-maps@6cb173d. Fixes #32697. Change-Id: I4943f4249eaec89f718c7a7fef271dbc61ec3f77
web-platform-tests · Aug 8, 2022 · c90f7cc · c90f7cc
1 parent 5c79743
commit c90f7cc
Show file tree

Hide file tree

Showing 12 changed files with 121 additions and 380 deletions.
diff --git a/import-maps/data-driven/README.md b/import-maps/data-driven/README.md
@@ -1,16 +1,14 @@
 # Data-driven import maps tests
 
 In this directory, test inputs and expectations are expressed as JSON files.
-This is in order to share the same JSON files between WPT tests and Jest-based
-tests for the reference JavaScript implementation at [WICG repository](https://github.com/WICG/import-maps/tree/master/reference-implementation).
+This is in order to share the same JSON files between WPT tests and other
+implementations that might not run the full WPT suite, e.g. server-side
+JavaScript runtimes or the [JavaScript reference implementation](https://github.com/WICG/import-maps/tree/master/reference-implementation).
 
 ## Basics
 
 A **test object** describes a set of parameters (import maps and base URLs) and test expectations.
-Test expectations can be:
-
-- Expected resulting URLs for specifiers (resolution tests), or
-- Expected parsed import maps (parsing tests).
+Test expectations consist of the expected resulting URLs for specifiers.
 
 Each JSON file under [resources/](resources/) directory consists of a test object.
 A minimum test object would be:
@@ -38,11 +36,10 @@ Required fields:
     - In WPT tests, this is used for the test name of `promise_test()` together with specifier to be resolved, like `"Main test name: a"`.
 - `importMap` (object or string): the import map to be attached.
 - `importMapBaseURL` (string): the base URL used for [parsing the import map](https://wicg.github.io/import-maps/#parse-an-import-map-string).
-- (resolution tests only) `expectedResults` (object; string to (string or null)): resolution test cases.
+- `expectedResults` (object; string to (string or null)): resolution test cases.
     - The keys are specifiers to be resolved.
     - The values are expected resolved URLs. If `null`, resolution should fail.
-- (resolution tests only) `baseURL` (string): the base URL used in [resolving a specifier](https://wicg.github.io/import-maps/#resolve-a-module-specifier) for each specifiers.
-- (parsing tests only) `expectedParsedImportMap` (object): the expected parsed import map for parsing test cases.
+- `baseURL` (string): the base URL used in [resolving a specifier](https://wicg.github.io/import-maps/#resolve-a-module-specifier) for each specifiers.
 
 Optional fields:
 
@@ -83,3 +80,8 @@ The top-level test object contains two sub test objects, named as `Subtest1` and
 
 Child test objects inherit fields from their parent test object.
 In the example above, the child test objects specifies `baseURL` fields, while they inherits other fields (e.g. `importMapBaseURL`) from the top-level test object.
+
+## TODO
+
+The `parsing-*.json` files are not currently used by the WPT harness. We should
+convert them to resolution tests.
diff --git a/import-maps/data-driven/parsing-internal.https.html b/import-maps/data-driven/parsing-internal.https.html
diff --git a/import-maps/data-driven/resolving-internal.https.html b/import-maps/data-driven/resolving-internal.https.html
diff --git a/import-maps/data-driven/resolving.html b/import-maps/data-driven/resolving.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta name="variant" content="?data-url-prefix.json">
+<meta name="variant" content="?empty-import-map.json">
+<meta name="variant" content="?overlapping-entries.json">
+<meta name="variant" content="?packages-via-trailing-slashes.json">
+<meta name="variant" content="?resolving-null.json">
+<meta name="variant" content="?scopes-exact-vs-prefix.json">
+<meta name="variant" content="?scopes.json">
+<meta name="variant" content="?tricky-specifiers.json">
+<meta name="variant" content="?url-specifiers-schemes.json">
+<meta name="variant" content="?url-specifiers.json">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/test-helper.js";
+
+const filename = location.search.substring(1);
+promise_test(
+  () => runTestsFromJSON('resources/' + filename),
+  "Test helper: fetching and sanity checking test JSON: " + filename);
+</script>
diff --git a/import-maps/data-driven/resolving.https.html b/import-maps/data-driven/resolving.https.html
diff --git a/.../data-driven/resources/data-base-url.json → ...ata-driven/resources/data-url-prefix.json b/.../data-driven/resources/data-base-url.json → ...ata-driven/resources/data-url-prefix.json
@@ -6,9 +6,9 @@
   },
   "importMapBaseURL": "https://example.com/app/index.html",
   "baseURL": "https://example.com/js/app.mjs",
-  "name": "data: base URL (?)",
+  "name": "data: URL prefix",
   "tests": {
-    "should favor the most-specific key": {
+    "should not resolve since you can't resolve relative to a data: URL": {
       "expectedResults": {
         "foo/bar": null
       }

diff --git a/import-maps/data-driven/resources/empty-import-map-internal.json b/import-maps/data-driven/resources/empty-import-map-internal.json
diff --git a/import-maps/data-driven/resources/empty-import-map.json b/import-maps/data-driven/resources/empty-import-map.json
@@ -42,6 +42,20 @@
         "https://invalid-url.com:demo": null,
         "http://[invalid-url.com]/": null
       }
+    },
+    "non-HTTPS fetch scheme absolute URLs": {
+      "expectedResults": {
+        "about:fetch-scheme": "about:fetch-scheme"
+      }
+    },
+    "non-fetch scheme absolute URLs": {
+      "expectedResults": {
+        "about:fetch-scheme": "about:fetch-scheme",
+        "mailto:non-fetch-scheme": "mailto:non-fetch-scheme",
+        "import:non-fetch-scheme": "import:non-fetch-scheme",
+        "javascript:non-fetch-scheme": "javascript:non-fetch-scheme",
+        "wss:non-fetch-scheme": "wss://non-fetch-scheme/"
+      }
     }
   }
 }
diff --git a/import-maps/data-driven/resources/test-helper-iframe.js b/import-maps/data-driven/resources/test-helper-iframe.js
@@ -1,5 +1,5 @@
 // Handle errors around fetching, parsing and registering import maps.
-const onScriptError = event => {
+window.onScriptError = event => {
   window.registrationResult = {type: 'FetchError', error: event.error};
   return false;
 };
@@ -14,90 +14,35 @@ window.addEventListener('error', window.windowErrorHandler);
 // objects themselves and re-create error objects later, to avoid
 // issues around serializing error objects which is a quite new feature.
 window.addEventListener('message', event => {
-  if (event.data.action === 'prepareResolve') {
-    // To get the result of #resolve-a-module-specifier given a script
-    // (with base URL = |baseURL|) and |specifier|, the service worker
-    // first serves an importer script with response URL = |baseURL|:
-    //     window.importHelper = (specifier) => import(specifier);
-    // This is to use |baseURL| as the referringScript's base URL.
-
-    // Step 1. Signal the service worker to serve
-    // the importer script for the next fetch request.
-    parent.worker.postMessage('serveImporterScript');
-  } else if (event.data.action === 'resolve') {
-    if (event.data.expectedURL === null ||
-        new URL(event.data.expectedURL).protocol === 'https:') {
-      // Testing without internal methods:
-      // If the resolution is expected to fail (null case here),
-      // we can test the failure just by catching the exception.
-      // If the expected URL is HTTPS, we can test the result by
-      // intercepting requests by service workers.
+  if (event.data.action !== 'resolve') {
+    parent.postMessage({
+        type: 'Failure',
+        result: 'Error',
+        message: 'Invalid Action: ' + event.data.action}, '*');
+    return;
+  }
 
-      // Step 3. Evaluate the importer script as a classic script,
-      // in order to prevent |baseURL| from being mapped by import maps.
-      const script = document.createElement('script');
-      script.onload = () => {
-        // Step 4. Trigger dynamic import from |baseURL|.
-        importHelper(event.data.specifier)
-          .then(module => {
-              // Step 5. Service worker responds with a JSON containing
-              // the request URL for the dynamic import
-              // (= the result of #resolve-a-module-specifier).
-              parent.postMessage({type: 'ResolutionSuccess',
-                                  result: module.response.url},
-                                 '*');
-            })
-          .catch(e => {
-              parent.postMessage(
-                  {type: 'Failure', result: e.name, message: e.message},
-                  '*');
-            });
-      };
-      script.src = event.data.baseURL;
-      document.body.appendChild(script);
-    } else {
-      // Testing with internal methods.
-      // For example, the resolution results are data: URLs.
-      if (!event.data.useInternalMethods) {
-        parent.postMessage(
-            {type: 'Failure',
-             result: 'Error',
-             message: 'internals.resolveModuleSpecifier is not available'},
-            '*');
-        return;
-      }
-      try {
-        const result = internals.resolveModuleSpecifier(
-          event.data.specifier,
-          event.data.baseURL,
-          document);
-        parent.postMessage(
-            {type: 'ResolutionSuccess', result: result}, '*');
-      } catch (e) {
-        parent.postMessage(
-            {type: 'Failure', result: e.name, message: e.message}, '*');
-      }
-    }
-  } else if (event.data.action === 'getParsedImportMap') {
-    if (!event.data.useInternalMethods) {
-      parent.postMessage(
-          {type: 'Failure',
-           result: 'Error',
-           message: 'internals.getParsedImportMap is not available'},
-          '*');
-    }
+  // To respond to a resolution request, we:
+  // 1. Update the document's base URL to the requested base URL.
+  // 2. Create a new inline script, parsed with that base URL, which saves
+  //    import.meta.resolve into a global.
+  // 3. Call that saved import.meta.resolve with the requested specifier, and
+  //    sends the result to the parent window.
+  document.querySelector('base').href = event.data.baseURL;
+  window.continueToResolve = () => {
     try {
-      parent.postMessage({
-          type: 'GetParsedImportMapSuccess',
-          result: internals.getParsedImportMap(document)}, '*');
+      const result = window.inlineScriptImportMetaResolve(event.data.specifier);
+      parent.postMessage({type: 'ResolutionSuccess', result}, '*');
     } catch (e) {
       parent.postMessage(
           {type: 'Failure', result: e.name, message: e.message}, '*');
     }
-  } else {
-    parent.postMessage({
-        type: 'Failure',
-        result: 'Error',
-        message: 'Invalid Action: ' + event.data.action}, '*');
-  }
+  };
+  const inlineScript = document.createElement('script');
+  inlineScript.type = 'module';
+  inlineScript.textContent = `
+    window.inlineScriptImportMetaResolve = import.meta.resolve;
+    window.continueToResolve();
+  `;
+  document.body.append(inlineScript);
 });