wlmaker 1.2.3 → 1.2.5

package/dist/cli.mjs

@@ -170,7 +170,7 @@ var TIER_PATTERNS = {
   atom: ["single-public", "single-factory"],
   molecule: ["single", "subdirectory-parts", "subdirectory-widgets"],
   organism: ["subdirectory-show", "single"],
-  template: ["simple", "config-data-callbacks"]
+  template: ["simple"]
 };
 var TIER_PLURAL = {
   atom: "atoms",
@@ -190,9 +190,8 @@ var PATTERN_LABELS = {
   "subdirectory-parts": "Subdirectory with part files",
   single: "Single file",
   "subdirectory-widgets": "Subdirectory with widgets/ and utils/",
-  "subdirectory-show": "Subdirectory with static show() + parts",
-  simple: "Template simple (i18n + body + skeleton)",
-  "config-data-callbacks": "Template with Config/Data/Callbacks"
+  "subdirectory-show": "Subdirectory with factories + variant/i18n/skeleton parts",
+  simple: "Template simple (i18n + skeleton)"
 };
 function normalizeTier(input) {
   const normalized = input.toLowerCase().replace(/s$/, "");
@@ -459,13 +458,13 @@ class Wl${pascal} extends StatelessWidget {
     super.key,
   });
 
-  static const skeleton = _Wl${pascal}SkeletonFactory();
-
   @override
   Widget build(BuildContext context) {
     final theme = context.theme;
     return const SizedBox.shrink();
   }
+
+  static const skeleton = _Wl${pascal}SkeletonFactory();
 }
 
 class _Wl${pascal}SkeletonFactory {
@@ -480,7 +479,7 @@ function moleculeTemplateB(name, pascal) {
     main: `import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 
-part '${name}_type.dart';
+part 'wl_${name}_type.dart';
 
 class Wl${pascal} extends StatelessWidget {
   final Wl${pascal}Variant variant;
@@ -490,13 +489,13 @@ class Wl${pascal} extends StatelessWidget {
     super.key,
   });
 
-  static const skeleton = _Wl${pascal}SkeletonFactory();
-
   @override
   Widget build(BuildContext context) {
     final theme = context.theme;
     return const SizedBox.shrink();
   }
+
+  static const skeleton = _Wl${pascal}SkeletonFactory();
 }
 
 class _Wl${pascal}SkeletonFactory {
@@ -505,7 +504,7 @@ class _Wl${pascal}SkeletonFactory {
   Widget call({Key? key}) => const SizedBox.shrink();
 }
 `,
-    type: `part of '${name}.dart';
+    type: `part of 'wl_${name}.dart';
 
 enum Wl${pascal}Variant {
   primary,
@@ -525,13 +524,13 @@ import 'package:flutter/material.dart';
 class Wl${pascal} extends StatelessWidget {
   const Wl${pascal}({super.key});
 
-  static const skeleton = _Wl${pascal}SkeletonFactory();
-
   @override
   Widget build(BuildContext context) {
     final theme = context.theme;
     return const SizedBox.shrink();
   }
+
+  static const skeleton = _Wl${pascal}SkeletonFactory();
 }
 
 class _Wl${pascal}SkeletonFactory {
@@ -546,28 +545,82 @@ function organismTemplateA(name, pascal) {
     main: `import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 
-part '${name}_content.dart';
+part 'wl_${name}_variant.dart';
+part 'wl_${name}_i18n.dart';
+part 'wl_${name}_skeleton.dart';
 
-class Wl${pascal} {
-  Wl${pascal}._();
+class Wl${pascal} extends StatelessWidget {
+  factory Wl${pascal}({
+    required Wl${pascal}I18n i18n,
+    Key? key,
+  }) {
+    return Wl${pascal}._(
+      key: key,
+      variant: Wl${pascal}Variant.primary,
+      i18n: i18n,
+    );
+  }
 
-  static Future<T?> show<T>({
-    required BuildContext context,
+  factory Wl${pascal}.secondary({
+    required Wl${pascal}I18n i18n,
+    Key? key,
   }) {
-    return showDialog<T>(
-      context: context,
-      builder: (context) => _Wl${pascal}Content(),
+    return Wl${pascal}._(
+      key: key,
+      variant: Wl${pascal}Variant.secondary,
+      i18n: i18n,
     );
   }
+
+  const Wl${pascal}._({
+    required this.variant,
+    required this.i18n,
+    super.key,
+  });
+
+  final Wl${pascal}Variant variant;
+  final Wl${pascal}I18n i18n;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = context.theme;
+    return const SizedBox.shrink();
+  }
+}
+`,
+    variant: `part of 'wl_${name}.dart';
+
+enum Wl${pascal}Variant {
+  primary,
+  secondary,
 }
 `,
-    content: `part of '${name}.dart';
+    i18n: `part of 'wl_${name}.dart';
+
+class Wl${pascal}I18n {
+  const Wl${pascal}I18n({
+    this.title = '',
+    this.subtitle = '',
+  });
+
+  final String title;
+  final String subtitle;
+}
+`,
+    skeleton: `part of 'wl_${name}.dart';
+
+class Wl${pascal}Skeleton extends StatelessWidget {
+  const Wl${pascal}Skeleton({super.key});
 
-class _Wl${pascal}Content extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = context.theme;
-    return const SizedBox.shrink();
+
+    return WlSkeleton(
+      width: double.infinity,
+      height: 120,
+      radius: theme.borderRadius.radiusL,
+    );
   }
 }
 `
@@ -606,232 +659,51 @@ function templateA(name, pascal) {
     main: `import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 
-part '${name}_i18n.dart';
-part '${name}_body.dart';
-part '${name}_skeleton.dart';
-
-class Wl${pascal}Template extends StatefulWidget {
-  const Wl${pascal}Template({super.key});
-
-  @override
-  State<Wl${pascal}Template> createState() => _Wl${pascal}TemplateState();
-}
-
-class _Wl${pascal}TemplateState extends State<Wl${pascal}Template> {
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadData();
-  }
-
-  Future<void> _loadData() async {
-    // TODO: Load data
-    setState(() => _isLoading = false);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: Text(Wl${pascal}I18n.title)),
-      body: AnimatedSwitcher(
-        duration: const Duration(milliseconds: 300),
-        child: _isLoading
-            ? const _Wl${pascal}Skeleton()
-            : const _Wl${pascal}Body(),
-      ),
-    );
-  }
-}
-`,
-    i18n: `part of '${name}_template.dart';
-
-class Wl${pascal}I18n extends Equatable {
-  final String title;
-
-  const Wl${pascal}I18n({
-    this.title = '',
-  });
-
-  static const empty = Wl${pascal}I18n();
-
-  @override
-  List<Object?> get props => [title];
-}
-`,
-    body: `part of '${name}_template.dart';
-
-class _Wl${pascal}Body extends StatelessWidget {
-  const _Wl${pascal}Body();
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = context.theme;
-    return const SizedBox.shrink();
-  }
-}
-`,
-    skeleton: `part of '${name}_template.dart';
-
-class _Wl${pascal}Skeleton extends StatelessWidget {
-  const _Wl${pascal}Skeleton();
-
-  @override
-  Widget build(BuildContext context) {
-    return const Center(
-      child: CircularProgressIndicator(),
-    );
-  }
-}
-`
-  };
-}
-function templateB(name, pascal) {
-  return {
-    main: `import 'package:design_system/design_system.dart';
-import 'package:flutter/material.dart';
-
-import 'contracts/${name}_callbacks.dart';
-import 'contracts/${name}_config.dart';
-import 'contracts/${name}_data.dart';
-
-part '${name}_i18n.dart';
-part '${name}_body.dart';
-part '${name}_skeleton.dart';
-
-class Wl${pascal}Template extends StatefulWidget {
-  final Wl${pascal}Config config;
-  final Wl${pascal}Callbacks callbacks;
+part 'wl_${name}_i18n.dart';
+part 'wl_${name}_skeleton.dart';
 
+class Wl${pascal}Template extends StatelessWidget {
   const Wl${pascal}Template({
-    required this.config,
-    required this.callbacks,
+    required this.i18n,
+    this.isLoading = false,
     super.key,
   });
 
-  @override
-  State<Wl${pascal}Template> createState() => _Wl${pascal}TemplateState();
-}
-
-class _Wl${pascal}TemplateState extends State<Wl${pascal}Template> {
-  Wl${pascal}Data _data = const Wl${pascal}Data();
-  bool _isLoading = true;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadData();
-  }
-
-  Future<void> _loadData() async {
-    // TODO: Load data
-    setState(() => _isLoading = false);
-  }
+  final Wl${pascal}I18n i18n;
+  final bool isLoading;
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text(widget.config.i18n.title)),
-      body: AnimatedSwitcher(
-        duration: const Duration(milliseconds: 300),
-        child: _isLoading
-            ? const _Wl${pascal}Skeleton()
-            : _Wl${pascal}Body(
-                data: _data,
-                callbacks: widget.callbacks,
-              ),
-      ),
+      appBar: WlTopBar(title: i18n.title),
+      body: isLoading
+          ? const Wl${pascal}Skeleton()
+          : const SizedBox.shrink(),
     );
   }
 }
 `,
-    i18n: `part of '${name}_template.dart';
+    i18n: `part of 'wl_${name}_template.dart';
 
-class Wl${pascal}I18n extends Equatable {
+class Wl${pascal}I18n {
+  const Wl${pascal}I18n({this.title = ''});
   final String title;
-
-  const Wl${pascal}I18n({
-    this.title = '',
-  });
-
-  static const empty = Wl${pascal}I18n();
-
-  @override
-  List<Object?> get props => [title];
-}
-`,
-    body: `part of '${name}_template.dart';
-
-class _Wl${pascal}Body extends StatelessWidget {
-  final Wl${pascal}Data data;
-  final Wl${pascal}Callbacks callbacks;
-
-  const _Wl${pascal}Body({
-    required this.data,
-    required this.callbacks,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = context.theme;
-    return const SizedBox.shrink();
-  }
 }
 `,
