refactoring layout and component schematics to support nested folders

Hyperxq · Mar 22, 2024 · eaf7f0b · eaf7f0b
1 parent 6206b06
commit eaf7f0b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/packages/astro/src/builder-generate/component/component.factory.ts b/packages/astro/src/builder-generate/component/component.factory.ts
@@ -11,10 +11,12 @@ import {
   MergeStrategy,
   Tree,
 } from '@angular-devkit/schematics';
+import { parseName } from '../../utils';
 
-// name, addSlot
 export function componentFactory({ name, addSlot }: { name: string; addSlot: boolean }): Rule {
   return (tree: Tree) => {
+    const { path, name: componentName } = parseName('./', name);
+
     let basePath = './src';
 
     if (!tree.getDir('/').subdirs.find((f) => f === 'src')) {
@@ -26,12 +28,12 @@ export function componentFactory({ name, addSlot }: { name: string; addSlot: boo
     const template = apply(url('./files'), [
       filter((path) => urlTemplates.some((urlTemplate) => path.includes(urlTemplate))),
       applyTemplates({
-        name,
+        name: componentName,
         addSlot,
         ...strings,
       }),
       renameTemplateFiles(),
-      move(basePath),
+      move(`${basePath}${path ?? ''}`),
     ]);
     return mergeWith(template, MergeStrategy.Overwrite);
   };

diff --git a/packages/astro/src/builder-generate/layout/layout.factory.ts b/packages/astro/src/builder-generate/layout/layout.factory.ts
@@ -11,10 +11,12 @@ import {
   MergeStrategy,
   Tree,
 } from '@angular-devkit/schematics';
+import { parseName } from '../../utils';
 
 // name, addSlot
 export function layoutFactory({ name }: { name: string }): Rule {
   return (tree: Tree) => {
+    const { path, name: layoutName } = parseName('./', name);
     let basePath = './src';
 
     if (!tree.getDir('/').subdirs.find((f) => f === 'src')) {
@@ -26,11 +28,11 @@ export function layoutFactory({ name }: { name: string }): Rule {
     const template = apply(url('./files'), [
       filter((path) => urlTemplates.some((urlTemplate) => path.includes(urlTemplate))),
       applyTemplates({
-        name,
+        name: layoutName,
         ...strings,
       }),
       renameTemplateFiles(),
-      move(basePath),
+      move(`${basePath}${path ?? ''}`),
     ]);
     return mergeWith(template, MergeStrategy.Overwrite);
   };

diff --git a/packages/astro/src/builder-generate/page/page.factory.ts b/packages/astro/src/builder-generate/page/page.factory.ts
@@ -100,8 +100,8 @@ function addPageFile(
 
   const pageTypes = {
     astro: '__name@classify__.astro.template',
-    md: '__pageName@classify__.md.template',
-    mdx: '__pageName@classify__.mdx.template',
+    md: '__name@classify__.md.template',
+    mdx: '__name@classify__.mdx.template',
   };
 
   const urlTemplates = [pageTypes[fileType]];
@@ -115,7 +115,7 @@ function addPageFile(
       ...strings,
     }),
     renameTemplateFiles(),
-    move(`${basePath}${pagePath}`),
+    move(`${basePath}${pagePath ?? ''}`),
   ]);
   return mergeWith(template, MergeStrategy.Overwrite);
 }