Fix #161: naming collisions with message named Object

CHANGELOG.md

@@ -1,5 +1,9 @@
 ### unreleased changes
 
+Bug fixes:
+
+- Naming collisions with message named Object #161
+
 
 ### v2.0.5
 

packages/plugin/src/code-gen/local-type-name.ts

@@ -2,8 +2,11 @@ import {AnyTypeDescriptorProto, FileDescriptorProto, IDescriptorTree} from "@pro
 import {assert} from "@protobuf-ts/runtime";
 
 
+// TODO in generated code, use globalThis for all types in global scope
+//      rationale: keywords are much less likely to change than objects in the global scope
+// TODO move all code creating names into one place (see interpreter.ts for more code)
 const reservedKeywords = 'break,case,catch,class,const,continue,debugger,default,delete,do,else,enum,export,extends,false,finally,for,function,if,import,in,instanceof,new,null,return,super,switch,this,throw,true,try,typeof,var,void,while,with,as,implements,interface,let,package,private,protected,public,static,yield,any,boolean,constructor,declare,get,module,require,number,set,string,symbol,type,from,of'.split(',');
-const reservedTypeNames = 'Long,Uint8Array,array,Array,string,String,number,Number,boolean,Boolean,bigint,BigInt'.split(',');
+const reservedTypeNames = 'object,Uint8Array,array,Array,string,String,number,Number,boolean,Boolean,bigint,BigInt'.split(',');
 const escapeCharacter = '$';
 
 

packages/plugin/src/message-type-extensions/create.ts

@@ -95,7 +95,10 @@ export class Create implements CustomMethodGenerator {
 
         return ts.createExpressionStatement(ts.createCall(
             ts.createPropertyAccess(
-                ts.createIdentifier("Object"),
+                ts.createPropertyAccess(
+                    ts.createIdentifier("globalThis"),
+                    ts.createIdentifier("Object")
+                ),
                 ts.createIdentifier("defineProperty")
             ),
             undefined,

packages/test-fixtures/name-clash.proto

@@ -54,6 +54,44 @@ message Error {
     string field_name = 1;
     string message = 2;
 }
+// clash with global type
+message Object {
+}
+message object {
+}
+// clash with global type
+message Uint8Array {
+}
+// clash with global type
+message array {
+}
+// clash with global type
+message Array {
+}
+// clash with global type
+message string {
+}
+// clash with global type
+message String {
+}
+// clash with global type
+message number {
+}
+// clash with global type
+message Number {
+}
+// clash with global type
+message boolean {
+}
+// clash with global type
+message Boolean {
+}
+// clash with global type
+message bigint {
+}
+// clash with global type
+message BigInt {
+}
 
 
 message ClashParent {