typescript: Fix invalid identifier names in functions and interfaces

gjsify · Feb 27, 2024 · 78a5a87 · 78a5a87
1 parent 6f71161
commit 78a5a87
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/packages/generator-typescript/src/type-definition-generator.ts b/packages/generator-typescript/src/type-definition-generator.ts
@@ -684,6 +684,11 @@ class ModuleGenerator extends FormatGenerator<string[]> {
             }
         }
 
+        // TODO: Check if this is necessary anywhere else...
+        if (isInvalid(name) && !isGlobal) {
+            name = `["${name}"]`
+        }
+
         const inParamsDef: string[] = this.generateInParameters(inParams)
 
         def.push(
@@ -692,7 +697,7 @@ class ModuleGenerator extends FormatGenerator<string[]> {
             )})${retSep} ${returnType}`,
         )
 
-        // Add overloaded methods
+        // TODO: Add overloaded methods
         // if (overloads && tsFunction.overloads.length > 0) {
         //     def.push(...this.addInfoComment(`Overloads of ${name}`, indentCount))
         //     for (const func of tsFunction.overloads) {

diff --git a/packages/lib/src/gir.ts b/packages/lib/src/gir.ts
@@ -3,6 +3,8 @@ import { IntrospectedProperty, IntrospectedField } from './gir/property.js'
 import { GenerationOptions } from './types.js'
 import { sanitizeIdentifierName } from './gir/util.js'
 
+export { sanitizeMemberName, isInvalid } from './gir/util.js'
+
 export {
     IntrospectedBase,
     Options as IntrospectedOptions,
@@ -57,6 +59,14 @@ export class TypeIdentifier extends TypeExpression {
         return type
     }
 
+    /**
+     * TODO: gi.ts didn't deal with sanitizing types but probably should have to avoid
+     * invalid names such as "3gppProfile"
+     */
+    sanitize() {
+        return new TypeIdentifier(sanitizeIdentifierName(this.namespace, this.name), this.namespace)
+    }
+
     protected _resolve(namespace: IntrospectedNamespace, options: GenerationOptions): TypeIdentifier | null {
         const name: string = sanitizeIdentifierName(null, this.name)
         const ns_name = this.namespace

diff --git a/packages/lib/src/gir/util.ts b/packages/lib/src/gir/util.ts
@@ -412,14 +412,14 @@ export function parseTypeExpression(modName: string, type: string): TypeExpressi
     const baseType = parseTypeString(type);
 
     if (baseType.namespace) {
-        return new TypeIdentifier(baseType.name, baseType.namespace);
+        return new TypeIdentifier(baseType.name, baseType.namespace).sanitize();
     } else {
         const primitiveType = resolvePrimitiveType(baseType.name);
 
         if (primitiveType !== null) {
             return primitiveType;
         } else {
-            return new TypeIdentifier(baseType.name, modName);
+            return new TypeIdentifier(baseType.name, modName).sanitize();
         }
     }
 }