diff --git a/src/Luban.Common/Source/Utils/TypeUtil.cs b/src/Luban.Common/Source/Utils/TypeUtil.cs
index 325f46b..6a24e7e 100644
--- a/src/Luban.Common/Source/Utils/TypeUtil.cs
+++ b/src/Luban.Common/Source/Utils/TypeUtil.cs
@@ -39,11 +39,19 @@ namespace Luban.Common.Utils
 
         public static string MakeCppNamespaceBegin(string module)
         {
+            if (string.IsNullOrEmpty(module))
+            {
+                return "";
+            }
             return string.Join("", module.Split('.').Select(n => $"namespace {n} {{"));
         }
 
         public static string MakeCppNamespaceEnd(string module)
         {
+            if (string.IsNullOrEmpty(module))
+            {
+                return "";
+            }
             return string.Join("", module.Split('.').Select(n => $"}}"));
         }
 
@@ -59,9 +67,22 @@ namespace Luban.Common.Utils
 
         public static string MakeTypescriptNamespaceBegin(string module)
         {
+            if (string.IsNullOrEmpty(module))
+            {
+                return "";
+            }
             return string.Join("", module.Split('.').Select(n => $"export namespace {n} {{"));
         }
 
+        public static string MakeTypescriptNamespaceEnd(string module)
+        {
+            if (string.IsNullOrEmpty(module))
+            {
+                return "";
+            }
+            return MakeCppNamespaceEnd(module);
+        }
+
         public static string MakeFullName(string module, string name)
         {
             if (string.IsNullOrEmpty(module))
@@ -83,6 +104,10 @@ namespace Luban.Common.Utils
 
         public static string MakeGoNamespace(string module)
         {
+            if (string.IsNullOrEmpty(module))
+            {
+                return "";
+            }
             return string.Join("", module.Split('.').Where(s => !string.IsNullOrWhiteSpace(s)).Select(s => UpperCaseFirstChar(s)));
         }
 
@@ -146,6 +171,7 @@ namespace Luban.Common.Utils
             "const",
             "is",
             "as",
+            "of",
             "typeid",
             "typeof",
             "object",
@@ -154,6 +180,7 @@ namespace Luban.Common.Utils
             "in",
             "os",
             "sb",
+            "if",
             "ele",
             "new",
             "friend",
diff --git a/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs b/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs
index a19316c..1cefe39 100644
--- a/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs
+++ b/src/Luban.Job.Common/Source/Defs/DefTypeBase.cs
@@ -35,7 +35,7 @@ namespace Luban.Job.Common.Defs
 
         public string TypescriptNamespaceBegin => TypeUtil.MakeTypescriptNamespaceBegin(Namespace);
 
-        public string TypescriptNamespaceEnd => TypeUtil.MakeCppNamespaceEnd(Namespace);
+        public string TypescriptNamespaceEnd => TypeUtil.MakeTypescriptNamespaceEnd(Namespace);
 
         public string CppFullName => TypeUtil.MakeCppFullName(Namespace, Name);