Change ordering generation interface (#54)

* update generation so fields are generated before methods in interface * fix test to match latest change
jyoo980 · Oct 13, 2019 · 480640c · 480640c
1 parent f021955
commit 480640c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/codegen/TypeScriptEngine.ts b/src/codegen/TypeScriptEngine.ts
@@ -86,7 +86,7 @@ export default class TypeScriptEngine {
         const tsMethodSignatures: TypeElement[] =
             interfaceDecl.functions.map((func: FuncDecl) => this.createMethodSignature(func));
         const tsPropertySignatures: TypeElement[] = this.createTsPropertySignatures(interfaceDecl);
-        const interfaceMembers = tsMethodSignatures.concat(tsPropertySignatures);
+        const interfaceMembers = tsPropertySignatures.concat(tsMethodSignatures);
         const interfaceDeclaration: InterfaceDeclaration = ts.createInterfaceDeclaration(
             /* decorators */ undefined,
             [ts.createModifier(SyntaxKind.ExportKeyword)],

diff --git a/test/TypeScriptEngine.spec.ts b/test/TypeScriptEngine.spec.ts
@@ -313,7 +313,13 @@ describe("TypeScriptEngine tests", () => {
             name,
             /* typeParams */ undefined,
             /* heritageClauses */ undefined,
-            [ts.createMethodSignature(
+            [ts.createPropertySignature(
+                /* modifiers */ undefined,
+                "foo",
+                /* questionToken */ undefined,
+                ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+                /* initializer */ undefined
+            ), ts.createMethodSignature(
                 /* typeParameters */ undefined,
                 [
                     ts.createParameter(
@@ -334,12 +340,6 @@ describe("TypeScriptEngine tests", () => {
                 ts.createTypeReferenceNode("ParameterDecl", undefined),
                 baseFunDecl.name,
                 /* questionToken */ undefined
-            ), ts.createPropertySignature(
-                /* modifiers */ undefined,
-                "foo",
-                /* questionToken */ undefined,
-                ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-                /* initializer */ undefined
             )]
         ));
     });