Prepend underscore when type name starts with digit

Closes: #68
ItemConsulting · Aug 5, 2024 · 31cc9dd · 31cc9dd
1 parent 65c3468
commit 31cc9dd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/main/kotlin/no/item/xp/plugin/renderers/RenderGlobalComponentMap.kt b/src/main/kotlin/no/item/xp/plugin/renderers/RenderGlobalComponentMap.kt
@@ -1,6 +1,6 @@
 package no.item.xp.plugin.renderers
 
-import no.item.xp.plugin.renderers.ts.getInterfaceName
+import no.item.xp.plugin.renderers.ts.getTypeName
 
 fun renderGlobalComponentMap(
   filesNames: List<String>,
@@ -9,15 +9,15 @@ fun renderGlobalComponentMap(
 ): String {
   val importList =
     filesNames.joinToString("\n") { fileName ->
-      """export type ${getInterfaceName(fileName)} = import("./$fileName").${getInterfaceName(fileName)};"""
+      """export type ${getTypeName(fileName)} = import("./$fileName").${getTypeName(fileName)};"""
     } + "\n"
 
   return if (interfaceName == null || appName == null) {
     importList
   } else {
     val fieldList =
       filesNames.joinToString("\n") { fileName ->
-        """    "$appName:$fileName": ${getInterfaceName(fileName)};"""
+        """    "$appName:$fileName": ${getTypeName(fileName)};"""
       }
 
     """

diff --git a/src/main/kotlin/no/item/xp/plugin/renderers/RenderGlobalContentTypeMap.kt b/src/main/kotlin/no/item/xp/plugin/renderers/RenderGlobalContentTypeMap.kt
@@ -1,6 +1,6 @@
 package no.item.xp.plugin.renderers
 
-import no.item.xp.plugin.renderers.ts.getInterfaceName
+import no.item.xp.plugin.renderers.ts.getTypeName
 import java.io.File
 
 fun renderGlobalContentTypeMap(
@@ -9,13 +9,13 @@ fun renderGlobalContentTypeMap(
 ): String {
   val importList =
     files.joinToString("\n") {
-      """export type ${getInterfaceName(
+      """export type ${getTypeName(
         it.nameWithoutExtension,
-      )} = import("./${it.nameWithoutExtension}").${getInterfaceName(it.nameWithoutExtension)};"""
+      )} = import("./${it.nameWithoutExtension}").${getTypeName(it.nameWithoutExtension)};"""
     }
   val fieldList =
     files.joinToString("\n") {
-      """      "$appName:${it.nameWithoutExtension}": ${getInterfaceName(it.nameWithoutExtension)};"""
+      """      "$appName:${it.nameWithoutExtension}": ${getTypeName(it.nameWithoutExtension)};"""
     }
 
   return if (appName == null) {

diff --git a/src/main/kotlin/no/item/xp/plugin/renderers/RenderGlobalXDataMap.kt b/src/main/kotlin/no/item/xp/plugin/renderers/RenderGlobalXDataMap.kt
@@ -1,18 +1,18 @@
 package no.item.xp.plugin.renderers
 
-import no.item.xp.plugin.renderers.ts.getInterfaceName
+import no.item.xp.plugin.renderers.ts.getTypeName
 
 fun renderGlobalXDataMap(
   fileNames: List<String>,
   appName: String?,
 ): String {
   val importList =
     fileNames.joinToString("\n") { fileName ->
-      """export type ${getInterfaceName(fileName)} = import("./$fileName").${getInterfaceName(fileName)}"""
+      """export type ${getTypeName(fileName)} = import("./$fileName").${getTypeName(fileName)}"""
     }
   val fieldList =
     fileNames.joinToString("\n") { fileName ->
-      """      ${escapeFieldName(fileName)}?: ${getInterfaceName(fileName)};"""
+      """      ${escapeFieldName(fileName)}?: ${getTypeName(fileName)};"""
     }
 
   return if (appName == null) {

diff --git a/src/main/kotlin/no/item/xp/plugin/renderers/ts/RenderTypeModelAsTypeScript.kt b/src/main/kotlin/no/item/xp/plugin/renderers/ts/RenderTypeModelAsTypeScript.kt
@@ -6,7 +6,7 @@ fun renderTypeModelAsTypeScript(model: ObjectTypeModel): String {
   val fieldList = model.fields.joinToString("\n\n") { renderInterfaceModelField(it, 1) }
 
   return """
-    #export type ${getInterfaceName(model.nameWithoutExtension)} = {
+    #export type ${getTypeName(model.nameWithoutExtension)} = {
     #$fieldList
     #};
     #""".trimMargin("#")

diff --git a/src/main/kotlin/no/item/xp/plugin/renderers/ts/TSRenderUtils.kt b/src/main/kotlin/no/item/xp/plugin/renderers/ts/TSRenderUtils.kt
@@ -43,7 +43,11 @@ fun renderComment(
   }
 }
 
-fun getInterfaceName(nameWithoutExtension: String): String {
+fun getTypeName(nameWithoutExtension: String): String {
+  if (nameWithoutExtension.first().isDigit()) {
+    return getTypeName("_$nameWithoutExtension")
+  }
+
   return nameWithoutExtension
     .split(".")[0]
     .split("-")
@@ -53,4 +57,4 @@ fun getInterfaceName(nameWithoutExtension: String): String {
 fun getTypeName(
   nameWithoutExtension: String,
   appName: String,
-): String = """${appName.replace(".", "_")}_${getInterfaceName(nameWithoutExtension)}_Data"""
+): String = """${appName.replace(".", "_")}_${getTypeName(nameWithoutExtension)}_Data"""