fix(render): move imports

Author: zernie

src/contentful-typescript-codegen.ts

@@ -48,7 +48,7 @@ const cli = meow(
         type: "string",
         alias: "n",
         required: false,
-      }
+      },
     },
   },
 )

src/renderers/render.ts

@@ -8,17 +8,22 @@ import renderUnion from "./typescript/renderUnion"
 import renderAllLocales from "./contentful/renderAllLocales"
 import renderDefaultLocale from "./contentful/renderDefaultLocale"
 
-export default async function render(contentTypes: ContentType[], locales: Locale[], namespace: string | null) {
+export default async function render(
+  contentTypes: ContentType[],
+  locales: Locale[],
+  namespace: string | null,
+) {
   const sortedContentTypes = contentTypes.sort((a, b) => a.sys.id.localeCompare(b.sys.id))
   const sortedLocales = locales.sort((a, b) => a.code.localeCompare(b.code))
 
-  const source = wrapInNamespace([
-    renderContentfulImports(),
+  const typings = [
     renderAllContentTypes(sortedContentTypes),
     renderAllContentTypeIds(sortedContentTypes),
     renderAllLocales(sortedLocales),
     renderDefaultLocale(sortedLocales),
-  ].join("\n\n"), namespace)
+  ].join("\n\n")
+
+  const source = [renderContentfulImports(), wrapInNamespace(typings, namespace)].join("\n\n")
 
   const prettierConfig = await resolveConfig(process.cwd())
   return format(source, { ...prettierConfig, parser: "typescript" })

test/renderers/render.test.ts

@@ -89,12 +89,12 @@ describe("render()", () => {
     `)
 
     expect(await render(contentTypes, locales, "Codegen")).toMatchInlineSnapshot(`
-      "declare namespace Codegen {
-        // THIS FILE IS AUTOMATICALLY GENERATED. DO NOT MODIFY IT.
+      "// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT MODIFY IT.
 
-        import { Asset, Entry } from \\"contentful\\"
-        import { Document } from \\"@contentful/rich-text-types\\"
+      import { Asset, Entry } from \\"contentful\\"
+      import { Document } from \\"@contentful/rich-text-types\\"
 
+      declare namespace Codegen {
         export interface IMyContentTypeFields {
           /** Array field */
           arrayField: (\\"one\\" | \\"of\\" | \\"the\\" | \\"above\\")[]
@@ -117,11 +117,11 @@ describe("render()", () => {
           }
         }
 
-        export type CONTENT_TYPE = \\"myContentType\\"
+        type CONTENT_TYPE = \\"myContentType\\"
 
-        export type LOCALE_CODE = \\"en-US\\" | \\"pt-BR\\"
+        type LOCALE_CODE = \\"en-US\\" | \\"pt-BR\\"
 
-        export type CONTENTFUL_DEFAULT_LOCALE_CODE = \\"en-US\\"
+        type CONTENTFUL_DEFAULT_LOCALE_CODE = \\"en-US\\"
       }
 
       export as namespace Codegen