From b15ecadc9ab61de5806dc7bc41955e7ed1b79fa4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 9 Feb 2025 14:31:12 +0100
Subject: [PATCH] cli/new: remove params from config

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../new/execution/writeTemplateContents.test.ts  |  4 ----
 .../lib/new/execution/writeTemplateContents.ts   | 11 ++++++++++-
 .../collectPortableTemplateInput.test.ts         | 16 ----------------
 .../preparation/collectPortableTemplateInput.ts  |  7 -------
 packages/cli/src/lib/new/types.ts                |  1 -
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts b/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts
index 183208b28c..62d054f754 100644
--- a/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts
+++ b/packages/cli/src/lib/new/execution/writeTemplateContents.test.ts
@@ -48,7 +48,6 @@ describe('writeTemplateContents', () => {
         ...baseConfig,
         roleParams: { role: 'frontend-plugin', pluginId: 'test' },
         builtInParams: {},
-        params: {},
         packageName: '@internal/plugin-test',
         packagePath: 'plugins/plugin-test',
       },
@@ -84,9 +83,6 @@ describe('writeTemplateContents', () => {
         ...baseConfig,
         roleParams: { role: 'frontend-plugin', pluginId: 'test' },
         builtInParams: {},
-        params: {
-          pluginId: 'test',
-        },
         packageName: '@internal/plugin-test',
         packagePath: 'out',
       },
diff --git a/packages/cli/src/lib/new/execution/writeTemplateContents.ts b/packages/cli/src/lib/new/execution/writeTemplateContents.ts
index 0c60a1c9ee..dc597bb5aa 100644
--- a/packages/cli/src/lib/new/execution/writeTemplateContents.ts
+++ b/packages/cli/src/lib/new/execution/writeTemplateContents.ts
@@ -36,8 +36,17 @@ export async function writeTemplateContents(
   try {
     const isMonoRepo = await getIsMonoRepo();
 
+    const { role, ...roleValues } = input.roleParams;
+
     const templater = await PortableTemplater.create({
-      values: input.params,
+      values: {
+        ...roleValues,
+        ...input.builtInParams,
+        packageName: input.packageName,
+        privatePackage: input.private,
+        packageVersion: input.version,
+        license: input.license,
+      },
       templatedValues: template.templateValues,
     });
 
diff --git a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts
index 8d44d4cc33..376a1908ec 100644
--- a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts
+++ b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.test.ts
@@ -51,14 +51,6 @@ describe('collectTemplateParams', () => {
       builtInParams: {
         owner: 'me',
       },
-      params: {
-        license: 'Apache-2.0',
-        packageName: '@internal/plugin-test',
-        packageVersion: '0.1.0',
-        privatePackage: true,
-        pluginId: 'test',
-        owner: 'me',
-      },
       version: '0.1.0',
       license: 'Apache-2.0',
       private: true,
@@ -83,14 +75,6 @@ describe('collectTemplateParams', () => {
       builtInParams: {
         owner: undefined,
       },
-      params: {
-        license: 'Apache-2.0',
-        packageName: '@internal/plugin-other',
-        packageVersion: '0.1.0',
-        privatePackage: true,
-        pluginId: 'other',
-        owner: undefined,
-      },
       version: '0.1.0',
       license: 'Apache-2.0',
       private: true,
diff --git a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts
index 920f038189..85798953a9 100644
--- a/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts
+++ b/packages/cli/src/lib/new/preparation/collectPortableTemplateInput.ts
@@ -84,13 +84,6 @@ export async function collectPortableTemplateInput(
     builtInParams: {
       owner: answers.owner,
     } as PortableTemplateInputBuiltInParams,
-    params: {
-      ...answers,
-      packageName: packageParams.packageName,
-      privatePackage: config.private,
-      packageVersion: config.version,
-      license: config.license,
-    },
     license: config.license,
     version: config.version,
     private: config.private,
diff --git a/packages/cli/src/lib/new/types.ts b/packages/cli/src/lib/new/types.ts
index ec6331ddd2..b460dd842c 100644
--- a/packages/cli/src/lib/new/types.ts
+++ b/packages/cli/src/lib/new/types.ts
@@ -109,7 +109,6 @@ export type PortableTemplateInputBuiltInParams = {
 export type PortableTemplateInput = {
   roleParams: PortableTemplateInputRoleParams;
   builtInParams: PortableTemplateInputBuiltInParams;
-  params: PortableTemplateParams;
 
   license: string;