@ng-zen/cli 22.9.0-next.1 → 22.10.0-next.1

package/schematics/ui/index.ts

@@ -9,6 +9,12 @@ const DEFAULT_GENERATION_PATH = 'ui'; // src/app/ui
 
 const FORM_CONTROL_DEPS: ReadonlySet<UiType> = new Set(['input', 'checkbox', 'switch', 'radio']);
 
+const FORM_HELPER_COMPONENTS: readonly { name: UiType; file: string }[] = [
+  { name: 'form-control', file: 'form-control/form-control.ts' },
+  { name: 'hint', file: 'hint/hint.ts' },
+  { name: 'label', file: 'label/label.ts' },
+];
+
 function resolveFormControlDependency(
   tree: Tree,
   logger: SchematicContext['logger'],
@@ -17,12 +23,16 @@ function resolveFormControlDependency(
 ): void {
   if (!ui.some(u => FORM_CONTROL_DEPS.has(u))) return;
 
-  const fcPath = normalize(`${workingDirectory}/form-control/form-control.ts`);
-  if (tree.exists(fcPath)) {
-    logger.info('ℹ form-control skipped — already exists');
-  } else {
-    ui.push('form-control');
-    logger.info('✔ form-control included (auto-included for form components)');
+  for (const { name, file } of FORM_HELPER_COMPONENTS) {
+    if (ui.includes(name)) continue;
+
+    const targetPath = normalize(`${workingDirectory}/${file}`);
+    if (tree.exists(targetPath)) {
+      logger.info(`ℹ ${name} skipped — already exists`);
+    } else {
+      ui.push(name);
+      logger.info(`✔ ${name} included (auto-included for form components)`);
+    }
   }
 }
 
@@ -43,6 +53,8 @@ export function uiGenerator({ ui: selected, project, ...options }: UiOptions): R
 
     resolveFormControlDependency(tree, context.logger, ui, workingDirectory);
 
-    return chain([...applyFileTemplateUtil(ui, { ...options, path: workingDirectory })]);
+    const deduplicatedUi = Array.from(new Set(ui));
+
+    return chain([...applyFileTemplateUtil(deduplicatedUi, { ...options, path: workingDirectory })]);
   };
 }

package/schematics/ui/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../src/schematics/ui/schema.ts"],"names":[],"mappings":"","sourcesContent":["import { Path } from '@angular-devkit/core';\n\nexport interface GeneratorSchemaBase {\n  currentDirectory: Path;\n  path?: Path;\n  stories: boolean;\n  project?: string;\n}\n\nexport type UiType =\n  | 'alert'\n  | 'avatar'\n  | 'badge'\n  | 'button'\n  | 'card'\n  | 'checkbox'\n  | 'dialog'\n  | 'divider'\n  | 'drawer'\n  | 'form-control'\n  | 'icon'\n  | 'input'\n  | 'pin'\n  | 'popover'\n  | 'radio'\n  | 'sidenav'\n  | 'skeleton'\n  | 'switch'\n  | 'textarea';\n\nexport interface Schema extends GeneratorSchemaBase {\n  ui: UiType[];\n}\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../src/schematics/ui/schema.ts"],"names":[],"mappings":"","sourcesContent":["import { Path } from '@angular-devkit/core';\n\nexport interface GeneratorSchemaBase {\n  currentDirectory: Path;\n  path?: Path;\n  stories: boolean;\n  project?: string;\n}\n\nexport type UiType =\n  | 'alert'\n  | 'avatar'\n  | 'badge'\n  | 'button'\n  | 'card'\n  | 'checkbox'\n  | 'dialog'\n  | 'divider'\n  | 'drawer'\n  | 'form-control'\n  | 'hint'\n  | 'icon'\n  | 'input'\n  | 'label'\n  | 'pin'\n  | 'popover'\n  | 'radio'\n  | 'sidenav'\n  | 'skeleton'\n  | 'switch'\n  | 'textarea';\n\nexport interface Schema extends GeneratorSchemaBase {\n  ui: UiType[];\n}\n"]}

package/schematics/ui/schema.json

@@ -46,8 +46,10 @@
           "dialog",
           "divider",
           "drawer",
+          "hint",
           "icon",
           "input",
+          "label",
           "pin",
           "popover",
           "radio",

package/schematics/ui/schema.ts

@@ -18,8 +18,10 @@ export type UiType =
   | 'divider'
   | 'drawer'
   | 'form-control'
+  | 'hint'
   | 'icon'
   | 'input'
+  | 'label'
   | 'pin'
   | 'popover'
   | 'radio'