Merge pull request #49 from bertdeblock/add-test-for-v2-apps

Add test for v2 apps

Author: bertdeblock

package.json

@@ -17,6 +17,7 @@
   ],
   "scripts": {
     "build": "tsc --project tsconfig.json",
+    "gember": "bin/gember.js --path=test/output",
     "lint": "concurrently --group --prefix-colors auto \"npm:lint:*(!fix)\"",
     "lint:fix": "concurrently --group --prefix-colors auto \"npm:lint:*:fix\"",
     "lint:format": "prettier . --cache --check",

src/cli.ts

@@ -9,7 +9,7 @@ import {
   generateModifier,
   generateService,
 } from "./generators.js";
-import { DocumentName } from "./types.js";
+import type { DocumentName } from "./types.js";
 
 yargs(hideBin(process.argv))
   .command({

src/config.ts

@@ -1,7 +1,7 @@
 import { findUp } from "find-up";
 import { pathToFileURL } from "node:url";
 import { GemberError } from "./errors.js";
-import { DocumentName, type File } from "./types.js";
+import type { DocumentName, File } from "./types.js";
 
 export type Config = {
   generators?: {

src/generate.ts

@@ -8,8 +8,8 @@ import { fileURLToPath } from "node:url";
 import { type GenerateInputs, loadScaffdog } from "scaffdog";
 import { resolveConfig } from "./config.js";
 import { GemberError } from "./errors.js";
-import { isAddon, isV2Addon } from "./helpers.js";
-import { type DocumentName } from "./types.js";
+import { isV1Addon, isV2Addon, pathCase } from "./helpers.js";
+import type { DocumentName } from "./types.js";
 
 export async function generate(
   documentName: DocumentName,
@@ -81,14 +81,14 @@ export async function generate(
   });
 }
 
-const DOCUMENT_DIRECTORY: Record<DocumentName, string> = {
+const DOCUMENT_DIR: Record<DocumentName, string> = {
   component: "components",
   helper: "helpers",
   modifier: "modifiers",
   service: "services",
 };
 
-const SRC_DIRECTORY: Record<string, string> = {
+const SRC_DIR: Record<string, string> = {
   APP: "app",
   V1_ADDON: "addon",
   V2_ADDON: "src",
@@ -108,18 +108,11 @@ export async function resolveGeneratePath(
   }
 
   const packageJson = await readJson(join(packagePath, "package.json"));
-  const srcDirectory = isAddon(packageJson)
-    ? isV2Addon(packageJson)
-      ? SRC_DIRECTORY.V2_ADDON
-      : SRC_DIRECTORY.V1_ADDON
-    : SRC_DIRECTORY.APP;
+  const srcDir = isV2Addon(packageJson)
+    ? SRC_DIR.V2_ADDON
+    : isV1Addon(packageJson)
+      ? SRC_DIR.V1_ADDON
+      : SRC_DIR.APP;
 
-  return join(packagePath, srcDirectory, DOCUMENT_DIRECTORY[documentName]);
-}
-
-function pathCase(entityName: string): string {
-  return entityName
-    .split("/")
-    .map((part) => kebabCase(part))
-    .join("/");
+  return join(packagePath, srcDir, DOCUMENT_DIR[documentName]);
 }

src/helpers.ts

@@ -1,13 +1,37 @@
-import { type EmberPackageJson } from "./types.js";
+import { kebabCase } from "change-case";
+import type { EmberPackageJson } from "./types.js";
 
-export function isAddon(packageJson: EmberPackageJson): boolean {
-  if (Array.isArray(packageJson.keywords)) {
-    return packageJson.keywords.includes("ember-addon");
+export function isV1Addon(packageJson: EmberPackageJson): boolean {
+  if (isAddon(packageJson)) {
+    const { version } = packageJson["ember-addon"] ?? {};
+
+    return version === 1 || version === undefined;
   }
 
   return false;
 }
 
 export function isV2Addon(packageJson: EmberPackageJson): boolean {
-  return packageJson["ember-addon"]?.version === 2;
+  if (isAddon(packageJson)) {
+    const { version } = packageJson["ember-addon"] ?? {};
+
+    return version === 2;
+  }
+
+  return false;
+}
+
+export function pathCase(entityName: string): string {
+  return entityName
+    .split("/")
+    .map((part) => kebabCase(part))
+    .join("/");
+}
+
+function isAddon(packageJson: EmberPackageJson): boolean {
+  if (Array.isArray(packageJson.keywords)) {
+    return packageJson.keywords.includes("ember-addon");
+  }
+
+  return false;
 }

src/types.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line n/no-missing-import
-import { type PackageJson } from "type-fest";
+import type { PackageJson } from "type-fest";
 
 export type DocumentName = "component" | "helper" | "modifier" | "service";
 

test/generate-document.test.ts test/generate.test.tstest/generate-document.test.ts renamed to test/generate.test.ts

@@ -15,6 +15,18 @@ it("supports v1 apps", async (ctx) => {
     .toEqual(join("test/packages", name, "app/components"));
 });
 
+it("supports v2 apps", async (ctx) => {
+  const name = "v2-app";
+  const generatePath = await resolveGeneratePath(
+    "component",
+    Package.createPath(name),
+  );
+
+  ctx
+    .expect(generatePath)
+    .toEqual(join("test/packages", name, "app/components"));
+});
+
 it("supports v1 addons", async (ctx) => {
   const name = "v1-addon";
   const generatePath = await resolveGeneratePath(

test/packages/v2-app/app/.gitkeep

@@ -0,0 +1,8 @@
+{
+  "name": "v2-app",
+  "ember": {},
+  "ember-addon": {
+    "type": "app",
+    "version": 2
+  }
+}

test/packages/v2-app/package.json

@@ -5,7 +5,8 @@
     "moduleResolution": "NodeNext",
     "outDir": "./dist",
     "strict": true,
-    "target": "ESNext"
+    "target": "ESNext",
+    "verbatimModuleSyntax": true
   },
   "include": ["src"]
 }