additionalProperties interpolation, primitive enums (#266)

* support refs and non-primitive types in additionalProperties

* fix tests, prettier

* dont convert enum numbers to string

* prettier

* update tests

* boolean enums

* fix test

* fix tests again

Author: skh-

examples/stripe-openapi2.ts

@@ -678,83 +678,83 @@ export interface definitions {
       | "unapplied_from_invoice"
       | "unspent_receiver_credit";
   };
-  deleted_account: { deleted: "true"; id: string; object: "account" };
+  deleted_account: { deleted: true; id: string; object: "account" };
   deleted_alipay_account: {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "alipay_account";
   };
   deleted_apple_pay_domain: {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "apple_pay_domain";
   };
   deleted_bank_account: {
     currency?: string;
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "bank_account";
   };
   deleted_bitcoin_receiver: {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "bitcoin_receiver";
   };
   deleted_card: {
     currency?: string;
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "card";
   };
-  deleted_coupon: { deleted: "true"; id: string; object: "coupon" };
-  deleted_customer: { deleted: "true"; id: string; object: "customer" };
-  deleted_discount: { deleted: "true"; object: "discount" };
+  deleted_coupon: { deleted: true; id: string; object: "coupon" };
+  deleted_customer: { deleted: true; id: string; object: "customer" };
+  deleted_discount: { deleted: true; object: "discount" };
   deleted_external_account: {
     currency?: string;
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "bank_account";
   };
-  deleted_invoice: { deleted: "true"; id: string; object: "invoice" };
-  deleted_invoiceitem: { deleted: "true"; id: string; object: "invoiceitem" };
+  deleted_invoice: { deleted: true; id: string; object: "invoice" };
+  deleted_invoiceitem: { deleted: true; id: string; object: "invoiceitem" };
   deleted_payment_source: {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "alipay_account";
   };
-  deleted_person: { deleted: "true"; id: string; object: "person" };
-  deleted_plan: { deleted: "true"; id: string; object: "plan" };
-  deleted_product: { deleted: "true"; id: string; object: "product" };
+  deleted_person: { deleted: true; id: string; object: "person" };
+  deleted_plan: { deleted: true; id: string; object: "plan" };
+  deleted_product: { deleted: true; id: string; object: "product" };
   "deleted_radar.value_list": {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "radar.value_list";
   };
   "deleted_radar.value_list_item": {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "radar.value_list_item";
   };
-  deleted_recipient: { deleted: "true"; id: string; object: "recipient" };
-  deleted_sku: { deleted: "true"; id: string; object: "sku" };
+  deleted_recipient: { deleted: true; id: string; object: "recipient" };
+  deleted_sku: { deleted: true; id: string; object: "sku" };
   deleted_subscription_item: {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "subscription_item";
   };
-  deleted_tax_id: { deleted: "true"; id: string; object: "tax_id" };
+  deleted_tax_id: { deleted: true; id: string; object: "tax_id" };
   "deleted_terminal.location": {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "terminal.location";
   };
   "deleted_terminal.reader": {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "terminal.reader";
   };
   deleted_webhook_endpoint: {
-    deleted: "true";
+    deleted: true;
     id: string;
     object: "webhook_endpoint";
   };

examples/stripe-openapi3.ts

@@ -737,82 +737,82 @@ export interface components {
         | "unapplied_from_invoice"
         | "unspent_receiver_credit";
     };
-    deleted_account: { deleted: "true"; id: string; object: "account" };
+    deleted_account: { deleted: true; id: string; object: "account" };
     deleted_alipay_account: {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "alipay_account";
     };
     deleted_apple_pay_domain: {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "apple_pay_domain";
     };
     deleted_bank_account: {
       currency?: string;
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "bank_account";
     };
     deleted_bitcoin_receiver: {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "bitcoin_receiver";
     };
     deleted_card: {
       currency?: string;
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "card";
     };
-    deleted_coupon: { deleted: "true"; id: string; object: "coupon" };
-    deleted_customer: { deleted: "true"; id: string; object: "customer" };
-    deleted_discount: { deleted: "true"; object: "discount" };
+    deleted_coupon: { deleted: true; id: string; object: "coupon" };
+    deleted_customer: { deleted: true; id: string; object: "customer" };
+    deleted_discount: { deleted: true; object: "discount" };
     deleted_external_account: Partial<
       components["schemas"]["deleted_bank_account"]
     > &
       Partial<components["schemas"]["deleted_card"]>;
-    deleted_invoice: { deleted: "true"; id: string; object: "invoice" };
-    deleted_invoiceitem: { deleted: "true"; id: string; object: "invoiceitem" };
+    deleted_invoice: { deleted: true; id: string; object: "invoice" };
+    deleted_invoiceitem: { deleted: true; id: string; object: "invoiceitem" };
     deleted_payment_source: Partial<
       components["schemas"]["deleted_alipay_account"]
     > &
       Partial<components["schemas"]["deleted_bank_account"]> &
       Partial<components["schemas"]["deleted_bitcoin_receiver"]> &
       Partial<components["schemas"]["deleted_card"]>;
-    deleted_person: { deleted: "true"; id: string; object: "person" };
-    deleted_plan: { deleted: "true"; id: string; object: "plan" };
-    deleted_product: { deleted: "true"; id: string; object: "product" };
+    deleted_person: { deleted: true; id: string; object: "person" };
+    deleted_plan: { deleted: true; id: string; object: "plan" };
+    deleted_product: { deleted: true; id: string; object: "product" };
     "deleted_radar.value_list": {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "radar.value_list";
     };
     "deleted_radar.value_list_item": {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "radar.value_list_item";
     };
-    deleted_recipient: { deleted: "true"; id: string; object: "recipient" };
-    deleted_sku: { deleted: "true"; id: string; object: "sku" };
+    deleted_recipient: { deleted: true; id: string; object: "recipient" };
+    deleted_sku: { deleted: true; id: string; object: "sku" };
     deleted_subscription_item: {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "subscription_item";
     };
-    deleted_tax_id: { deleted: "true"; id: string; object: "tax_id" };
+    deleted_tax_id: { deleted: true; id: string; object: "tax_id" };
     "deleted_terminal.location": {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "terminal.location";
     };
     "deleted_terminal.reader": {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "terminal.reader";
     };
     deleted_webhook_endpoint: {
-      deleted: "true";
+      deleted: true;
       id: string;
       object: "webhook_endpoint";
     };

src/v2.ts

@@ -55,7 +55,13 @@ export default function generateTypesV2(
         return nodeType(node) || "any";
       }
       case "enum": {
-        return tsUnionOf((node.enum as string[]).map((item) => `'${item}'`));
+        return tsUnionOf(
+          (node.enum as string[]).map((item) =>
+            typeof item === "number" || typeof item === "boolean"
+              ? item
+              : `'${item}'`
+          )
+        );
       }
       case "object": {
         if (

src/v3.ts

@@ -49,7 +49,13 @@ export default function generateTypesV3(
         return nodeType(node) || "any";
       }
       case "enum": {
-        return tsUnionOf((node.enum as string[]).map((item) => `'${item}'`));
+        return tsUnionOf(
+          (node.enum as string[]).map((item) =>
+            typeof item === "number" || typeof item === "boolean"
+              ? item
+              : `'${item}'`
+          )
+        );
       }
       case "oneOf": {
         return tsUnionOf((node.oneOf as any[]).map(transform));
@@ -74,7 +80,9 @@ export default function generateTypesV3(
         // if additional properties, add to end of properties
         if (node.additionalProperties) {
           properties += `[key: string]: ${
-            nodeType(node.additionalProperties) || "any"
+            node.additionalProperties === true
+              ? "any"
+              : transform(node.additionalProperties) || "any"
           };\n`;
         }
 

tests/v2/expected/http.ts

@@ -32,7 +32,7 @@ export interface definitions {
     body: definitions["ExpandedPlanBody"];
     id: definitions["ID"];
     type: "plan";
-    version: "1";
+    version: 1;
   };
   ExpandedPlanBody: definitions["PlanBody"] & {
     /**
@@ -58,7 +58,7 @@ export interface definitions {
     plans?: definitions["ExpandedPlan"][];
     provider: definitions["Provider"];
     type: "product";
-    version: "1";
+    version: 1;
   };
   /**
    * Optional container for additional details relating to numeric features.
@@ -239,7 +239,7 @@ export interface definitions {
     body: definitions["PlanBody"];
     id: definitions["ID"];
     type: "plan";
-    version: "1";
+    version: 1;
   };
   PlanBody: {
     /**
@@ -304,7 +304,7 @@ export interface definitions {
     body: definitions["ProductBody"];
     id: definitions["ID"];
     type: "product";
-    version: "1";
+    version: 1;
   };
   ProductBody: {
     billing: {
@@ -446,7 +446,7 @@ export interface definitions {
     body: definitions["ProviderBody"];
     id: definitions["ID"];
     type: "provider";
-    version: "1";
+    version: 1;
   };
   ProviderBody: {
     documentation_url?: string;
@@ -461,7 +461,7 @@ export interface definitions {
     body: definitions["RegionBody"];
     id: definitions["ID"];
     type: "region";
-    version: "1";
+    version: 1;
   };
   RegionBody: {
     location: definitions["Location"];

tests/v2/expected/manifold.ts

@@ -69,7 +69,7 @@ export interface definitions {
   Region: {
     id: definitions["ID"];
     type: "region";
-    version: "1";
+    version: 1;
     body: definitions["RegionBody"];
   };
   CreateRegion: { body: definitions["RegionBody"] };
@@ -94,7 +94,7 @@ export interface definitions {
   };
   Provider: {
     id: definitions["ID"];
-    version: "1";
+    version: 1;
     type: "provider";
     body: definitions["ProviderBody"];
   };
@@ -451,7 +451,7 @@ export interface definitions {
   };
   Product: {
     id: definitions["ID"];
-    version: "1";
+    version: 1;
     type: "product";
     body: definitions["ProductBody"];
   };
@@ -514,13 +514,13 @@ export interface definitions {
   };
   Plan: {
     id: definitions["ID"];
-    version: "1";
+    version: 1;
     type: "plan";
     body: definitions["PlanBody"];
   };
   ExpandedPlan: {
     id: definitions["ID"];
-    version: "1";
+    version: 1;
     type: "plan";
     body: definitions["ExpandedPlanBody"];
   };
@@ -564,7 +564,7 @@ export interface definitions {
   PriceFormula: string;
   ExpandedProduct: {
     id: definitions["ID"];
-    version: "1";
+    version: 1;
     type: "product";
     body: definitions["ProductBody"];
     plans?: definitions["ExpandedPlan"][];