@adobe/ccweb-add-on-scaffolder 2.5.0 → 3.1.0

package/src/config/inversify.types.ts

@@ -22,8 +22,12 @@
  * SOFTWARE.
  ********************************************************************************/
 
-export const ITypes = {
-    Command: Symbol.for("Command"),
+export const ITypes: {
+    AddOnScaffolder: symbol;
+    AddOnBuilder: symbol;
+    PackageBuilder: symbol;
+    TemplateValidator: symbol;
+} = {
     AddOnScaffolder: Symbol.for("AddOnScaffolder"),
     AddOnBuilder: Symbol.for("AddOnBuilder"),
     PackageBuilder: Symbol.for("PackageBuilder"),

package/src/index.ts

@@ -22,7 +22,7 @@
  * SOFTWARE.
  ********************************************************************************/
 
-export * from "./app/AddOnScaffolder.js";
+export type * from "./app/AddOnScaffolder.js";
 export * from "./config/index.js";
 export * from "./constants.js";
 export * from "./models/index.js";

package/src/models/ScaffolderOptions.ts

@@ -41,7 +41,7 @@ export class ScaffolderOptions {
     /**
      * Kind of the Add-on. For example: panel.
      */
-    readonly addOnKind: EntrypointType;
+    readonly entrypointType: EntrypointType;
 
     /**
      * Path of the Add-on root directory.
@@ -62,7 +62,7 @@ export class ScaffolderOptions {
      * Instantiate {@link ScaffolderOptions}.
      * @param addOnDirectory - Path of the Add-on directory.
      * @param addOnName - Name of the Add-on.
-     * @param addOnKind - Kind of the Add-on. For example: panel.
+     * @param entrypointType - Kind of the Add-on. For example: panel.
      * @param rootDirectory - Path of the Add-on root directory.
      * @param templateName - Name of the template with which the Add-on is to be scaffolded.
      * @param verbose - Verbose flag.
@@ -71,14 +71,14 @@ export class ScaffolderOptions {
     constructor(
         addOnDirectory: string,
         addOnName: string,
-        addOnKind: EntrypointType,
+        entrypointType: EntrypointType,
         rootDirectory: string,
         templateName: string,
         verbose: boolean
     ) {
         this.addOnDirectory = addOnDirectory;
         this.addOnName = addOnName;
-        this.addOnKind = addOnKind;
+        this.entrypointType = entrypointType;
         this.rootDirectory = rootDirectory;
         this.templateName = templateName;
         this.verbose = verbose;

package/src/test/app/{TemplateAddOnBuilder.spec.ts → AddOnBuilder.spec.ts}

@@ -37,14 +37,13 @@ import sinon from "sinon";
 import type { StubbedInstance } from "ts-sinon";
 import { stubInterface } from "ts-sinon";
 import { fileURLToPath } from "url";
-import type { AddOnBuilder } from "../../app/index.js";
-import { TemplateAddOnBuilder } from "../../app/index.js";
+import { AddOnBuilder } from "../../app/AddOnBuilder.js";
 import { MANIFEST_JSON, PACKAGE_JSON } from "../../constants.js";
 import { ScaffolderOptions } from "../../models/ScaffolderOptions.js";
 
 chai.use(chaiAsPromised);
 
-describe("TemplateAddOnBuilder", () => {
+describe("AddOnBuilder", () => {
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
     const __require = createRequire(import.meta.url);
@@ -70,7 +69,7 @@ describe("TemplateAddOnBuilder", () => {
 
             const expectedPacakgeJson = new PackageJson(testAppPackageJson);
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const packageJson = addOnBuilder.getPackageJson();
 
             assert.deepEqual(packageJson, expectedPacakgeJson);
@@ -99,7 +98,7 @@ describe("TemplateAddOnBuilder", () => {
 
             const expectedTemplateJson = new TemplateJson({});
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const templateJson = addOnBuilder.getTemplateJson();
 
             assert.deepEqual(templateJson, expectedTemplateJson);
@@ -128,7 +127,7 @@ describe("TemplateAddOnBuilder", () => {
                 }
             });
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const templateJson = addOnBuilder.getTemplateJson();
 
             assert.deepEqual(templateJson, expectedTemplateJson);
@@ -146,7 +145,7 @@ describe("TemplateAddOnBuilder", () => {
                 false
             );
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const devDependencies = addOnBuilder.getDevDependenciesToInstall(new TemplateJson({}));
 
             assert.equal(devDependencies.size, 0);
@@ -172,7 +171,7 @@ describe("TemplateAddOnBuilder", () => {
 
             const expectedDevDependencies = new Set(["a@1.0.0", "b@2.0.0", "c@3.0.0"]);
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const devDependencies = addOnBuilder.getDevDependenciesToInstall(templateJson);
 
             assert.deepEqual(devDependencies, expectedDevDependencies);
@@ -190,7 +189,7 @@ describe("TemplateAddOnBuilder", () => {
                 false
             );
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const dependencies = addOnBuilder.getDependenciesToInstall(new TemplateJson({}));
 
             assert.equal(dependencies.size, 0);
@@ -216,14 +215,14 @@ describe("TemplateAddOnBuilder", () => {
 
             const expectedDependencies = new Set(["a@1.0.0", "b@2.0.0", "c@3.0.0"]);
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             const dependencies = addOnBuilder.getDependenciesToInstall(templateJson);
 
             assert.deepEqual(dependencies, expectedDependencies);
         });
     });
 
-    describe("build()", () => {
+    describe("build", () => {
         const additionalInfo = {
             sourceId: "fakeAddOnSource",
             privileged: true,
@@ -315,7 +314,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(renameSpy.callCount, 0);
@@ -399,7 +398,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(renameStub.callCount, 1);
@@ -499,7 +498,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(logger.warning.callCount, 1);
@@ -584,7 +583,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(copyStub.callCount, 1);
@@ -678,7 +677,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(moveStub.callCount, 1);
@@ -767,7 +766,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(readFileStub.callCount, 1);
@@ -868,7 +867,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(writeFileStub.callCount, 2);
@@ -952,7 +951,7 @@ describe("TemplateAddOnBuilder", () => {
                     .withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL)
                     .returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(packageJson);
 
                 assert.equal(unlinkStub.callCount, 1);
@@ -1015,7 +1014,7 @@ describe("TemplateAddOnBuilder", () => {
                 // _removeTemplateTempFiles() stubs.
                 sandbox.stub(fs, "removeSync").returns();
 
-                const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+                const addOnBuilder = new AddOnBuilder(options, logger);
                 addOnBuilder.build(thirdPackageJson);
 
                 assert.equal(writeFileStub.callCount, 1);
@@ -1120,7 +1119,7 @@ describe("TemplateAddOnBuilder", () => {
 
             writeFileStub.withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL).returns();
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             addOnBuilder.build(packageJson);
             addOnBuilder.displaySuccess();
             assert.equal(logger.message.callCount, 3);
@@ -1292,7 +1291,7 @@ describe("TemplateAddOnBuilder", () => {
 
             writeFileStub.withArgs(manifestJsonPath, getJSONString(manifest!.manifestProperties) + os.EOL).returns();
 
-            const addOnBuilder: AddOnBuilder = new TemplateAddOnBuilder(options, logger);
+            const addOnBuilder = new AddOnBuilder(options, logger);
             addOnBuilder.build(packageJson);
             addOnBuilder.displaySuccess();
 

package/src/test/app/{TemplateAddOnScaffolder.spec.ts → AddOnScaffolder.spec.ts}

@@ -25,7 +25,8 @@
 import type { Logger, Process } from "@adobe/ccweb-add-on-core";
 import { DEFAULT_HOST_NAME, PackageJson, TemplateJson } from "@adobe/ccweb-add-on-core";
 import { EntrypointType } from "@adobe/ccweb-add-on-manifest";
-import { SetupCommandOptions, type CommandExecutor as SSLCommandExecutor } from "@adobe/ccweb-add-on-ssl";
+import type { CommandExecutor as SSLCommandExecutor } from "@adobe/ccweb-add-on-ssl";
+import { SetupCommandOptions as SSLSetupCommandOptions } from "@adobe/ccweb-add-on-ssl";
 import { assert } from "chai";
 import "mocha";
 import path from "path";
@@ -34,18 +35,15 @@ import sinon from "sinon";
 import type { StubbedInstance } from "ts-sinon";
 import { stubInterface } from "ts-sinon";
 import { fileURLToPath } from "url";
-import type {
-    AddOnBuilder,
-    AddOnBuilderFactory,
-    AddOnScaffolder,
-    PackageBuilder,
-    PackageBuilderFactory
-} from "../../app/index.js";
-import { TemplateAddOnScaffolder } from "../../app/index.js";
+import type { AddOnBuilderFactory } from "../../app/AddOnBuilder.js";
+import type { AddOnBuilder } from "../../app/AddOnBuilder.js";
+import { AddOnScaffolder } from "../../app/AddOnScaffolder.js";
+import type { PackageBuilderFactory } from "../../app/PackageBuilder.js";
+import type { PackageBuilder } from "../../app/PackageBuilder.js";
 import { ScaffolderOptions } from "../../models/ScaffolderOptions.js";
 import type { TemplateValidator } from "../../validators/TemplateValidator.js";
 
-describe("TemplateAddOnScaffolder", () => {
+describe("AddOnScaffolder", () => {
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path.dirname(__filename);
 
@@ -60,7 +58,7 @@ describe("TemplateAddOnScaffolder", () => {
         let addOnBuilder: StubbedInstance<AddOnBuilder>;
         let addOnBuilderFactory: AddOnBuilderFactory;
 
-        let sslCommandExecutor: StubbedInstance<SSLCommandExecutor>;
+        let sslCommandExecutor: StubbedInstance<SSLCommandExecutor<SSLSetupCommandOptions>>;
 
         let cliProcess: StubbedInstance<Process>;
         let logger: StubbedInstance<Logger>;
@@ -83,7 +81,7 @@ describe("TemplateAddOnScaffolder", () => {
             cliProcess = stubInterface();
             logger = stubInterface();
 
-            addOnScaffolder = new TemplateAddOnScaffolder(
+            addOnScaffolder = new AddOnScaffolder(
                 addOnBuilderFactory,
                 packageBuilderFactory,
                 templateValidator,
@@ -105,7 +103,7 @@ describe("TemplateAddOnScaffolder", () => {
 
             const addOnDirectory = `${__dirname}/data/first-test-app`;
             const addOnName = "first-test-app";
-            const addOnKind = EntrypointType.PANEL;
+            const entrypointType = EntrypointType.PANEL;
             const rootDirectory = `${__dirname}/data`;
             const templateName = "javascript";
             const verbose = false;
@@ -113,7 +111,7 @@ describe("TemplateAddOnScaffolder", () => {
             const options = new ScaffolderOptions(
                 addOnDirectory,
                 addOnName,
-                addOnKind,
+                entrypointType,
                 rootDirectory,
                 templateName,
                 verbose
@@ -131,7 +129,7 @@ describe("TemplateAddOnScaffolder", () => {
             {
                 addOnDirectory: `${__dirname}/data/first-test-app`,
                 addOnName: "first-test-app",
-                addOnKind: EntrypointType.PANEL,
+                entrypointType: EntrypointType.PANEL,
                 rootDirectory: `${__dirname}/data`,
                 templateName: "javascript",
                 verbose: true
@@ -139,7 +137,7 @@ describe("TemplateAddOnScaffolder", () => {
             {
                 addOnDirectory: `${__dirname}/data/second-test-app`,
                 addOnName: "second-test-app",
-                addOnKind: EntrypointType.PANEL,
+                entrypointType: EntrypointType.PANEL,
                 rootDirectory: `${__dirname}/data`,
                 templateName: "javascript",
                 verbose: false
@@ -152,8 +150,8 @@ describe("TemplateAddOnScaffolder", () => {
                 const packageJson = new PackageJson({
                     name: run.addOnName,
                     version: "1.0.0",
-                    description: `WXP ${run.addOnKind} application.`,
-                    keywords: ["adobe", "wxp", run.addOnKind],
+                    description: `WXP ${run.entrypointType} application.`,
+                    keywords: ["adobe", "wxp", run.entrypointType],
                     scripts: {
                         clean: "ccweb-add-on-scripts clean",
                         build: "ccweb-add-on-scripts build",
@@ -182,8 +180,8 @@ describe("TemplateAddOnScaffolder", () => {
                 const combinedPackageJson = new PackageJson({
                     name: run.addOnName,
                     version: "1.0.0",
-                    description: `WXP ${run.addOnKind} application.`,
-                    keywords: ["adobe", "wxp", run.addOnKind],
+                    description: `WXP ${run.entrypointType} application.`,
+                    keywords: ["adobe", "wxp", run.entrypointType],
                     scripts: {
                         clean: "ccweb-add-on-scripts clean",
                         build: "ccweb-add-on-scripts build",
@@ -235,7 +233,7 @@ describe("TemplateAddOnScaffolder", () => {
                     .withArgs("npm", expectedDependenciesArgs, { stdio: "inherit" })
                     .returns(Promise.resolve(installDependenciesResult));
 
-                const setupCommandOptions = new SetupCommandOptions(DEFAULT_HOST_NAME, true, run.verbose);
+                const setupCommandOptions = new SSLSetupCommandOptions(DEFAULT_HOST_NAME, true, run.verbose);
                 sslCommandExecutor.execute.withArgs(setupCommandOptions).resolves();
 
                 addOnBuilder.displaySuccess.returns();
@@ -243,7 +241,7 @@ describe("TemplateAddOnScaffolder", () => {
                 const options = new ScaffolderOptions(
                     run.addOnDirectory,
                     run.addOnName,
-                    run.addOnKind as EntrypointType,
+                    run.entrypointType as EntrypointType,
                     run.rootDirectory,
                     run.templateName,
                     run.verbose

package/src/test/app/{TemplatePackageBuilder.spec.ts → PackageBuilder.spec.ts}

@@ -25,11 +25,10 @@
 import { PackageJson, TemplateJson } from "@adobe/ccweb-add-on-core";
 import { assert } from "chai";
 import "mocha";
-import type { PackageBuilder } from "../../app/index.js";
-import { TemplatePackageBuilder } from "../../app/index.js";
+import { PackageBuilder } from "../../app/PackageBuilder.js";
 
-describe("TemplatePackageBuilder", () => {
-    describe("build()", () => {
+describe("PackageBuilder", () => {
+    describe("build", () => {
         describe("buildDevDependencies ...", () => {
             it("should combine devDependencies from package when template does not have devDependencies.", () => {
                 const packageJsonContent = {
@@ -52,7 +51,7 @@ describe("TemplatePackageBuilder", () => {
                     ...templateJsonContent
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -79,7 +78,7 @@ describe("TemplatePackageBuilder", () => {
                     ...templateJsonContent
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -111,7 +110,7 @@ describe("TemplatePackageBuilder", () => {
                     }
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -140,7 +139,7 @@ describe("TemplatePackageBuilder", () => {
                     ...templateJsonContent
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -167,7 +166,7 @@ describe("TemplatePackageBuilder", () => {
                     ...templateJsonContent
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -199,7 +198,7 @@ describe("TemplatePackageBuilder", () => {
                     }
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -228,7 +227,7 @@ describe("TemplatePackageBuilder", () => {
                     ...templateJsonContent
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -255,7 +254,7 @@ describe("TemplatePackageBuilder", () => {
                     ...templateJsonContent
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -284,7 +283,7 @@ describe("TemplatePackageBuilder", () => {
                     scripts: { ...packageJsonContent.scripts, ...templateJsonContent.scripts }
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));
@@ -322,7 +321,7 @@ describe("TemplatePackageBuilder", () => {
                     scripts: { ...packageJsonContent.scripts, ...templateJsonContent.scripts }
                 };
 
-                const packageBuilder: PackageBuilder = new TemplatePackageBuilder(packageJson, templateJson);
+                const packageBuilder = new PackageBuilder(packageJson, templateJson);
                 const combinedPackageJson = packageBuilder.build();
 
                 assert.deepEqual(combinedPackageJson, new PackageJson(expectedPackageJsonContent));

package/src/test/models/ScaffolderOptions.spec.ts

@@ -25,7 +25,7 @@
 import { EntrypointType } from "@adobe/ccweb-add-on-manifest";
 import { assert } from "chai";
 import "mocha";
-import { ScaffolderOptions } from "../../models/index.js";
+import { ScaffolderOptions } from "../../models/ScaffolderOptions.js";
 
 describe("ScaffolderOptions", () => {
     describe("constructor", () => {
@@ -33,25 +33,25 @@ describe("ScaffolderOptions", () => {
             {
                 addOnDirectory: "/apps/test-app",
                 addOnName: "test-app",
-                addOnKind: EntrypointType.PANEL,
+                entrypointType: EntrypointType.PANEL,
                 rootDirectory: "/apps",
                 templateName: "javascript",
                 verbose: false
             }
         ];
         runs.forEach(run => {
-            it(`should create a new instance for: ${run.addOnKind}.`, () => {
+            it(`should create a new instance for: ${run.entrypointType}.`, () => {
                 const scaffolderOptions = new ScaffolderOptions(
                     run.addOnDirectory,
                     run.addOnName,
-                    run.addOnKind as EntrypointType,
+                    run.entrypointType as EntrypointType,
                     run.rootDirectory,
                     run.templateName,
                     run.verbose
                 );
                 assert.equal(scaffolderOptions.addOnDirectory, run.addOnDirectory);
                 assert.equal(scaffolderOptions.addOnName, run.addOnName);
-                assert.equal(scaffolderOptions.addOnKind, run.addOnKind);
+                assert.equal(scaffolderOptions.entrypointType, run.entrypointType);
                 assert.equal(scaffolderOptions.rootDirectory, run.rootDirectory);
                 assert.equal(scaffolderOptions.templateName, run.templateName);
                 assert.equal(scaffolderOptions.verbose, run.verbose);

package/src/test/validators/{AppTemplateValidator.spec.ts → TemplateValidator.spec.ts}

@@ -30,8 +30,7 @@ import sinon from "sinon";
 import type { StubbedInstance } from "ts-sinon";
 import { stubInterface } from "ts-sinon";
 import { PROGRAM_NAME } from "../../constants.js";
-import type { TemplateValidator } from "../../validators/index.js";
-import { AddOnTemplateValidator } from "../../validators/index.js";
+import { TemplateValidator } from "../../validators/TemplateValidator.js";
 
 describe("AddOnTemplateValidator", () => {
     describe("validateTemplate ...", () => {
@@ -42,7 +41,7 @@ describe("AddOnTemplateValidator", () => {
         beforeEach(() => {
             sandbox = sinon.createSandbox();
             logger = stubInterface<Logger>();
-            validator = new AddOnTemplateValidator(logger);
+            validator = new TemplateValidator(logger);
         });
 
         afterEach(() => {

package/src/validators/TemplateValidator.ts

@@ -22,14 +22,57 @@
  * SOFTWARE.
  ********************************************************************************/
 
+import type { Logger } from "@adobe/ccweb-add-on-core";
+import { ITypes as ICoreTypes, isNullOrWhiteSpace } from "@adobe/ccweb-add-on-core";
+import { inject, injectable } from "inversify";
+import process from "process";
+import "reflect-metadata";
+import format from "string-template";
+import { PROGRAM_NAME } from "../constants.js";
+
 /**
- * Template validator interface to validate user selected template.
+ * Validator class to validate user selected template..
  */
-export interface TemplateValidator {
+@injectable()
+export class TemplateValidator {
+    private readonly _logger: Logger;
+
+    /**
+     * Instantiate {@link TemplateValidator}.
+     *
+     * @param logger - {@link Logger} reference.
+     * @returns Reference to a new {@link TemplateValidator} instance.
+     */
+    constructor(@inject(ICoreTypes.Logger) logger: Logger) {
+        this._logger = logger;
+    }
+
     /**
      * Validate the template.
      *
      * @param templateName - Name of the template.
      */
-    validateTemplate(templateName: string): void;
+    validateTemplate(templateName: string): void {
+        if (isNullOrWhiteSpace(templateName)) {
+            this._logger.warning(LOGS.specifyValidTemplateName);
+            this._logger.warning(format(LOGS.executeProgram, { PROGRAM_NAME }), {
+                prefix: LOGS.tab
+            });
+            this._logger.message(LOGS.forExample, { prefix: LOGS.newLine });
+            this._logger.information(format(LOGS.executeProgramExample, { PROGRAM_NAME }), {
+                prefix: LOGS.tab
+            });
+
+            process.exit(1);
+        }
+    }
 }
+
+const LOGS = {
+    newLine: "\n",
+    tab: "  ",
+    specifyValidTemplateName: "Please specify a valid template name:",
+    executeProgram: "{PROGRAM_NAME} --template <template-name>",
+    executeProgramExample: "{PROGRAM_NAME} --template javascript",
+    forExample: "For example:"
+};

package/src/validators/index.ts

@@ -22,5 +22,4 @@
  * SOFTWARE.
  ********************************************************************************/
 
-export * from "./AddOnTemplateValidator.js";
 export * from "./TemplateValidator.js";

package/tsconfig.json

@@ -17,11 +17,14 @@
         "outDir": "dist",
         "preserveConstEnums": true,
         "resolveJsonModule": true,
+        "skipLibCheck": true,
         "sourceMap": true,
         "strict": true,
         "target": "ESNext",
+        "lib": ["ES2020", "DOM"],
         "types": ["reflect-metadata"],
-        "useUnknownInCatchVariables": false
+        "useUnknownInCatchVariables": false,
+        "isolatedDeclarations": true
     },
     "exclude": ["node_modules", "src/test/**/*"],
     "include": ["src/**/*"]