fix(qwik-nx): deduce layout directory (#152)

Author: dmitry-stepanenko

packages/qwik-nx/src/generators/application/__snapshots__/generator.spec.ts.snap

@@ -1,5 +1,5 @@
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Tree, readProjectConfiguration } from '@nx/devkit';
+import { Tree, joinPathFragments, readProjectConfiguration } from '@nx/devkit';
 
 import generator from './generator';
 import { QwikAppGeneratorSchema } from './schema';
@@ -77,4 +77,30 @@ describe('qwik-nx generator', () => {
       expect(appTree.exists('apps/myapp-e2e/cypress.config.ts')).toBeTruthy();
     });
   });
+
+  describe('should be able to resolve directory path based on the workspace layout', () => {
+    test.each`
+      directory               | expectedProjectName | projectRoot
+      ${'/frontend'}          | ${'frontend-myapp'} | ${'apps/frontend/myapp'}
+      ${'apps'}               | ${'myapp'}          | ${'apps/myapp'}
+      ${'/apps/frontend'}     | ${'frontend-myapp'} | ${'apps/frontend/myapp'}
+      ${'apps/frontend'}      | ${'frontend-myapp'} | ${'apps/frontend/myapp'}
+      ${'/packages'}          | ${'myapp'}          | ${'packages/myapp'}
+      ${'/packages/frontend'} | ${'frontend-myapp'} | ${'packages/frontend/myapp'}
+    `(
+      'when directory is "$directory" should generate "$expectedProjectName" with project\'s root at "$projectRoot"',
+      async ({ directory, expectedProjectName, projectRoot }) => {
+        await generator(appTree, { ...defaultOptions, directory });
+        const config = readProjectConfiguration(appTree, expectedProjectName);
+
+        expect(config.root).toBe(projectRoot);
+        expect(config).toMatchSnapshot(
+          JSON.stringify(directory, expectedProjectName)
+        );
+        expect(
+          appTree.exists(joinPathFragments(projectRoot, 'vite.config.ts'))
+        ).toBeTruthy();
+      }
+    );
+  });
 });

packages/qwik-nx/src/generators/application/generator.spec.ts

@@ -1,4 +1,5 @@
 import {
+  extractLayoutDirectory,
   getWorkspaceLayout,
   names,
   normalizePath,
@@ -9,8 +10,9 @@ import { getRelativePathToRootTsConfig } from '@nx/js';
 import { NormalizedSchema, QwikAppGeneratorSchema } from '../schema';
 
 function normalizeDirectory(options: QwikAppGeneratorSchema) {
-  return options.directory
-    ? `${names(options.directory).fileName}/${names(options.name).fileName}`
+  const { projectDirectory } = extractLayoutDirectory(options.directory ?? '');
+  return projectDirectory
+    ? `${names(projectDirectory).fileName}/${names(options.name).fileName}`
     : names(options.name).fileName;
 }
 
@@ -25,7 +27,8 @@ export function normalizeOptions(
   const appDirectory = normalizeDirectory(options);
   const appProjectName = normalizeProjectName(options);
 
-  const { appsDir } = getWorkspaceLayout(host);
+  const { layoutDirectory } = extractLayoutDirectory(options.directory ?? '');
+  const appsDir = layoutDirectory ?? getWorkspaceLayout(host).appsDir;
   const projectRoot = normalizePath(`${appsDir}/${appDirectory}`);
 
   const parsedTags = options.tags