only escape for capital globals

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -8126,43 +8126,26 @@ let sorted_keywords = [|
   "__esModule";
   "__filename";
   "abstract";
-  "alert";
   "arguments";
-  "atob";
   "await";
-  "blur";
   "boolean";
   "break";
-  "btoa";
   "byte";
-  "cancelAnimationFrame";
-  "cancelIdleCallback";
-  "captureEvents";
   "case";
   "catch";
   "char";
   "class";
   "clearImmediate";
   "clearInterval";
   "clearTimeout";
-  "clientInformation";
-  "close";
-  "closed";
-  "confirm";
   "console";
   "const";
   "continue";
-  "createImageBitmap";
-  "crypto";
-  "customElements";
   "debugger";
   "decodeURI";
   "decodeURIComponent";
   "default";
-  "defaultStatus";
-  "defaultstatus";
   "delete";
-  "devicePixelRatio";
   "do";
   "document";
   "double";
@@ -8176,239 +8159,61 @@ let sorted_keywords = [|
   "export";
   "exports";
   "extends";
-  "external";
   "false";
   "fetch";
   "final";
   "finally";
-  "find";
   "float";
-  "focus";
   "for";
-  "frameElement";
-  "frames";
   "function";
-  "getComputedStyle";
-  "getSelection";
   "global";
-  "globalThis";
   "goto";
-  "history";
   "if";
   "implements";
   "import";
   "in";
-  "indexedDB";
-  "innerHeight";
-  "innerWidth";
   "instanceof";
   "int";
   "interface";
   "isFinite";
   "isNaN";
-  "isSecureContext";
-  "length";
   "let";
-  "localStorage";
   "location";
-  "locationbar";
   "long";
-  "matchMedia";
-  "menubar";
   "module";
-  "moveBy";
-  "moveTo";
-  "name";
   "native";
   "navigator";
   "new";
   "null";
-  "offscreenBuffering";
-  "onabort";
-  "onafterprint";
-  "onanimationend";
-  "onanimationiteration";
-  "onanimationstart";
-  "onappinstalled";
-  "onauxclick";
-  "onbeforeinstallprompt";
-  "onbeforeprint";
-  "onbeforeunload";
-  "onblur";
-  "oncancel";
-  "oncanplay";
-  "oncanplaythrough";
-  "onchange";
-  "onclick";
-  "onclose";
-  "oncontextmenu";
-  "oncuechange";
-  "ondblclick";
-  "ondevicemotion";
-  "ondeviceorientation";
-  "ondeviceorientationabsolute";
-  "ondrag";
-  "ondragend";
-  "ondragenter";
-  "ondragleave";
-  "ondragover";
-  "ondragstart";
-  "ondrop";
-  "ondurationchange";
-  "onemptied";
-  "onended";
-  "onerror";
-  "onfocus";
-  "ongotpointercapture";
-  "onhashchange";
-  "oninput";
-  "oninvalid";
-  "onkeydown";
-  "onkeypress";
-  "onkeyup";
-  "onlanguagechange";
-  "onload";
-  "onloadeddata";
-  "onloadedmetadata";
-  "onloadstart";
-  "onlostpointercapture";
-  "onmessage";
-  "onmessageerror";
-  "onmousedown";
-  "onmouseenter";
-  "onmouseleave";
-  "onmousemove";
-  "onmouseout";
-  "onmouseover";
-  "onmouseup";
-  "onmousewheel";
-  "onoffline";
-  "ononline";
-  "onpagehide";
-  "onpageshow";
-  "onpause";
-  "onplay";
-  "onplaying";
-  "onpointercancel";
-  "onpointerdown";
-  "onpointerenter";
-  "onpointerleave";
-  "onpointermove";
-  "onpointerout";
-  "onpointerover";
-  "onpointerup";
-  "onpopstate";
-  "onprogress";
-  "onratechange";
-  "onrejectionhandled";
-  "onreset";
-  "onresize";
-  "onscroll";
-  "onsearch";
-  "onseeked";
-  "onseeking";
-  "onselect";
-  "onselectionchange";
-  "onselectstart";
-  "onstalled";
-  "onstorage";
-  "onsubmit";
-  "onsuspend";
-  "ontimeupdate";
-  "ontoggle";
-  "ontransitionend";
-  "onunhandledrejection";
-  "onunload";
-  "onvolumechange";
-  "onwaiting";
-  "onwebkitanimationend";
-  "onwebkitanimationiteration";
-  "onwebkitanimationstart";
-  "onwebkittransitionend";
-  "onwheel";
-  "open";
-  "openDatabase";
-  "opener";
-  "origin";
-  "outerHeight";
-  "outerWidth";
   "package";
-  "pageXOffset";
-  "pageYOffset";
-  "parent";
   "parseFloat";
   "parseInt";
-  "performance";
-  "personalbar";
-  "postMessage";
-  "print";
   "private";
   "process";
-  "prompt";
   "protected";
   "public";
-  "queueMicrotask";
-  "releaseEvents";
-  "requestAnimationFrame";
-  "requestIdleCallback";
   "require";
-  "resizeBy";
-  "resizeTo";
   "return";
-  "screen";
-  "screenLeft";
-  "screenTop";
-  "screenX";
-  "screenY";
-  "scroll";
-  "scrollBy";
-  "scrollTo";
-  "scrollX";
-  "scrollY";
-  "scrollbars";
-  "self";
-  "sessionStorage";
   "setImmediate";
   "setInterval";
   "setTimeout";
   "short";
-  "speechSynthesis";
   "static";
-  "status";
-  "statusbar";
-  "stop";
-  "styleMedia";
   "super";
   "switch";
   "synchronized";
   "then";
   "this";
   "throw";
-  "toolbar";
-  "top";
   "transient";
   "true";
   "try";
   "typeof";
   "undefined";
   "unescape";
   "var";
-  "visualViewport";
   "void";
   "volatile";
-  "webkitCancelAnimationFrame";
-  "webkitMediaStream";
-  "webkitRTCPeerConnection";
-  "webkitRequestAnimationFrame";
-  "webkitRequestFileSystem";
-  "webkitResolveLocalFileSystemURL";
-  "webkitSpeechGrammar";
-  "webkitSpeechGrammarList";
-  "webkitSpeechRecognition";
-  "webkitSpeechRecognitionError";
-  "webkitSpeechRecognitionEvent";
-  "webkitStorageInfo";
-  "webkitURL";
   "while";
   "window";
   "with";

jscomp/build_reserved.js

@@ -9,6 +9,6 @@ var puppeteer = require('puppeteer');
      * @type string[]
      */
     const result = await page.evaluate(`Object.getOwnPropertyNames(window)`)
-    fs.writeFileSync('keywords.list',result.join('\n'),'utf8')
+    fs.writeFileSync('keywords.list',result.filter(x=>/^[A-Z]/.test(x)).join('\n'),'utf8')
     await browser.close()
 }())