-    skeleton: `part of '${name}_template.dart';
-
-class _Wl${pascal}Skeleton extends StatelessWidget {
-  const _Wl${pascal}Skeleton();
+    skeleton: `part of 'wl_${name}_template.dart';
 
+class Wl${pascal}Skeleton extends StatelessWidget {
+  const Wl${pascal}Skeleton({super.key});
   @override
   Widget build(BuildContext context) {
-    return const Center(
-      child: CircularProgressIndicator(),
-    );
+    return const WlSkeleton(width: double.infinity, height: 200);
   }
 }
-`,
-    callbacks: `import 'package:flutter/material.dart';
-
-class Wl${pascal}Callbacks {
-  final VoidCallback onBack;
-  final VoidCallback onRetry;
-
-  const Wl${pascal}Callbacks({
-    required this.onBack,
-    required this.onRetry,
-  });
-}
-`,
-    config: `import 'package:flutter/material.dart';
-import '../${name}_template.dart';
-
-class Wl${pascal}Config extends Equatable {
-  final Wl${pascal}I18n i18n;
-  final bool showAppBar;
-
-  const Wl${pascal}Config({
-    this.i18n = Wl${pascal}I18n.empty,
-    this.showAppBar = true,
-  });
-
-  @override
-  List<Object?> get props => [i18n, showAppBar];
-}
-`,
-    data: `import 'package:flutter/material.dart';
-
-class Wl${pascal}Data extends Equatable {
-  const Wl${pascal}Data();
-
-  @override
-  List<Object?> get props => [];
-}
 `
   };
 }
-function useCaseTemplate(name, pascal, tierPlural3) {
+function useCaseTemplate(name, pascal, tierPlural3, tier) {
+  const widgetCall = tier === "organism" || tier === "template" ? `const Wl${pascal}(i18n: Wl${pascal}I18n())` : `const Wl${pascal}()`;
   return `import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:widgetbook/widgetbook.dart';
