fix(runtime): use more null proto objects again (#25040)

proceed with #23921 This PR is a preparation for denoland/deno_lint#1307 --------- Signed-off-by: Kenta Moriuchi <[email protected]> Co-authored-by: Luca Casonato <[email protected]>
denoland · Sep 6, 2024 · f0a3d20 · f0a3d20
1 parent 8ef08f1
commit f0a3d20
Show file tree

Hide file tree

Showing 34 changed files with 144 additions and 20 deletions.
diff --git a/ext/console/01_console.js b/ext/console/01_console.js
@@ -260,6 +260,7 @@ const colors = {
 
 function defineColorAlias(target, alias) {
   ObjectDefineProperty(colors, alias, {
+    __proto__: null,
     get() {
       return this[target];
     },
@@ -3447,7 +3448,10 @@ function inspect(
 function createFilteredInspectProxy({ object, keys, evaluate }) {
   const obj = class {};
   if (object.constructor?.name) {
-    ObjectDefineProperty(obj, "name", { value: object.constructor.name });
+    ObjectDefineProperty(obj, "name", {
+      __proto__: null,
+      value: object.constructor.name,
+    });
   }
 
   return new Proxy(new obj(), {

diff --git a/ext/fetch/22_body.js b/ext/fetch/22_body.js
@@ -263,6 +263,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
   /** @type {PropertyDescriptorMap} */
   const mixin = {
     body: {
+      __proto__: null,
       /**
        * @returns {ReadableStream<Uint8Array> | null}
        */
@@ -278,6 +279,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     bodyUsed: {
+      __proto__: null,
       /**
        * @returns {boolean}
        */
@@ -292,6 +294,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     arrayBuffer: {
+      __proto__: null,
       /** @returns {Promise<ArrayBuffer>} */
       value: function arrayBuffer() {
         return consumeBody(this, "ArrayBuffer");
@@ -301,6 +304,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     blob: {
+      __proto__: null,
       /** @returns {Promise<Blob>} */
       value: function blob() {
         return consumeBody(this, "Blob");
@@ -310,6 +314,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     bytes: {
+      __proto__: null,
       /** @returns {Promise<Uint8Array>} */
       value: function bytes() {
         return consumeBody(this, "bytes");
@@ -319,6 +324,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     formData: {
+      __proto__: null,
       /** @returns {Promise<FormData>} */
       value: function formData() {
         return consumeBody(this, "FormData");
@@ -328,6 +334,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     json: {
+      __proto__: null,
       /** @returns {Promise<any>} */
       value: function json() {
         return consumeBody(this, "JSON");
@@ -337,6 +344,7 @@ function mixinBody(prototype, bodySymbol, mimeTypeSymbol) {
       enumerable: true,
     },
     text: {
+      __proto__: null,
       /** @returns {Promise<string>} */
       value: function text() {
         return consumeBody(this, "text");

diff --git a/ext/fetch/22_http_client.js b/ext/fetch/22_http_client.js
@@ -42,6 +42,7 @@ class HttpClient {
    */
   constructor(rid) {
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });

diff --git a/ext/fetch/23_response.js b/ext/fetch/23_response.js
@@ -432,9 +432,9 @@ class Response {
 
 webidl.configureInterface(Response);
 ObjectDefineProperties(Response, {
-  json: { enumerable: true },
-  redirect: { enumerable: true },
-  error: { enumerable: true },
+  json: { __proto__: null, enumerable: true },
+  redirect: { __proto__: null, enumerable: true },
+  error: { __proto__: null, enumerable: true },
 });
 const ResponsePrototype = Response.prototype;
 mixinBody(ResponsePrototype, _body, _mimeType);

diff --git a/ext/fetch/27_eventsource.js b/ext/fetch/27_eventsource.js
@@ -355,12 +355,15 @@ const EventSourcePrototype = EventSource.prototype;
 
 ObjectDefineProperties(EventSource, {
   CONNECTING: {
+    __proto__: null,
     value: 0,
   },
   OPEN: {
+    __proto__: null,
     value: 1,
   },
   CLOSED: {
+    __proto__: null,
     value: 2,
   },
 });

diff --git a/ext/ffi/00_ffi.js b/ext/ffi/00_ffi.js
@@ -484,10 +484,11 @@ class DynamicLibrary {
           this.symbols,
           symbol,
           {
+            __proto__: null,
             configurable: false,
             enumerable: true,
-            value,
             writable: false,
+            value,
           },
         );
         continue;
@@ -504,8 +505,10 @@ class DynamicLibrary {
           this.symbols,
           symbol,
           {
+            __proto__: null,
             configurable: false,
             enumerable: true,
+            writable: false,
             value: (...parameters) => {
               if (isStructResult) {
                 const buffer = new Uint8Array(structSize);
@@ -527,7 +530,6 @@ class DynamicLibrary {
                 );
               }
             },
-            writable: false,
           },
         );
       }

diff --git a/ext/fs/30_fs.js b/ext/fs/30_fs.js
@@ -585,6 +585,7 @@ class FsFile {
 
   constructor(rid, symbol) {
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });

diff --git a/ext/net/01_net.js b/ext/net/01_net.js
@@ -103,11 +103,13 @@ class Conn {
   constructor(rid, remoteAddr, localAddr) {
     if (internals.future) {
       ObjectDefineProperty(this, "rid", {
+        __proto__: null,
         enumerable: false,
         value: undefined,
       });
     }
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });
@@ -214,6 +216,7 @@ class TcpConn extends Conn {
   constructor(rid, remoteAddr, localAddr) {
     super(rid, remoteAddr, localAddr);
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });
@@ -244,6 +247,7 @@ class UnixConn extends Conn {
   constructor(rid, remoteAddr, localAddr) {
     super(rid, remoteAddr, localAddr);
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });
@@ -269,11 +273,13 @@ class Listener {
   constructor(rid, addr) {
     if (internals.future) {
       ObjectDefineProperty(this, "rid", {
+        __proto__: null,
         enumerable: false,
         value: undefined,
       });
     }
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });

diff --git a/ext/net/02_tls.js b/ext/net/02_tls.js
@@ -30,6 +30,7 @@ class TlsConn extends Conn {
   constructor(rid, remoteAddr, localAddr) {
     super(rid, remoteAddr, localAddr);
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });
@@ -110,6 +111,7 @@ class TlsListener extends Listener {
   constructor(rid, addr) {
     super(rid, addr);
     ObjectDefineProperty(this, internalRidSymbol, {
+      __proto__: null,
       enumerable: false,
       value: rid,
     });

diff --git a/ext/node/benchmarks/child_process_ipc.mjs b/ext/node/benchmarks/child_process_ipc.mjs
@@ -29,6 +29,7 @@ if (process.env.CHILD) {
       const start = performance.now();
 
       const options = {
+        __proto__: null,
         "stdio": ["inherit", "inherit", "inherit", "ipc"],
         "env": { "CHILD": len.toString() },
       };

diff --git a/ext/node/polyfills/_brotli.js b/ext/node/polyfills/_brotli.js
@@ -60,7 +60,7 @@ export class BrotliDecompress extends Transform {
   #context;
 
   // TODO(littledivy): use `options` argument
-  constructor(_options = {}) {
+  constructor(_options = { __proto__: null }) {
     super({
       // TODO(littledivy): use `encoding` argument
       transform(chunk, _encoding, callback) {
@@ -91,7 +91,7 @@ export class BrotliDecompress extends Transform {
 export class BrotliCompress extends Transform {
   #context;
 
-  constructor(options = {}) {
+  constructor(options = { __proto__: null }) {
     super({
       // TODO(littledivy): use `encoding` argument
       transform(chunk, _encoding, callback) {

diff --git a/ext/node/polyfills/_process/streams.mjs b/ext/node/polyfills/_process/streams.mjs
@@ -65,22 +65,26 @@ export function createWritableStdioStream(writer, name, warmup = false) {
   stream.once("close", () => writer?.close());
   ObjectDefineProperties(stream, {
     columns: {
+      __proto__: null,
       enumerable: true,
       configurable: true,
       get: () =>
         writer?.isTerminal() ? Deno.consoleSize?.().columns : undefined,
     },
     rows: {
+      __proto__: null,
       enumerable: true,
       configurable: true,
       get: () => writer?.isTerminal() ? Deno.consoleSize?.().rows : undefined,
     },
     isTTY: {
+      __proto__: null,
       enumerable: true,
       configurable: true,
       get: () => writer?.isTerminal(),
     },
     getWindowSize: {
+      __proto__: null,
       enumerable: true,
       configurable: true,
       value: () =>
@@ -203,6 +207,7 @@ export const initStdin = (warmup = false) => {
   stdin.on("close", () => io.stdin?.close());
   stdin.fd = io.stdin ? io.STDIN_RID : -1;
   ObjectDefineProperty(stdin, "isTTY", {
+    __proto__: null,
     enumerable: true,
     configurable: true,
     get() {
@@ -216,6 +221,7 @@ export const initStdin = (warmup = false) => {
     return stdin;
   };
   ObjectDefineProperty(stdin, "isRaw", {
+    __proto__: null,
     enumerable: true,
     configurable: true,
     get() {

diff --git a/ext/node/polyfills/_util/async.ts b/ext/node/polyfills/_util/async.ts
@@ -13,7 +13,7 @@ import { clearTimeout, setTimeout } from "ext:deno_web/02_timers.js";
 /** Resolve a Promise after a given amount of milliseconds. */
 export function delay(
   ms: number,
-  options: { signal?: AbortSignal } = {},
+  options: { signal?: AbortSignal } = { __proto__: null },
 ): Promise<void> {
   const { signal } = options;
   if (signal?.aborted) {

diff --git a/ext/node/polyfills/_util/std_testing_diff.ts b/ext/node/polyfills/_util/std_testing_diff.ts
@@ -325,7 +325,10 @@ export function diffstr(A: string, B: string) {
     );
   }
 
-  function tokenize(string: string, { wordDiff = false } = {}): string[] {
+  function tokenize(
+    string: string,
+    { wordDiff = false } = { __proto__: null },
+  ): string[] {
     if (wordDiff) {
       // Split string on whitespace symbols
       const tokens = StringPrototypeSplit(string, WHITESPACE_SYMBOL_PATTERN);
@@ -450,7 +453,7 @@ export function diffstr(A: string, B: string) {
  */
 function createColor(
   diffType: DiffType,
-  { background = false } = {},
+  { background = false } = { __proto__: null },
 ): (s: string) => string {
   // TODO(@littledivy): Remove this when we can detect
   // true color terminals.
@@ -484,7 +487,7 @@ function createSign(diffType: DiffType): string {
 
 export function buildMessage(
   diffResult: ReadonlyArray<DiffResult<string>>,
-  { stringDiff = false } = {},
+  { stringDiff = false } = { __proto__: null },
 ): string[] {
   const messages: string[] = [], diffMessages: string[] = [];
   ArrayPrototypePush(messages, "");

diff --git a/ext/node/polyfills/string_decoder.ts b/ext/node/polyfills/string_decoder.ts
@@ -403,13 +403,15 @@ StringDecoder.prototype.text = function text(
 
 ObjectDefineProperties(StringDecoder.prototype, {
   lastNeed: {
+    __proto__: null,
     configurable: true,
     enumerable: true,
     get(this: StringDecoder): number {
       return this[kMissingBytes];
     },
   },
   lastTotal: {
+    __proto__: null,
     configurable: true,
     enumerable: true,
     get(this: StringDecoder): number {

diff --git a/ext/node/polyfills/timers.ts b/ext/node/polyfills/timers.ts
@@ -33,6 +33,7 @@ export function setTimeout(
 }
 
 ObjectDefineProperty(setTimeout, promisify.custom, {
+  __proto__: null,
   value: (timeout: number, ...args: unknown[]) => {
     return new Promise((cb) =>
       setTimeout(cb, timeout, ...new SafeArrayIterator(args))

diff --git a/ext/node/polyfills/util.ts b/ext/node/polyfills/util.ts
@@ -177,6 +177,7 @@ export function inherits<T, U>(
     );
   }
   ObjectDefineProperty(ctor, "super_", {
+    __proto__: null,
     value: superCtor,
     writable: true,
     configurable: true,

diff --git a/ext/node/polyfills/vm.js b/ext/node/polyfills/vm.js
@@ -34,7 +34,7 @@ const kParsingContext = Symbol("script parsing context");
 export class Script {
   #inner;
 
-  constructor(code, options = {}) {
+  constructor(code, options = { __proto__: null }) {
     code = `${code}`;
     if (typeof options === "string") {
       options = { filename: options };
@@ -80,7 +80,7 @@ export class Script {
       : undefined;
   }
 
-  #runInContext(contextifiedObject, options = {}) {
+  #runInContext(contextifiedObject, options = { __proto__: null }) {
     validateObject(options, "options");
 
     let timeout = options.timeout;
@@ -181,7 +181,10 @@ function getContextOptions(options) {
 }
 
 let defaultContextNameIndex = 1;
-export function createContext(contextObject = {}, options = {}) {
+export function createContext(
+  contextObject = {},
+  options = { __proto__: null },
+) {
   if (isContext(contextObject)) {
     return contextObject;
   }
@@ -276,7 +279,7 @@ export function isContext(object) {
   return op_vm_is_context(object);
 }
 
-export function compileFunction(code, params, options = {}) {
+export function compileFunction(code, params, options = { __proto__: null }) {
   validateString(code, "code");
   if (params !== undefined) {
     validateStringArray(params, "params");