jscomp/build_sorted.ml

@@ -106,7 +106,7 @@
     "encodeURIComponent";
     "escape";
     "unescape";
-
+    "fetch";
     "isNaN";
     "parseFloat";
     "parseInt";
@@ -209,20 +209,25 @@ let binarySearch (sorted : element array) (key : element)  : bool =
 
 let is_reserved s = binarySearch sorted_keywords s     
 |}
-let main () =   
-  let ss = get_predefined_words "keywords.list" in 
+let main keyword_file output_file =   
+  let ss = get_predefined_words keyword_file in 
   let ss = fill_extra ss in 
   let keywords_array = 
     (SSet.fold 
       (fun s acc -> acc ^ "\"" ^ s ^ "\";\n  "
       ) ss "let sorted_keywords = [|\n  ") ^ "|]\n" 
   in 
-  let oc = open_out_bin "ext/js_reserved_map.ml" in 
+  let oc = open_out_bin output_file in 
   output_string oc license ; 
   output_string oc  keywords_array;
   output_string oc binary_search;
   close_out oc 
-
-let () = main ()
+(*   
+;;
+for i = 0 to Array.length Sys.argv - 1  do 
+  print_endline ">"; print_string Sys.argv.(i)
+done 
+;; *)
+let () = main Sys.argv.(1) "ext/js_reserved_map.ml"
 
 

jscomp/compiler.ninja

@@ -15,6 +15,12 @@ rule gcc
 build stubs/ext_basic_hash_stubs.o : gcc  stubs/ext_basic_hash_stubs.c   
 rule ocamlmklib
     command = ocamlmklib $in -o $name
+    
+rule mk_keywords    
+    command = ocaml $in 
+    generator = true
+build ext/js_reserved_map.ml: mk_keywords build_sorted.ml keywords.list
+
 build stubs/libbs_hash.a stubs/dllbs_hash.so: ocamlmklib stubs/ext_basic_hash_stubs.o
     name = stubs/bs_hash
 rule stubslib