Fixes #104 (#111)

Author: dunhor

jswinrt/jswinrt/TextWriter.h

@@ -47,6 +47,10 @@ class TextWriter
                 {
                     Write(first);
                 }
+                else if constexpr (std::is_arithmetic_v<First>)
+                {
+                    Write(first);
+                }
                 else
                 {
                     FAIL_FAST();
@@ -100,6 +104,13 @@ class TextWriter
         m_buffer.insert(m_buffer.end(), value.begin(), value.end());
     }
 
+    template <typename T, std::enable_if_t<std::is_arithmetic_v<T>, int> = 0>
+    void Write(T value)
+    {
+        // TODO: Could be more efficient w/ std::to_chars or something similar
+        Write(std::to_string(value));
+    }
+
     void Write(const char value)
     {
         m_buffer.push_back(value);

jswinrt/jswinrt/TypescriptWriter.h

@@ -86,7 +86,22 @@ class TypescriptWriter
                 {
                     continue;
                 };
-                textWriter.WriteIndentedLine("%,"sv, TextWriter::ToCamelCase(std::string(field.Name())));
+
+                textWriter.WriteIndentedLine("% = %,"sv, TextWriter::ToCamelCase(std::string(field.Name())), [&]() {
+                    auto value = field.Constant();
+                    switch (value.Type())
+                    {
+                    case winmd::reader::ConstantType::Int32:
+                        textWriter.Write("%", value.ValueInt32());
+                        break;
+                    case winmd::reader::ConstantType::UInt32:
+                        textWriter.Write("%", value.ValueUInt32());
+                        break;
+                    default:
+                        // Enum values are signed or unsigned 32-bit integers
+                        FAIL_FAST();
+                    }
+                });
             }
             textWriter.ReduceIndent();
             textWriter.WriteIndentedLine();

tests/TestArtifacts/TestComponent.d.ts

