Refactor maps and fix missing .reverse() wrt. nextConfig's wrappersEnd

Author: akd-io

packages/create-next-stack/src/main/plugins/create-next-stack/add-content/pages/generate-app.ts

@@ -5,39 +5,29 @@ import { filterPlugins } from "../../../../setup/setup"
 
 export const generateApp = (inputs: ValidCNSInputs): string => {
   const imports = filterPlugins(inputs)
-    .map((plugin) => {
-      return plugin.slots?.app?.imports
-    })
+    .map((plugin) => plugin.slots?.app?.imports)
     .filter(nonNull)
     .join("\n")
 
   const postImports = filterPlugins(inputs)
-    .map((plugin) => {
-      return plugin.slots?.app?.postImports
-    })
+    .map((plugin) => plugin.slots?.app?.postImports)
     .filter(nonNull)
     .join("\n")
 
   const logic = filterPlugins(inputs)
-    .map((plugin) => {
-      return plugin.slots?.app?.logic
-    })
+    .map((plugin) => plugin.slots?.app?.logic)
     .filter(nonNull)
     .join("\n\n") // Double new line to separate plugin logic
 
   const componentsStart = filterPlugins(inputs)
-    .map((plugin) => {
-      return plugin.slots?.app?.componentsStart
-    })
+    .map((plugin) => plugin.slots?.app?.componentsStart)
     .filter(nonNull)
     .join("\n")
 
   const componentsEnd = filterPlugins(inputs)
-    .map((plugin) => {
-      return plugin.slots?.app?.componentsEnd
-    })
-    .reverse()
+    .map((plugin) => plugin.slots?.app?.componentsEnd)
     .filter(nonNull)
+    .reverse()
     .join("\n")
 
   return endent`

packages/create-next-stack/src/main/plugins/create-next-stack/add-content/templates/LandingPage/generate-LandingPageTemplate.ts

@@ -1,10 +1,13 @@
 import endent from "endent"
 import { ValidCNSInputs } from "../../../../../create-next-stack-types"
 import { getProjectNameOfPath } from "../../../../../helpers/get-project-name-of-path"
+import { nonNull } from "../../../../../helpers/non-null"
 import { filterPlugins } from "../../../../../setup/setup"
 
 export const generateLandingPageTemplate = (inputs: ValidCNSInputs): string => {
-  const todos = filterPlugins(inputs).flatMap((plugin) => plugin.todos ?? [])
+  const todos = filterPlugins(inputs)
+    .flatMap((plugin) => plugin.todos)
+    .filter(nonNull)
   const hasTodos = todos.length > 0
 
   return endent`

packages/create-next-stack/src/main/plugins/create-next-stack/add-next-config/generate-next-config.ts

@@ -29,6 +29,7 @@ export const generateNextConfig = async (
   const wrappersEnd = filterPlugins(inputs)
     .map((plugin) => plugin.slots?.nextConfigJs?.wrappersEnd)
     .filter(nonNull)
+    .reverse()
 
   return endent`
     ${imports}

packages/create-next-stack/src/main/plugins/create-next-stack/add-readme/generate-readme.ts

@@ -1,7 +1,9 @@
 import endent from "endent"
 import { ValidCNSInputs } from "../../../create-next-stack-types"
 import { getProjectNameOfPath } from "../../../helpers/get-project-name-of-path"
+import { nonNull } from "../../../helpers/non-null"
 import { runCommandMap } from "../../../helpers/package-manager-utils"
+import { filterPlugins } from "../../../setup/setup"
 import { getTechnologies } from "../sort-orders/technologies"
 import { generateEnvironmentVariableTableRows } from "./generate-env-table-rows copy"
 import { generateScriptTableRows } from "./generate-script-table-rows"
@@ -12,6 +14,10 @@ export const generateReadme = async (
 ): Promise<string> => {
   const { args, flags } = inputs
 
+  const todos = filterPlugins(inputs)
+    .map((plugin) => plugin.todos)
+    .filter(nonNull)
+
   const runCommand = runCommandMap[flags["package-manager"]]
 
   const technologies = getTechnologies(inputs)

packages/create-next-stack/src/main/plugins/create-next-stack/create-next-stack.ts

@@ -140,11 +140,11 @@ export const createNextStackPlugin = createPlugin({
           ]
         })
 
-        const devDeps = filterPlugins(inputs).flatMap((plugin) => {
-          return plugin.devDependencies != null
+        const devDeps = filterPlugins(inputs).flatMap((plugin) =>
+          plugin.devDependencies != null
             ? Object.values(plugin.devDependencies)
             : []
-        })
+        )
 
         if (depsAndTmpDeps.length > 0) {
           await install(depsAndTmpDeps, flags["package-manager"])
@@ -158,11 +158,11 @@ export const createNextStackPlugin = createPlugin({
       id: "uninstallTemporaryDependencies",
       description: "uninstalling temporary dependencies",
       run: async (inputs) => {
-        const tmpDeps = filterPlugins(inputs).flatMap((plugin) => {
-          return plugin.tmpDependencies != null
+        const tmpDeps = filterPlugins(inputs).flatMap((plugin) =>
+          plugin.tmpDependencies != null
             ? Object.values(plugin.tmpDependencies)
             : []
-        })
+        )
 
         if (tmpDeps.length > 0) {
           await uninstall(tmpDeps, inputs.flags["package-manager"])

packages/create-next-stack/src/main/plugins/create-next-stack/sort-orders/environment-variables.ts

@@ -1,4 +1,5 @@
 import { ValidCNSInputs } from "../../../create-next-stack-types"
+import { nonNull } from "../../../helpers/non-null"
 import { compareByOrder } from "../../../helpers/sort-by-order"
 import { filterPlugins } from "../../../setup/setup"
 
@@ -9,9 +10,9 @@ export const environmentVariablesSortOrder: string[] = [
 export const getSortedFilteredEnvironmentVariables = (
   inputs: ValidCNSInputs
 ) => {
-  const pluginEnvironmentVariables = filterPlugins(inputs).flatMap(
-    (plugin) => plugin.environmentVariables ?? []
-  )
+  const pluginEnvironmentVariables = filterPlugins(inputs)
+    .flatMap((plugin) => plugin.environmentVariables)
+    .filter(nonNull)
   return pluginEnvironmentVariables.sort((a, b) =>
     compareByOrder(a.name, b.name, environmentVariablesSortOrder)
   )

packages/create-next-stack/src/main/plugins/create-next-stack/sort-orders/scripts.ts

@@ -1,4 +1,5 @@
 import { ValidCNSInputs } from "../../../create-next-stack-types"
+import { nonNull } from "../../../helpers/non-null"
 import { compareByOrder } from "../../../helpers/sort-by-order"
 import { filterPlugins } from "../../../setup/setup"
 
@@ -14,9 +15,9 @@ export const scriptsSortOrder: string[] = [
 ]
 
 export const getSortedFilteredScripts = (inputs: ValidCNSInputs) => {
-  const pluginScripts = filterPlugins(inputs).flatMap(
-    (plugin) => plugin.scripts ?? []
-  )
+  const pluginScripts = filterPlugins(inputs)
+    .flatMap((plugin) => plugin.scripts)
+    .filter(nonNull)
   return pluginScripts.sort((a, b) =>
     compareByOrder(a.name, b.name, scriptsSortOrder)
   )

packages/create-next-stack/src/main/plugins/create-next-stack/sort-orders/technologies.ts

@@ -1,5 +1,6 @@
 import { ValidCNSInputs } from "../../../create-next-stack-types"
 import { DeeplyReadonly } from "../../../helpers/deeply-readonly"
+import { nonNull } from "../../../helpers/non-null"
 import { compareByOrder } from "../../../helpers/sort-by-order"
 import { Technology } from "../../../plugin"
 import { filterPlugins, plugins } from "../../../setup/setup"
@@ -37,7 +38,8 @@ export const getTechnologies = (
   inputs: ValidCNSInputs
 ): Array<Omit<DeeplyReadonly<Technology>, "id">> => {
   return filterPlugins(inputs)
-    .flatMap((plugin) => plugin.technologies ?? [])
+    .flatMap((plugin) => plugin.technologies)
+    .filter(nonNull)
     .sort((a, b) => compareByOrder(a.id, b.id, technologiesSortOrder))
     .map(({ id, ...rest }) => ({
       ...rest,