fix: typeName -> typename (#11)

frontend/mobile/templates/template.js

@@ -1,80 +1,80 @@
 // Return the corresponding Dart type for an FTL type.
 function dartType(t) {
-    const type = typeName(t);
-    switch (type) {
-      case "String":
-        return "String";
-
-      case "Int":
-        return "int";
-
-      case "Bool":
-        return "bool";
-
-      case "Float":
-        return "double";
-
-      case "Time":
-        return "DateTime";
-
-      case "Map":
-        return `Map<${dartType(t.key)}, ${dartType(t.value)}>`;
-
-      case "Array":
-        return `List<${dartType(t.element)}>`;
-
-      case "VerbRef":
-      case "DataRef":
-        if (context.name === t.module) {
-          return t.name;
-        }
-        return `${t.module}.${t.name}`;
-
-      case "Optional":
-        return dartType(t.type) + "?";
-
-      default:
-        throw new Error(`Unspported FTL type: ${typeName(t)}`);
-    }
+  const type = typename(t);
+  switch (type) {
+    case "String":
+      return "String";
+
+    case "Int":
+      return "int";
+
+    case "Bool":
+      return "bool";
+
+    case "Float":
+      return "double";
+
+    case "Time":
+      return "DateTime";
+
+    case "Map":
+      return `Map<${dartType(t.key)}, ${dartType(t.value)}>`;
+
+    case "Array":
+      return `List<${dartType(t.element)}>`;
+
+    case "VerbRef":
+    case "DataRef":
+      if (context.name === t.module) {
+        return t.name;
+      }
+      return `${t.module}.${t.name}`;
+
+    case "Optional":
+      return dartType(t.type) + "?";
+
+    default:
+      throw new Error(`Unspported FTL type: ${typename(t)}`);
   }
-  
-  function deserialize(t) {
-    switch (typeName(t)) {
-      case "Array":
-        return `v.map((v) => ${deserialize(t.element)}).cast<${dartType(t.element)}>().toList()`;
-
-      case "Map":
-        return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${dartType(t.key)}, ${dartType(t.value)}>()`;
-
-      case "DataRef":
-        return `${dartType(t)}.fromMap(v)`;
-
-      default:
-        return "v";
-    }
+}
+
+function deserialize(t) {
+  switch (typename(t)) {
+    case "Array":
+      return `v.map((v) => ${deserialize(t.element)}).cast<${dartType(t.element)}>().toList()`;
+
+    case "Map":
+      return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${dartType(t.key)}, ${dartType(t.value)}>()`;
+
+    case "DataRef":
+      return `${dartType(t)}.fromMap(v)`;
+
+    default:
+      return "v";
   }
-
-  function serialize(t) {
-    switch (typeName(t)) {
-      case "Array":
-        return `v.map((v) => ${deserialize(t.element)}).cast<${dartType(t.element)}>().toList()`;
-
-      case "Map":
-        return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${dartType(t.key)}, ${dartType(t.value)}>()`;
-
-      case "DataRef":
-        return "v.toMap()";
-
-      default:
-        return "v";
-    }
-  }
-
-  function url(verb) {
-    let path = verb.metadata[0].path;
-    const method = verb.metadata[0].method;
-
-    return path.replace(/{(.*?)}/g, (match, fieldName) => {
-      return '$' + `{request.${fieldName}}`;
-    });
+}
+
+function serialize(t) {
+  switch (typename(t)) {
+    case "Array":
+      return `v.map((v) => ${deserialize(t.element)}).cast<${dartType(t.element)}>().toList()`;
+
+    case "Map":
+      return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${dartType(t.key)}, ${dartType(t.value)}>()`;
+
+    case "DataRef":
+      return "v.toMap()";
+
+    default:
+      return "v";
   }
+}
+
+function url(verb) {
+  let path = verb.metadata[0].path;
+  const method = verb.metadata[0].method;
+
+  return path.replace(/{(.*?)}/g, (match, fieldName) => {
+    return "$" + `{request.${fieldName}}`;
+  });
+}

frontend/mobile/templates/{{ .Name | lower }}.dart

@@ -13,7 +13,7 @@ class {{ .Name | camel }} {
   {{ .Type | dartType }} {{ .Name }};
 {{- end }}
 
-  {{ .Name | camel }}({{ if .Fields }}{ {{ range .Fields }}{{ if not (eq (.Type | typeName) "Optional")}} required{{end}} this.{{ .Name }}, {{ end}} }{{ end }});
+  {{ .Name | camel }}({{ if .Fields }}{ {{ range .Fields }}{{ if not (eq (.Type | typename) "Optional")}} required{{end}} this.{{ .Name }}, {{ end}} }{{ end }});
 
   Map<String, dynamic> toMap() {
     return {
@@ -44,7 +44,7 @@ class {{ .Name | camel }}Client {
 {{ range .Verbs }}
 {{- $verb := . -}}
 {{- range .Metadata }}
-{{ if eq "MetadataIngress" (. | typeName) }}
+{{ if eq "MetadataIngress" (. | typename) }}
   Future<{{ $verb.Response | dartType }}> {{ $verb.Name }}({{ $verb.Request | dartType }} request) async {
     {{ if eq .Method "GET" -}}
     final response = await ftlClient.{{ .Method | lower }}('{{ $verb | url }}', requestJson: request.toJson());

frontend/web/templates/template.js

@@ -1,82 +1,82 @@
 // Return the corresponding Typescript type for an FTL type.
 function tsType(t) {
-    const type = typeName(t);
-    switch (type) {
-      case "String":
-        return "string";
-
-      case "Int":
-        return "number";
-
-      case "Bool":
-        return "bool";
-
-      case "Float":
-        return "double";
-
-      case "Time":
-        return "DateTime";
-
-      case "Map":
-        return `Map<${tsType(t.key)}, ${tsType(t.value)}>`;
-
-      case "Array":
-        return `${tsType(t.element)}[]`;
-
-      case "VerbRef":
-      case "DataRef":
-        if (context.name === t.module) {
-          return t.name;
-        }
-        return `${t.module}.${t.name}`;
-
-      case "Optional":
-        return tsType(t.type) + "?";
-
-      default:
-        throw new Error(`Unspported FTL type: ${typeName(t)}`);
-    }
-  }
-
-  function deserialize(t) {
-    switch (typeName(t)) {
-      case "Array":
-        return `v.map((v) => ${deserialize(t.element)}).cast<${tsType(t.element)}>().toList()`;
-
-      case "Map":
-        return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${tsType(t.key)}, ${tsType(t.value)}>()`;
-
-      case "DataRef":
-        return `${tsType(t)}.fromMap(v)`;
-
-      default:
-        return "v";
-    }
+  const type = typename(t)
+  switch (type) {
+    case 'String':
+      return 'string'
+
+    case 'Int':
+      return 'number'
+
+    case 'Bool':
+      return 'bool'
+
+    case 'Float':
+      return 'double'
+
+    case 'Time':
+      return 'DateTime'
+
+    case 'Map':
+      return `Map<${tsType(t.key)}, ${tsType(t.value)}>`
+
+    case 'Array':
+      return `${tsType(t.element)}[]`
+
+    case 'VerbRef':
+    case 'DataRef':
+      if (context.name === t.module) {
+        return t.name
+      }
+      return `${t.module}.${t.name}`
+
+    case 'Optional':
+      return tsType(t.type) + '?'
+
+    default:
+      throw new Error(`Unspported FTL type: ${typename(t)}`)
   }
-  
-  function serialize(t) {
-    switch (typeName(t)) {
-      case "Array":
-        return `v.map((v) => ${deserialize(t.element)}).cast<${tsType(t.element)}>().toList()`;
-
-      case "Map":
-        return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${tsType(t.key)}, ${tsType(t.value)}>()`;
-
-      case "DataRef":
-        return "v.toMap()";
-
-      default:
-        return "v";
-    }
+}
+
+function deserialize(t) {
+  switch (typename(t)) {
+    case 'Array':
+      return `v.map((v) => ${deserialize(t.element)}).cast<${tsType(t.element)}>().toList()`
+
+    case 'Map':
+      return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${tsType(t.key)}, ${tsType(t.value)}>()`
+
+    case 'DataRef':
+      return `${tsType(t)}.fromMap(v)`
+
+    default:
+      return 'v'
   }
-
-  function url(verb) {
-    let path = verb.metadata[0].path;
-    const method = verb.metadata[0].method;
-
-    path = path.replace(/{(.*?)}/g, (match, fieldName) => {
-      return '$' + `{request.${fieldName}}`;
-    });
-
-    return method !== 'GET' ? path : path + '?@json=${encodeURIComponent(JSON.stringify(request))}';
+}
+
+function serialize(t) {
+  switch (typename(t)) {
+    case 'Array':
+      return `v.map((v) => ${deserialize(t.element)}).cast<${tsType(t.element)}>().toList()`
+
+    case 'Map':
+      return `v.map((k, v) => MapEntry(k, ${deserialize(t.value)})).cast<${tsType(t.key)}, ${tsType(t.value)}>()`
+
+    case 'DataRef':
+      return 'v.toMap()'
+
+    default:
+      return 'v'
   }
+}
+
+function url(verb) {
+  let path = verb.metadata[0].path
+  const method = verb.metadata[0].method
+
+  path = path.replace(/{(.*?)}/g, (match, fieldName) => {
+    return '$' + `{request.${fieldName}}`
+  })
+
+  return method !== 'GET' ? path : path + '?@json=${encodeURIComponent(JSON.stringify(request))}'
+}

frontend/web/templates/{{ .Name | lower }}.ts

@@ -31,7 +31,7 @@ export class {{ .Name | camel }}Client {
 {{- range .Verbs }}
 {{- $verb := . -}}
 {{- range .Metadata }}
-{{ if eq "MetadataIngress" (. | typeName) }}
+{{ if eq "MetadataIngress" (. | typename) }}
   public async {{ $verb.Name | lowerCamel }}(request: {{ $verb.Request | tsType }}): Promise<{{ $verb.Response | tsType }}> {
     const path = `{{ $verb | url }}`;
     {{ if eq .Method "GET" -}}