@@ -477,10 +477,10 @@ declare namespace TestComponent {
     }
 
     enum TestEnum {
-        first,
-        second,
-        third,
-        fourth,
+        first = 1,
+        second = 2,
+        third = 3,
+        fourth = 4,
     }
 
     class TestObject {

tests/TestArtifacts/Windows.Foundation.Collections.d.ts

@@ -2,10 +2,10 @@
 
 declare namespace Windows.Foundation.Collections {
     enum CollectionChange {
-        reset,
-        itemInserted,
-        itemRemoved,
-        itemChanged,
+        reset = 0,
+        itemInserted = 1,
+        itemRemoved = 2,
+        itemChanged = 3,
     }
 
     interface IIterable<T> {

tests/TestArtifacts/Windows.Foundation.Diagnostics.d.ts

@@ -12,29 +12,29 @@ declare namespace Windows.Foundation.Diagnostics {
     }
 
     enum CausalityRelation {
-        assignDelegate,
-        join,
-        choice,
-        cancel,
-        error,
+        assignDelegate = 0,
+        join = 1,
+        choice = 2,
+        cancel = 3,
+        error = 4,
     }
 
     enum CausalitySource {
-        application,
-        library,
-        system,
+        application = 0,
+        library = 1,
+        system = 2,
     }
 
     enum CausalitySynchronousWork {
-        completionNotification,
-        progressNotification,
-        execution,
+        completionNotification = 0,
+        progressNotification = 1,
+        execution = 2,
     }
 
     enum CausalityTraceLevel {
-        required,
-        important,
-        verbose,
+        required = 0,
+        important = 1,
+        verbose = 2,
     }
 
     class ErrorDetails {
@@ -45,11 +45,11 @@ declare namespace Windows.Foundation.Diagnostics {
     }
 
     enum ErrorOptions {
-        none,
-        suppressExceptions,
-        forceExceptions,
-        useSetErrorInfo,
-        suppressSetErrorInfo,
+        none = 0,
+        suppressExceptions = 1,
+        forceExceptions = 2,
+        useSetErrorInfo = 4,
+        suppressSetErrorInfo = 8,
     }
 
     class FileLoggingSession implements Windows.Foundation.Diagnostics.IFileLoggingSession, Windows.Foundation.IClosable {
@@ -174,25 +174,25 @@ declare namespace Windows.Foundation.Diagnostics {
     }
 
     enum LoggingFieldFormat {
-        default,
-        hidden,
-        string,
-        boolean,
-        hexadecimal,
-        processId,
-        threadId,
-        port,
-        ipv4Address,
-        ipv6Address,
-        socketAddress,
-        xml,
-        json,
-        win32Error,
-        nTStatus,
-        hResult,
-        fileTime,
-        signed,
-        unsigned,
+        default = 0,
+        hidden = 1,
+        string = 2,
+        boolean = 3,
+        hexadecimal = 4,
+        processId = 5,
+        threadId = 6,
+        port = 7,
+        ipv4Address = 8,
+        ipv6Address = 9,
+        socketAddress = 10,
+        xml = 11,
+        json = 12,
+        win32Error = 13,
+        nTStatus = 14,
+        hResult = 15,
+        fileTime = 16,
+        signed = 17,
+        unsigned = 18,
     }
 
     class LoggingFields {
@@ -315,21 +315,21 @@ declare namespace Windows.Foundation.Diagnostics {
     }
 
     enum LoggingLevel {
-        verbose,
-        information,
-        warning,
-        error,
-        critical,
+        verbose = 0,
+        information = 1,
+        warning = 2,
+        error = 3,
+        critical = 4,
     }
 
     enum LoggingOpcode {
-        info,
-        start,
-        stop,
-        reply,
-        resume,
-        suspend,
-        send,
+        info = 0,
+        start = 1,
+        stop = 2,
+        reply = 6,
+        resume = 7,
+        suspend = 8,
+        send = 9,
     }
 
     class LoggingOptions {

tests/TestArtifacts/Windows.Foundation.Metadata.d.ts

@@ -36,19 +36,19 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum AttributeTargets {
-        all,
-        delegate,
-        enum,
-        event,
-        field,
-        interface,
-        method,
-        parameter,
-        property,
-        runtimeClass,
-        struct,
-        interfaceImpl,
-        apiContract,
+        all = 4294967295,
+        delegate = 1,
+        enum = 2,
+        event = 4,
+        field = 8,
+        interface = 16,
+        method = 64,
+        parameter = 128,
+        property = 256,
+        runtimeClass = 512,
+        struct = 1024,
+        interfaceImpl = 2048,
+        apiContract = 8192,
     }
 
     class AttributeUsageAttribute {
@@ -62,8 +62,8 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum CompositionType {
-        protected,
-        public,
+        protected = 1,
+        public = 2,
     }
 
     class ContractVersionAttribute {
@@ -87,8 +87,8 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum DeprecationType {
-        deprecate,
-        remove,
+        deprecate = 0,
+        remove = 1,
     }
 
     class DualApiPartitionAttribute {
@@ -109,16 +109,16 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum FeatureStage {
-        alwaysDisabled,
-        disabledByDefault,
-        enabledByDefault,
-        alwaysEnabled,
+        alwaysDisabled = 0,
+        disabledByDefault = 1,
+        enabledByDefault = 2,
+        alwaysEnabled = 3,
     }
 
     enum GCPressureAmount {
-        low,
-        medium,
-        high,
+        low = 0,
+        medium = 1,
+        high = 2,
     }
 
     class GCPressureAttribute {
@@ -147,10 +147,10 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum MarshalingType {
-        none,
-        agile,
-        standard,
-        invalidMarshaling,
+        none = 1,
+        agile = 2,
+        standard = 3,
+        invalidMarshaling = 0,
     }
 
     class MetadataMarshalAttribute {
@@ -171,8 +171,8 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum Platform {
-        windows,
-        windowsPhone,
+        windows = 0,
+        windowsPhone = 1,
     }
 
     class PlatformAttribute {
@@ -207,10 +207,10 @@ declare namespace Windows.Foundation.Metadata {
     }
 
     enum ThreadingModel {
-        sTA,
-        mTA,
-        both,
-        invalidThreading,
+        sTA = 1,
+        mTA = 2,
+        both = 3,
+        invalidThreading = 0,
     }
 
     class VariantAttribute {