From 440be31207d88801b863e5d654e695f43f043335 Mon Sep 17 00:00:00 2001 From: zernie Date: Thu, 26 Mar 2020 12:23:47 +0300 Subject: [PATCH 1/5] [fix] export unions Unions should be exported along with interfaces --- src/renderers/typescript/renderUnion.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderers/typescript/renderUnion.ts b/src/renderers/typescript/renderUnion.ts index c49749be..aca4f91e 100644 --- a/src/renderers/typescript/renderUnion.ts +++ b/src/renderers/typescript/renderUnion.ts @@ -1,6 +1,6 @@ export default function renderUnion(name: string, values: string[]): string { return ` - type ${name} = ${renderUnionValues(values)}; + export type ${name} = ${renderUnionValues(values)}; ` } From 118ad32e7fb744352e5d919884626ce1a90fbacd Mon Sep 17 00:00:00 2001 From: zernie Date: Thu, 26 Mar 2020 16:06:59 +0300 Subject: [PATCH 2/5] test(render): fix tests --- test/renderers/render.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/renderers/render.test.ts b/test/renderers/render.test.ts index 0737832e..7ca387eb 100644 --- a/test/renderers/render.test.ts +++ b/test/renderers/render.test.ts @@ -80,11 +80,11 @@ describe("render()", () => { } } - type CONTENT_TYPE = \\"myContentType\\" + export type CONTENT_TYPE = \\"myContentType\\" - type LOCALE_CODE = \\"en-US\\" | \\"pt-BR\\" + export type LOCALE_CODE = \\"en-US\\" | \\"pt-BR\\" - type CONTENTFUL_DEFAULT_LOCALE_CODE = \\"en-US\\" + export type CONTENTFUL_DEFAULT_LOCALE_CODE = \\"en-US\\" " `) }) From 7ba1433196bb0a58ed2323ffa63f884bbdd953ae Mon Sep 17 00:00:00 2001 From: zernie Date: Thu, 26 Mar 2020 16:30:23 +0300 Subject: [PATCH 3/5] test(render): fix tests --- test/renderers/contentful/renderAllLocales.test.ts | 2 +- test/renderers/contentful/renderDefaultLocale.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/renderers/contentful/renderAllLocales.test.ts b/test/renderers/contentful/renderAllLocales.test.ts index ef0eaf34..b55f24c0 100644 --- a/test/renderers/contentful/renderAllLocales.test.ts +++ b/test/renderers/contentful/renderAllLocales.test.ts @@ -22,7 +22,7 @@ describe("renderSymbol()", () => { it("works with a list of locales", () => { expect(format(renderAllLocales(locales))).toMatchInlineSnapshot( - `"type LOCALE_CODE = \\"en-US\\" | \\"pt-BR\\";"`, + `"export type LOCALE_CODE = \\"en-US\\" | \\"pt-BR\\";"`, ) }) }) diff --git a/test/renderers/contentful/renderDefaultLocale.test.ts b/test/renderers/contentful/renderDefaultLocale.test.ts index 593052b7..6fa769e1 100644 --- a/test/renderers/contentful/renderDefaultLocale.test.ts +++ b/test/renderers/contentful/renderDefaultLocale.test.ts @@ -22,7 +22,7 @@ describe("renderSymbol()", () => { it("works with a list of locales", () => { expect(format(renderDefaultLocale(locales))).toMatchInlineSnapshot( - `"type CONTENTFUL_DEFAULT_LOCALE_CODE = \\"en-US\\";"`, + `"export type CONTENTFUL_DEFAULT_LOCALE_CODE = \\"en-US\\";"`, ) }) From 44a447c7a753d9457c3bf07a97f712324add9296 Mon Sep 17 00:00:00 2001 From: zernie Date: Thu, 26 Mar 2020 16:54:56 +0300 Subject: [PATCH 4/5] fix(render): fix renderDefaultLocale --- src/renderers/contentful/renderDefaultLocale.ts | 2 +- test/renderers/typescript/renderUnion.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderers/contentful/renderDefaultLocale.ts b/src/renderers/contentful/renderDefaultLocale.ts index b33346c0..568769d9 100644 --- a/src/renderers/contentful/renderDefaultLocale.ts +++ b/src/renderers/contentful/renderDefaultLocale.ts @@ -7,5 +7,5 @@ export default function renderDefaultLocale(locales: Locale[]): string { throw new Error("Could not find a default locale in Contentful.") } - return `type CONTENTFUL_DEFAULT_LOCALE_CODE = '${defaultLocale.code}';` + return `export type CONTENTFUL_DEFAULT_LOCALE_CODE = '${defaultLocale.code}';` } diff --git a/test/renderers/typescript/renderUnion.test.ts b/test/renderers/typescript/renderUnion.test.ts index 9fae7ade..2f8af284 100644 --- a/test/renderers/typescript/renderUnion.test.ts +++ b/test/renderers/typescript/renderUnion.test.ts @@ -4,7 +4,7 @@ import format from "../../support/format" describe("renderUnion()", () => { it("renders a union", () => { expect(format(renderUnion("name", ["1", "2", "3"]))).toMatchInlineSnapshot( - `"type name = 1 | 2 | 3;"`, + `"export type name = 1 | 2 | 3;"`, ) }) }) From e65011eab78121dd9c568c7267cff4f56fc4eb37 Mon Sep 17 00:00:00 2001 From: Steven Petryk Date: Mon, 30 Mar 2020 19:13:43 -0700 Subject: [PATCH 5/5] ci rebuild