chore: review comments

Author: tothandras

api/spec/packages/aip-client-javascript/src/lib/wire.ts

@@ -147,12 +147,16 @@ function walk(
     // Only the value is walked, and only when it is model-shaped. A null
     // prototype avoids the `__proto__` key silently reassigning `out`'s own
     // prototype instead of becoming a visible entry (user data may contain
-    // any key, including reserved object-literal property names).
+    // any key, including reserved object-literal property names). The
+    // prototype is restored once every key is a plain own property, so the
+    // returned object still behaves normally for consumers (instanceof,
+    // template literals) — `Object.prototype` itself was never touched.
     const valueSchema = hasRenamableShape(d.valueType) ? d.valueType : undefined
     const out: Record<string, unknown> = Object.create(null)
     for (const [key, value] of Object.entries(record)) {
       out[key] = valueSchema ? walk(value, valueSchema, dir, depth + 1) : value
     }
+    Object.setPrototypeOf(out, Object.prototype)
     return out
   }
 
@@ -182,6 +186,7 @@ function walk(
       }
       out[dir.rename(key)] = walk(value, fieldSchema, dir, depth + 1)
     }
+    Object.setPrototypeOf(out, Object.prototype)
     return out
   }
 

api/spec/packages/aip-client-javascript/tests/wire.spec.ts

@@ -43,10 +43,29 @@ describe('wire mapper (toWire/fromWire over real schemas)', () => {
     expect(Object.getPrototypeOf({})).toBe(Object.prototype)
   })
 
+  it('restores a normal prototype on record and object outputs for consumers', () => {
+    // The null prototype used during construction (to block __proto__/constructor
+    // pollution) is restored before returning, so the result behaves like a normal
+    // object for consumers — instanceof checks, template literals, etc. — rather
+    // than staying a `[Object: null prototype]` forever.
+    const wire = { features: { my_user_feature: { has_access: true } } }
+    const camel = fromWire(wire, schemas.governanceQueryResult) as any
+    expect(Object.getPrototypeOf(camel)).toBe(Object.prototype)
+    expect(Object.getPrototypeOf(camel.features)).toBe(Object.prototype)
+    expect(Object.getPrototypeOf(camel.features.my_user_feature)).toBe(
+      Object.prototype,
+    )
+    expect(camel instanceof Object).toBe(true)
+    expect(() => `${camel}`).not.toThrow()
+  })
+
   it('treats a data key of "constructor" as an unknown field, not a shape hit', () => {
     const wire = JSON.parse('{"id":"x","constructor":"evil"}')
     const camel = fromWire(wire, schemas.taxCode) as any
-    expect(camel.constructor).toBeUndefined()
+    // The wire value "evil" never becomes an own `constructor` property — since
+    // the prototype is restored, `camel.constructor` resolves to the ordinary
+    // inherited `Object` constructor, exactly as it would on any plain object.
+    expect(camel.constructor).toBe(Object)
     expect(Object.keys(camel)).not.toContain('constructor')
   })
 

api/spec/packages/typespec-typescript/src/runtime/wire.ts

@@ -147,12 +147,16 @@ function walk(
     // Only the value is walked, and only when it is model-shaped. A null
     // prototype avoids the `__proto__` key silently reassigning `out`'s own
     // prototype instead of becoming a visible entry (user data may contain
-    // any key, including reserved object-literal property names).
+    // any key, including reserved object-literal property names). The
+    // prototype is restored once every key is a plain own property, so the
+    // returned object still behaves normally for consumers (instanceof,
+    // template literals) — `Object.prototype` itself was never touched.
     const valueSchema = hasRenamableShape(d.valueType) ? d.valueType : undefined
     const out: Record<string, unknown> = Object.create(null)
     for (const [key, value] of Object.entries(record)) {
       out[key] = valueSchema ? walk(value, valueSchema, dir, depth + 1) : value
     }
+    Object.setPrototypeOf(out, Object.prototype)
     return out
   }
 
@@ -182,6 +186,7 @@ function walk(
       }
       out[dir.rename(key)] = walk(value, fieldSchema, dir, depth + 1)
     }
+    Object.setPrototypeOf(out, Object.prototype)
     return out
   }