@@ -843,7 +715,7 @@ import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
   path: 'wl_design_system/${tierPlural3}/wl_${name}',
 )
 Widget useCaseWl${pascal}(BuildContext context) {
-  return const Wl${pascal}();
+  return ${widgetCall};
 }
 `;
 }
@@ -895,7 +767,8 @@ async function createWidget(name, tierInput, options) {
       break;
   }
   const barrelFileName = `${plural}.dart`;
-  const exportLine = tier === "template" ? `export '${cleanName}/wl_${cleanName}_template.dart';` : `export '${fileName}.dart';`;
+  const isSubdirectory = tier === "molecule" && pattern === "subdirectory-parts" || tier === "molecule" && pattern === "subdirectory-widgets" || tier === "organism" && pattern === "subdirectory-show";
+  const exportLine = tier === "template" ? `export '${cleanName}/wl_${cleanName}_template.dart';` : isSubdirectory ? `export '${fileName}/${fileName}.dart';` : `export '${fileName}.dart';`;
   updateSortedBarrelFile(tierDir, barrelFileName, exportLine);
   console.log(chalk2.green(`Widget "Wl${pascal}" created in ${plural}/`));
 }
@@ -962,8 +835,13 @@ function createOrganismFiles(tierDir, name, pascal, fileName, pattern) {
       const tpl = organismTemplateA(name, pascal);
       fs6.writeFileSync(path6.join(dir, `${fileName}.dart`), tpl.main);
       fs6.writeFileSync(
-        path6.join(dir, `${fileName}_content.dart`),
-        tpl.content
+        path6.join(dir, `${fileName}_variant.dart`),
+        tpl.variant
+      );
+      fs6.writeFileSync(path6.join(dir, `${fileName}_i18n.dart`), tpl.i18n);
+      fs6.writeFileSync(
+        path6.join(dir, `${fileName}_skeleton.dart`),
+        tpl.skeleton
       );
       break;
     }
@@ -981,58 +859,19 @@ function createOrganismFiles(tierDir, name, pascal, fileName, pattern) {
 function createTemplateFiles(tierDir, name, pascal, fileName, pattern) {
   const dir = path6.join(tierDir, name);
   fs6.mkdirSync(dir, { recursive: true });
-  switch (pattern) {
-    case "simple": {
-      const tpl = templateA(name, pascal);
-      fs6.writeFileSync(
-        path6.join(dir, `wl_${name}_template.dart`),
-        tpl.main
-      );
-      fs6.writeFileSync(
-        path6.join(dir, `wl_${name}_i18n.dart`),
-        tpl.i18n
-      );
-      fs6.writeFileSync(path6.join(dir, `wl_${name}_body.dart`), tpl.body);
-      fs6.writeFileSync(
-        path6.join(dir, `wl_${name}_skeleton.dart`),
-        tpl.skeleton
-      );
-      break;
-    }
-    case "config-data-callbacks": {
-      const tpl = templateB(name, pascal);
-      fs6.writeFileSync(
-        path6.join(dir, `wl_${name}_template.dart`),
-        tpl.main
-      );
-      fs6.writeFileSync(
-        path6.join(dir, `wl_${name}_i18n.dart`),
-        tpl.i18n
-      );
-      fs6.writeFileSync(path6.join(dir, `wl_${name}_body.dart`), tpl.body);
-      fs6.writeFileSync(
-        path6.join(dir, `wl_${name}_skeleton.dart`),
-        tpl.skeleton
-      );
-      const contractsDir = path6.join(dir, "contracts");
-      fs6.mkdirSync(contractsDir, { recursive: true });
-      fs6.writeFileSync(
-        path6.join(contractsDir, `wl_${name}_callbacks.dart`),
-        tpl.callbacks
-      );
-      fs6.writeFileSync(
-        path6.join(contractsDir, `wl_${name}_config.dart`),
-        tpl.config
-      );
-      fs6.writeFileSync(
-        path6.join(contractsDir, `wl_${name}_data.dart`),
-        tpl.data
-      );
-      break;
-    }
-    default:
-      throw new Error(`Unknown template pattern: ${pattern}`);
-  }
+  const tpl = templateA(name, pascal);
+  fs6.writeFileSync(
+    path6.join(dir, `wl_${name}_template.dart`),
+    tpl.main
+  );
+  fs6.writeFileSync(
+    path6.join(dir, `wl_${name}_i18n.dart`),
+    tpl.i18n
+  );
+  fs6.writeFileSync(
+    path6.join(dir, `wl_${name}_skeleton.dart`),
+    tpl.skeleton
+  );
 }
 
 // src/core/create-usecase.ts
@@ -1086,7 +925,7 @@ async function createUseCase(name, tierInput, options) {
   }
   fs7.writeFileSync(
     useCasePath,
-    useCaseTemplate(cleanName, pascal, plural)
+    useCaseTemplate(cleanName, pascal, plural, tier)
   );
   console.log(
     chalk3.green(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wlmaker",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Create Flutter BLoCs with Freezed sealed classes from the terminal",
   "keywords": [
     "flutter",