fix(renderFieldsOnly): support --namespace flag.

Author: zernie

src/contentful-typescript-codegen.ts

@@ -63,7 +63,7 @@ async function runCodegen(outputFile: string) {
 
   let output
   if (cli.flags.fieldsOnly) {
-    output = await renderFieldsOnly(contentTypes.items)
+    output = await renderFieldsOnly(contentTypes.items, cli.flags.namespace)
   } else {
     output = await render(contentTypes.items, locales.items, cli.flags.namespace)
   }

src/renderers/contentful/renderNamespace.ts

@@ -0,0 +1,12 @@
+export default function renderNamespace(source: string, namespace: string | null) {
+  if (!namespace) return source
+
+  return `
+    declare namespace ${namespace} {
+    ${source}
+    }
+
+    export as namespace ${namespace}
+    export=${namespace}
+  `
+}

src/renderers/render.ts

@@ -7,6 +7,7 @@ import renderContentType from "./contentful/renderContentType"
 import renderUnion from "./typescript/renderUnion"
 import renderAllLocales from "./contentful/renderAllLocales"
 import renderDefaultLocale from "./contentful/renderDefaultLocale"
+import renderNamespace from "./contentful/renderNamespace"
 
 export default async function render(
   contentTypes: ContentType[],
@@ -16,14 +17,14 @@ export default async function render(
   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 typings = [
+  const typingsSource = [
     renderAllContentTypes(sortedContentTypes),
     renderAllContentTypeIds(sortedContentTypes),
     renderAllLocales(sortedLocales),
     renderDefaultLocale(sortedLocales),
   ].join("\n\n")
 
-  const source = [renderContentfulImports(), wrapInNamespace(typings, namespace)].join("\n\n")
+  const source = [renderContentfulImports(), renderNamespace(typingsSource, namespace)].join("\n\n")
 
   const prettierConfig = await resolveConfig(process.cwd())
   return format(source, { ...prettierConfig, parser: "typescript" })
@@ -37,15 +38,3 @@ function renderAllContentTypeIds(contentTypes: ContentType[]): string {
   return renderUnion("CONTENT_TYPE", contentTypes.map(contentType => `'${contentType.sys.id}'`))
 }
 
-function wrapInNamespace(source: string, namespace: string | null) {
-  if (!namespace) return source
-
-  return `
-    declare namespace ${namespace} {
-    ${source}
-    }
-
-    export as namespace ${namespace}
-    export=${namespace}
-  `
-}

src/renderers/renderFieldsOnly.ts

@@ -3,11 +3,14 @@ import { ContentType } from "contentful"
 import { format, resolveConfig } from "prettier"
 
 import renderContentType from "./contentful-fields-only/renderContentType"
+import renderNamespace from "./contentful/renderNamespace"
 
-export default async function renderFieldsOnly(contentTypes: ContentType[]) {
+export default async function renderFieldsOnly(contentTypes: ContentType[],
+                                               namespace: string | null,) {
   const sortedContentTypes = contentTypes.sort((a, b) => a.sys.id.localeCompare(b.sys.id))
 
-  const source = renderAllContentTypes(sortedContentTypes)
+  const typingsSource = renderAllContentTypes(sortedContentTypes)
+  const source = [renderNamespace(typingsSource, namespace)].join("\n\n")
 
   const prettierConfig = await resolveConfig(process.cwd())
 

test/renderers/renderFieldsOnly.test.ts

@@ -35,7 +35,7 @@ describe("renderFieldsOnly()", () => {
       },
     ]
 
-    expect(await renderFieldsOnly(contentTypes)).toMatchInlineSnapshot(`
+    expect(await renderFieldsOnly(contentTypes, null)).toMatchInlineSnapshot(`
       "export interface IMyContentType {
         fields: {
           /** Array field */
@@ -46,20 +46,20 @@ describe("renderFieldsOnly()", () => {
       "
     `)
 
-    // expect(await renderFieldsOnly(contentTypes, "Codegen")).toMatchInlineSnapshot(`
-    //   "declare namespace Codegen {
-    //     export interface IMyContentType {
-    //       fields: {
-    //         /** Array field */
-    //         arrayField: (\\"one\\" | \\"of\\" | \\"the\\" | \\"above\\")[];
-    //       };
-    //       [otherKeys: string]: any;
-    //     }
-    //   }
-    //
-    //   export as namespace Codegen
-    //   export = Codegen
-    //   "
-    // `)
+    expect(await renderFieldsOnly(contentTypes, "Codegen")).toMatchInlineSnapshot(`
+      "declare namespace Codegen {
+        export interface IMyContentType {
+          fields: {
+            /** Array field */
+            arrayField: (\\"one\\" | \\"of\\" | \\"the\\" | \\"above\\")[]
+          }
+          [otherKeys: string]: any
+        }
+      }
+
+      export as namespace Codegen
+      export = Codegen
+      "
+    `)
   })
 })