0.3.0

* remove app generator * upgrade to angular 4
dart-league · Sep 7, 2017 · 10be498 · 10be498
1 parent fe0e77f
commit 10be498
Show file tree

Hide file tree

Showing 29 changed files with 48 additions and 383 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.3.0
+
+* remove app generator
+* upgrade to angular 4
+
 ## 0.2.1+1
 * small fix on service generation
 

diff --git a/bin/app.dart b/bin/app.dart
diff --git a/bin/app_template_data.dart b/bin/app_template_data.dart
diff --git a/bin/component.dart b/bin/component.dart
@@ -12,7 +12,7 @@ main(List<String> args) async {
 
   if (config?.componentsPath != null) {
     path = "${config.componentsPath}/${toTableName(name)}";
-    lib = "lib/components.dart";
+    lib = config.useComponentsFile ? "lib/components.dart" : null;
   }
 
   String prefix =  config?.componentsPath != null ? "lib/" : "";
@@ -33,12 +33,12 @@ main(List<String> args) async {
 }
 
 String componentTemplateDart(String name) =>
-    '''import 'package:angular2/core.dart';
+    '''import 'package:angular/angular.dart';
 
 @Component(
   selector: '${toPolyName(name)}',
   templateUrl: '${toTableName(name)}.html',
-  styleUrls: const <String>['${toTableName(name)}.css'])
+  styleUrls: const ['${toTableName(name)}.css'])
 class ${toUpperCamelCase(name)} implements OnInit {
 
   ${toUpperCamelCase(name)}();

diff --git a/bin/component_inline.dart b/bin/component_inline.dart
@@ -12,7 +12,7 @@ main(List<String> args) async {
 
   if (config?.componentsPath != null) {
     path = "${config.componentsPath}/${toTableName(name)}";
-    lib = "lib/components.dart";
+    lib = config.useComponentsFile ? "lib/components.dart" : null;
   }
 
   String prefix =  config?.componentsPath != null ? "lib/" : "";
@@ -31,7 +31,7 @@ main(List<String> args) async {
 }
 
 String componentTemplateDart(String name) =>
-    '''import 'package:angular2/core.dart';
+    '''import 'package:angular/angular.dart';
 
 @Component(
   selector: '${toPolyName(name)}',
@@ -40,7 +40,7 @@ String componentTemplateDart(String name) =>
           ${toPolyName(name)} works!
         </p>
         \'\'\',
-  styleUrls: const <String>['${toTableName(name)}.css'])
+  styleUrls: const ['${toTableName(name)}.css'])
 class ${toUpperCamelCase(name)} implements OnInit {
 
   ${toUpperCamelCase(name)}();

diff --git a/bin/directive.dart b/bin/directive.dart
@@ -12,7 +12,7 @@ main(List<String> args) async {
 
   if (config?.directivesPath != null) {
     path = "${config.directivesPath}";
-    lib = "lib/directives.dart";
+    lib = config.useDirectivesFile ? "lib/directives.dart" : null;
   }
 
   String prefix =  config?.directivesPath != null ? "lib/" : "";
@@ -28,10 +28,10 @@ main(List<String> args) async {
 }
 
 String directiveTemplate(String name) => '''
-import "package:angular2/core.dart";
+import "package:angular/angular.dart";
 
 @Directive(
-    selector: '[${toPolyName(name)}]'
+    selector: '[${toLowerCamelCase(name)}]'
 )
 class ${toUpperCamelCase(name)} {
 

diff --git a/bin/main.dart b/bin/main.dart
@@ -4,7 +4,6 @@ import 'component.dart' as component;
 import 'directive.dart' as directive;
 import 'service.dart' as service;
 import 'pipe.dart' as pipe;
-import 'app.dart' as app;
 import 'component_inline.dart' as component_inline;
 import 'route.dart' as route;
 import 'init.dart' as init;
@@ -41,10 +40,6 @@ main(List<String> args) {
       _showHelp(args, 2);
       route.main(args.getRange(1, args.length).toList());
       break;
-    case 'new':
-     _showHelp(args, 1);
-      app.main(args.getRange(1, args.length).toList());
-      break;
     case '--help':
     case '-h':
     default:
@@ -57,7 +52,6 @@ void _showHelp([List<String> args, int index]) {
     print('''
 USAGE:
   -h, --help                        :   shows this content.
-  new <app_name>                    :   create a new Angular2 application.
   component <component_name>        :   create a new folder with the name of component.
   component_inline <component_name> :   create a new folder with the name of component but without html file.
   directive <directive_name>        :   create a new directive.

diff --git a/bin/pipe.dart b/bin/pipe.dart
@@ -12,7 +12,7 @@ main(List<String> args) async {
 
   if (config?.pipesPath != null) {
     path = "${config.pipesPath}";
-    lib = "lib/pipes.dart";
+    lib = config.usePipesFile ? "lib/pipes.dart" : null;
   }
 
   String prefix =  config?.pipesPath != null ? "lib/" : "";
@@ -28,7 +28,7 @@ main(List<String> args) async {
 }
 
 String pipeTemplate(String name) => '''
-import "package:angular2/core.dart";
+import "package:angular/angular.dart";
 
 @Pipe(
   name: '${toLowerCamelCase(name)}'

diff --git a/bin/route.dart b/bin/route.dart
@@ -16,7 +16,7 @@ main(List<String> args) async {
 
   if (config?.routesPath != null) {
     path = "${config.routesPath}/${toTableName(name)}";
-    lib = "lib/routes.dart";
+    lib = config.useRoutesFile ? "lib/routes.dart" : null;
   }
 
   String prefix = config?.routesPath != null ? "lib/" : "";
@@ -26,31 +26,25 @@ main(List<String> args) async {
   String htmlPath = '$filePath.${config.htmlExtension}';
   String cssPath = '$filePath.${config.cssExtension}';
 
-  await writeInFile(dartPath, componentRouteTemplateDart(name, routePath));
+  await writeInFile(dartPath, componentRouteTemplateDart(name));
   await writeInFile(htmlPath, componentTemplateHtml(name));
   await createFile(cssPath);
 
   if (lib != null) {
     addToLibrary("$path/${toTableName(name)}.dart", lib);
-    addToRouteConfig(toUpperCamelCase(name), config?.rootPath);
   }
+  addToRouteConfig(toUpperCamelCase(name), config?.rootPath, routePath, dartPath);
 }
 
-String componentRouteTemplateDart(String name, String path) => '''import 'package:angular2/core.dart';
-import 'package:angular2/router.dart';
+String componentRouteTemplateDart(String name) =>
+    '''import 'package:angular/angular.dart';
 
 @Component(
   selector: '${name.replaceAll("_", "-")}',
   templateUrl: '${toTableName(name)}.html',
-  styleUrls: const <String>['${toTableName(name)}.css'])
+  styleUrls: const ['${toTableName(name)}.css'])
 class ${toUpperCamelCase(name)} implements OnInit {
 
-  static const String route_name = "${toUpperCamelCase(name)}";
-  static const String route_path = "$path";
-  static const Route route = const Route(path: ${toUpperCamelCase(name)}.route_path,
-      component: ${toUpperCamelCase(name)},
-      name: ${toUpperCamelCase(name)}.route_name);
-
   ${toUpperCamelCase(name)}();
 
   @override
@@ -59,18 +53,20 @@ class ${toUpperCamelCase(name)} implements OnInit {
 }
 ''';
 
-addToRouteConfig(String className, String rootPath) {
+addToRouteConfig(String className, String rootPath, String routePath, String dartPath) {
   File rootComponent = new File("lib/$rootPath");
 
   if (rootComponent.existsSync()) {
     String content = rootComponent.readAsStringSync();
-    content = formatter.format(content);
+    if (!config.useRoutesFile) {
+      content = "import 'package:${config.projectName}/${dartPath.replaceFirst('lib/', '')}';\n" + content;
+    }
     content = content.replaceFirst(
-        "/*Insert Routes here*/",
-        '''
-            /*Insert Routes here*/
-            $className.route,
-        ''');
+        new RegExp(r'@RouteConfig\(const\s*\['),
+        """@RouteConfig(const [
+ const Route(path: '$routePath${toPolyName(className)}',
+      component: $className,
+      name: '$className'),""");
     rootComponent.writeAsStringSync(formatter.format(content));
     output("Route Inserted into root component.\n", Color.yellow);
   }

diff --git a/bin/service.dart b/bin/service.dart
@@ -12,7 +12,7 @@ main(List<String> args) async {
 
   if (config?.servicesPath != null) {
     path = "${config.servicesPath}";
-    lib = "lib/services.dart";
+    lib = config.useServicesFile ? "lib/services.dart" : null;
   }
 
   String prefix =  config?.servicesPath != null ? "lib/" : "";
@@ -29,7 +29,7 @@ main(List<String> args) async {
 
 String serviceTemplate(String name) =>
     '''
-import "package:angular2/core.dart";
+import "package:angular/core.dart";
 
 @Injectable()
 class ${toUpperCamelCase(name)} {

diff --git a/bin/template/.analysis_options b/bin/template/.analysis_options
diff --git a/bin/template/.gitignore b/bin/template/.gitignore
diff --git a/bin/template/generator.config.yaml b/bin/template/generator.config.yaml