Merge pull request #6229 from cloudflare/yagiz/fix-webidl

Author: anonrig

src/node/internal/internal_inspect.ts

@@ -3023,6 +3023,18 @@ export function formatLog(
 
 function isBuiltinPrototype(proto: unknown) {
   if (proto === null) return true;
+  // JSG resource type prototypes carry the kResourceTypeInspect symbol.
+  // These are not "built-in" in the JS-engine sense even though their
+  // constructors are own properties of globalThis (per Web IDL).  The
+  // prototype walk must continue through them to collect accessor
+  // properties (e.g. Blob.prototype.size).
+  if (
+    typeof proto === 'object' &&
+    proto !== null &&
+    internal.kResourceTypeInspect in (proto as Record<PropertyKey, unknown>)
+  ) {
+    return false;
+  }
   const descriptor = Object.getOwnPropertyDescriptor(proto, 'constructor');
   return (
     descriptor !== undefined &&

src/workerd/api/global-scope.h

@@ -619,6 +619,12 @@ class ServiceWorkerGlobalScope: public WorkerGlobalScope {
 
     JSG_NESTED_TYPE(DOMException);
     JSG_NESTED_TYPE(WorkerGlobalScope);
+    if (flags.getSpecCompliantPropertyAttributes()) {
+      // EventTarget is also declared on WorkerGlobalScope, but V8's
+      // FunctionTemplate::Inherit() does not propagate instance-template
+      // properties.  Redeclare here so it becomes an own property of globalThis.
+      JSG_NESTED_TYPE(EventTarget);
+    }
 
     JSG_METHOD(btoa);
     JSG_METHOD(atob);

src/workerd/io/compatibility-date.capnp

@@ -1463,13 +1463,18 @@ struct CompatibilityFlags @0x8f8c1b68151b6cef {
       $compatEnableFlag("spec_compliant_property_attributes")
       $compatDisableFlag("no_spec_compliant_property_attributes")
       $experimental;
-  # Fixes several Web IDL compliance issues on constructor, method, getter,
-  # and setter property attributes:
+  # Fixes several Web IDL compliance issues on property attributes:
   #  - Constructor .length reflects the number of required arguments instead
   #    of always being 0.
   #  - Method and static method .length reflects the number of required
   #    arguments instead of always being 0.
   #  - Getter .length is explicitly 0 and setter .length is 1.
   #  - Getter .name is "get <name>" and setter .name is "set <name>" per the
   #    Web IDL spec, instead of empty strings.
+  #  - Constants gain DontDelete (non-configurable) on both the constructor
+  #    and prototype, matching { writable: false, enumerable: true,
+  #    configurable: false } per Web IDL.
+  #  - Interface objects (nested types) become own properties of globalThis
+  #    with { writable: true, enumerable: false, configurable: true }, instead
+  #    of being inherited from the prototype chain.
 }

src/workerd/jsg/resource.h

@@ -1542,8 +1542,13 @@ struct ResourceTypeBuilder {
     auto v8Name = v8StrIntern(isolate, name);
     auto v8Value = typeWrapper.wrap(isolate, kj::none, kj::mv(value));
 
-    constructor->Set(v8Name, v8Value, v8::PropertyAttribute::ReadOnly);
-    constructor->PrototypeTemplate()->Set(v8Name, v8Value, v8::PropertyAttribute::ReadOnly);
+    // Per Web IDL, constants are {writable: false, enumerable: true, configurable: false}.
+    const auto attrs = getSpecCompliantPropertyAttributes(isolate)
+        ? static_cast<v8::PropertyAttribute>(
+              v8::PropertyAttribute::ReadOnly | v8::PropertyAttribute::DontDelete)
+        : v8::PropertyAttribute::ReadOnly;
+    constructor->Set(v8Name, v8Value, attrs);
+    constructor->PrototypeTemplate()->Set(v8Name, v8Value, attrs);
   }
 
   template <const char* name, typename Getter, Getter getter>
@@ -1604,7 +1609,28 @@ struct ResourceTypeBuilder {
     static_assert(
         hasGetTemplate, "Type must be listed in JSG_DECLARE_ISOLATE_TYPE to be declared nested.");
 
-    prototype->Set(isolate, name, typeWrapper.getTemplate(isolate, static_cast<Type*>(nullptr)));
+    auto tmpl = typeWrapper.getTemplate(isolate, static_cast<Type*>(nullptr));
+
+    // Always install on the prototype so that types declared on parent classes are
+    // inherited through FunctionTemplate::Inherit().
+    prototype->Set(isolate, name, tmpl);
+
+    if constexpr (isContext) {
+      if (getSpecCompliantPropertyAttributes(isolate)) {
+        // Per Web IDL, [Exposed] interface objects must be own properties of the global
+        // object with { writable: true, enumerable: false, configurable: true }.  When
+        // building the global scope (isContext == true), also install on the instance
+        // template so that they become own properties of globalThis.
+        //
+        // NOTE: V8's FunctionTemplate::Inherit() does NOT propagate instance-template
+        // properties to child types.  This means nested types declared on a parent
+        // context type (e.g. WorkerGlobalScope) won't automatically appear as own
+        // properties of the child (e.g. ServiceWorkerGlobalScope).  To keep things
+        // simple, the leaf context type must declare all its nested types directly -
+        // don't rely on inheriting nested types from parent context classes.
+        instance->Set(isolate, name, tmpl, v8::PropertyAttribute::DontEnum);
+      }
+    }
   }
 
   inline void registerTypeScriptRoot() { /* only needed for RTTI */ }

src/wpt/WebCryptoAPI-test.ts

@@ -210,32 +210,10 @@ export default {
     comment:
       'IDL tests fail because Workers exposes globals differently than browsers (not as own properties of self)',
     expectedFailures: [
-      'Crypto interface: existence and properties of interface object',
-      'Crypto interface object length',
-      'Crypto interface object name',
-      'Crypto interface: existence and properties of interface prototype object',
-      'Crypto interface: existence and properties of interface prototype object\'s "constructor" property',
-      "Crypto interface: existence and properties of interface prototype object's @@unscopables property",
-      'Crypto interface: attribute subtle',
-      'Crypto interface: operation getRandomValues(ArrayBufferView)',
-      'Crypto interface: operation randomUUID()',
-      'Crypto must be primary interface of crypto',
-      'CryptoKey interface: existence and properties of interface object',
-      'CryptoKey interface object length',
-      'CryptoKey interface object name',
-      'CryptoKey interface: existence and properties of interface prototype object',
-      'CryptoKey interface: existence and properties of interface prototype object\'s "constructor" property',
-      "CryptoKey interface: existence and properties of interface prototype object's @@unscopables property",
       'CryptoKey interface: attribute type',
       'CryptoKey interface: attribute extractable',
       'CryptoKey interface: attribute algorithm',
       'CryptoKey interface: attribute usages',
-      'SubtleCrypto interface: existence and properties of interface object',
-      'SubtleCrypto interface object length',
-      'SubtleCrypto interface object name',
-      'SubtleCrypto interface: existence and properties of interface prototype object',
-      'SubtleCrypto interface: existence and properties of interface prototype object\'s "constructor" property',
-      "SubtleCrypto interface: existence and properties of interface prototype object's @@unscopables property",
       'SubtleCrypto interface: operation encrypt(AlgorithmIdentifier, CryptoKey, BufferSource)',
       'SubtleCrypto interface: operation decrypt(AlgorithmIdentifier, CryptoKey, BufferSource)',
       'SubtleCrypto interface: operation sign(AlgorithmIdentifier, CryptoKey, BufferSource)',
@@ -248,7 +226,6 @@ export default {
       'SubtleCrypto interface: operation exportKey(KeyFormat, CryptoKey)',
       'SubtleCrypto interface: operation wrapKey(KeyFormat, CryptoKey, CryptoKey, AlgorithmIdentifier)',
       'SubtleCrypto interface: operation unwrapKey(KeyFormat, BufferSource, CryptoKey, AlgorithmIdentifier, AlgorithmIdentifier, boolean, sequence<KeyUsage>)',
-      'SubtleCrypto must be primary interface of crypto.subtle',
       'Window interface: attribute crypto',
     ],
   },

src/wpt/compression-test.ts

@@ -91,22 +91,10 @@ export default {
   },
   'idlharness.https.any.js': {
     comment:
-      'Workers expose globals differently than browsers - these interface tests fail',
+      'Workers expose globals differently than browsers - readable/writable attribute tests still fail',
     expectedFailures: [
-      'CompressionStream interface: existence and properties of interface object',
-      'CompressionStream interface object length',
-      'CompressionStream interface object name',
       'CompressionStream interface: existence and properties of interface prototype object',
-      'CompressionStream interface: existence and properties of interface prototype object\'s "constructor" property',
-      "CompressionStream interface: existence and properties of interface prototype object's @@unscopables property",
-      'CompressionStream must be primary interface of new CompressionStream("deflate")',
-      'DecompressionStream interface: existence and properties of interface object',
-      'DecompressionStream interface object length',
-      'DecompressionStream interface object name',
       'DecompressionStream interface: existence and properties of interface prototype object',
-      'DecompressionStream interface: existence and properties of interface prototype object\'s "constructor" property',
-      "DecompressionStream interface: existence and properties of interface prototype object's @@unscopables property",
-      'DecompressionStream must be primary interface of new DecompressionStream("deflate")',
     ],
   },
   'third_party/pako/pako_inflate.min.js': {},

src/wpt/encoding-test.ts

@@ -31,45 +31,10 @@ export default {
   },
   'idlharness.any.js': {
     comment:
-      'Workers expose globals differently than browsers - these interface tests fail',
+      'Workers expose globals differently than browsers - readable/writable attribute tests still fail',
     expectedFailures: [
-      'TextDecoder interface: existence and properties of interface object',
-      'TextDecoder interface object length',
-      'TextDecoder interface object name',
-      'TextDecoder interface: existence and properties of interface prototype object',
-      'TextDecoder interface: existence and properties of interface prototype object\'s "constructor" property',
-      "TextDecoder interface: existence and properties of interface prototype object's @@unscopables property",
-      'TextDecoder interface: operation decode(optional AllowSharedBufferSource, optional TextDecodeOptions)',
-      'TextDecoder interface: attribute encoding',
-      'TextDecoder interface: attribute fatal',
-      'TextDecoder interface: attribute ignoreBOM',
-      'TextDecoder must be primary interface of new TextDecoder()',
-      'TextEncoder interface: existence and properties of interface object',
-      'TextEncoder interface object length',
-      'TextEncoder interface object name',
-      'TextEncoder interface: existence and properties of interface prototype object',
-      'TextEncoder interface: existence and properties of interface prototype object\'s "constructor" property',
-      "TextEncoder interface: existence and properties of interface prototype object's @@unscopables property",
-      'TextEncoder interface: operation encode(optional USVString)',
-      'TextEncoder interface: operation encodeInto(USVString, Uint8Array)',
-      'TextEncoder interface: attribute encoding',
-      'TextEncoder must be primary interface of new TextEncoder()',
-      'TextDecoderStream interface: existence and properties of interface object',
-      'TextDecoderStream interface object length',
-      'TextDecoderStream interface object name',
       'TextDecoderStream interface: existence and properties of interface prototype object',
-      'TextDecoderStream interface: existence and properties of interface prototype object\'s "constructor" property',
-      "TextDecoderStream interface: existence and properties of interface prototype object's @@unscopables property",
-      'TextDecoderStream interface: attribute encoding',
-      'TextDecoderStream interface: attribute fatal',
-      'TextDecoderStream interface: attribute ignoreBOM',
-      'TextEncoderStream interface: existence and properties of interface object',
-      'TextEncoderStream interface object length',
-      'TextEncoderStream interface object name',
       'TextEncoderStream interface: existence and properties of interface prototype object',
-      'TextEncoderStream interface: existence and properties of interface prototype object\'s "constructor" property',
-      "TextEncoderStream interface: existence and properties of interface prototype object's @@unscopables property",
-      'TextEncoderStream interface: attribute encoding',
     ],
   },
   'iso-2022-jp-decoder.any.js': {},

src/wpt/fetch/api-test.ts

@@ -410,7 +410,6 @@ export default {
     expectedFailures: [
       // Headers interface tests
       /^Headers interface/,
-      /^Headers must be primary interface/,
       // Request interface tests
       /^Request interface/,
       // Response interface tests

src/wpt/fs-test.ts

@@ -185,41 +185,18 @@ export default {
   },
   'idlharness.https.any.js': {
     comment:
-      'Workers expose globals differently than browsers - these interface tests fail',
+      'Remaining IDL failures: prototype chain issues, operation .length mismatches',
     expectedFailures: [
-      'FileSystemHandle interface: existence and properties of interface object',
-      'FileSystemHandle interface object length',
-      'FileSystemHandle interface object name',
-      'FileSystemHandle interface: existence and properties of interface prototype object',
-      'FileSystemHandle interface: existence and properties of interface prototype object\'s "constructor" property',
-      "FileSystemHandle interface: existence and properties of interface prototype object's @@unscopables property",
-      'FileSystemHandle interface: attribute kind',
-      'FileSystemHandle interface: attribute name',
       'FileSystemHandle interface: operation isSameEntry(FileSystemHandle)',
       'FileSystemFileHandle interface: existence and properties of interface object',
-      'FileSystemFileHandle interface object length',
-      'FileSystemFileHandle interface object name',
-      'FileSystemFileHandle interface: existence and properties of interface prototype object',
-      'FileSystemFileHandle interface: existence and properties of interface prototype object\'s "constructor" property',
-      "FileSystemFileHandle interface: existence and properties of interface prototype object's @@unscopables property",
       'FileSystemFileHandle interface: operation getFile()',
       'FileSystemFileHandle interface: operation createWritable(optional FileSystemCreateWritableOptions)',
       'FileSystemDirectoryHandle interface: existence and properties of interface object',
-      'FileSystemDirectoryHandle interface object length',
-      'FileSystemDirectoryHandle interface object name',
-      'FileSystemDirectoryHandle interface: existence and properties of interface prototype object',
-      'FileSystemDirectoryHandle interface: existence and properties of interface prototype object\'s "constructor" property',
-      "FileSystemDirectoryHandle interface: existence and properties of interface prototype object's @@unscopables property",
       'FileSystemDirectoryHandle interface: operation getFileHandle(USVString, optional FileSystemGetFileOptions)',
       'FileSystemDirectoryHandle interface: operation getDirectoryHandle(USVString, optional FileSystemGetDirectoryOptions)',
       'FileSystemDirectoryHandle interface: operation removeEntry(USVString, optional FileSystemRemoveOptions)',
       'FileSystemDirectoryHandle interface: operation resolve(FileSystemHandle)',
       'FileSystemWritableFileStream interface: existence and properties of interface object',
-      'FileSystemWritableFileStream interface object length',
-      'FileSystemWritableFileStream interface object name',
-      'FileSystemWritableFileStream interface: existence and properties of interface prototype object',
-      'FileSystemWritableFileStream interface: existence and properties of interface prototype object\'s "constructor" property',
-      "FileSystemWritableFileStream interface: existence and properties of interface prototype object's @@unscopables property",
       'FileSystemWritableFileStream interface: operation write(FileSystemWriteChunkType)',
       'FileSystemWritableFileStream interface: operation seek(unsigned long long)',
       'FileSystemWritableFileStream interface: operation truncate(unsigned long long)',

src/wpt/harness/globals.ts

@@ -29,9 +29,6 @@ import { getBindingPath } from './common';
 // @ts-expect-error We're just exposing enough stuff for the tests to pass; it's not a perfect match
 globalThis.self = globalThis;
 
-// WPT tests use self.URL which requires URL to be an own property of globalThis
-globalThis.URL = URL;
-
 // Some WPT tests reference addEventListener at the top level during file evaluation.
 // workerd doesn't have addEventListener on the global (it uses module exports instead),
 // so we provide a no-op stub to allow test files to load without throwing.