more fixes

Author: hansl

addon/ng2/commands/init.js addon/ng2/commands/init.tsaddon/ng2/commands/init.js renamed to addon/ng2/commands/init.ts

@@ -1,15 +1,17 @@
 'use strict';
 
-var Command = require('ember-cli/lib/models/command');
-var Promise = require('ember-cli/lib/ext/promise');
-var SilentError = require('silent-error');
-var validProjectName = require('ember-cli/lib/utilities/valid-project-name');
-var normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option');
-var GitInit = require('../tasks/git-init');
-var LinkCli = require('../tasks/link-cli');
-var NpmInstall = require('../tasks/npm-install');
-
-module.exports = Command.extend({
+import LinkCli from '../tasks/link-cli';
+
+const Command = require('ember-cli/lib/models/command');
+const Promise = require('ember-cli/lib/ext/promise');
+const SilentError = require('silent-error');
+const validProjectName = require('ember-cli/lib/utilities/valid-project-name');
+const normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option');
+const GitInit = require('../tasks/git-init');
+const NpmInstall = require('../tasks/npm-install');
+
+
+const InitCommand: any = Command.extend({
   name: 'init',
   description: 'Creates a new angular-cli project in the current folder.',
   aliases: ['i'],
@@ -39,7 +41,7 @@ module.exports = Command.extend({
     }
   },
 
-  run: function (commandOptions, rawArgs) {
+  run: function (commandOptions: any, rawArgs: string[]) {
     if (commandOptions.dryRun) {
       commandOptions.skipNpm = true;
       commandOptions.skipBower = true;
@@ -94,7 +96,7 @@ module.exports = Command.extend({
 
       return Promise.reject(new SilentError(message));
     }
-    
+
     var blueprintOpts = {
       dryRun: commandOptions.dryRun,
       blueprint: commandOptions.blueprint || this._defaultBlueprint(),
@@ -146,4 +148,5 @@ module.exports = Command.extend({
   }
 });
 
-module.exports.overrideCore = true;
+InitCommand.overrideCore = true;
+export default InitCommand;

addon/ng2/commands/new.ts

@@ -5,7 +5,7 @@ const SilentError = require('silent-error');
 const validProjectName = require('ember-cli/lib/utilities/valid-project-name');
 
 const normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option');
-const InitCommand = require('./init');
+import InitCommand from './init';
 
 const NewCommand = Command.extend({
   name: 'new',

addon/ng2/index.js

@@ -12,25 +12,25 @@ module.exports = {
 
   includedCommands: function () {
     return {
-      'build': require('./commands/build'),
-      'serve': require('./commands/serve'),
-      'new': require('./commands/new'),
-      'generate': require('./commands/generate'),
-      'init': require('./commands/init'),
-      'test': require('./commands/test'),
-      'e2e': require('./commands/e2e'),
-      'lint': require('./commands/lint'),
-      'version': require('./commands/version'),
-      'completion': require('./commands/completion'),
-      'doc': require('./commands/doc'),
-      'github-pages-deploy': require('./commands/github-pages-deploy'),
+      'build': require('./commands/build').default,
+      'serve': require('./commands/serve').default,
+      'new': require('./commands/new').default,
+      'generate': require('./commands/generate').default,
+      'init': require('./commands/init').default,
+      'test': require('./commands/test').default,
+      'e2e': require('./commands/e2e').default,
+      'lint': require('./commands/lint').default,
+      'version': require('./commands/version').default,
+      'completion': require('./commands/completion').default,
+      'doc': require('./commands/doc').default,
+      'github-pages-deploy': require('./commands/github-pages-deploy').default,
 
       // Easter eggs.
-      'make-this-awesome': require('./commands/easter-egg'),
+      'make-this-awesome': require('./commands/easter-egg').default,
 
       // Configuration.
-      'set': require('./commands/set'),
-      'get': require('./commands/get')
+      'set': require('./commands/set').default,
+      'get': require('./commands/get').default,
     };
   }
 };

packages/ast-tools/src/ast-utils.ts

@@ -122,31 +122,25 @@ export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
     .filter(expr => {
       if (expr.expression.kind == ts.SyntaxKind.Identifier) {
         const id = <ts.Identifier>expr.expression;
-        console.log(1, id.getFullText(source));
         const metaData = symbols.resolve(id.getFullText(source));
-        console.log(metaData);
         if (isMetadataImportedSymbolReferenceExpression(metaData)) {
           return metaData.name == identifier && metaData.module == module;
         }
       } else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {
-        console.log(2);
         // This covers foo.NgModule when importing * as foo.
         const paExpr = <ts.PropertyAccessExpression>expr.expression;
         // If the left expression is not an identifier, just give up at that point.
         if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {
-          console.log(3);
           return false;
         }
 
         const id = paExpr.name;
         const moduleId = <ts.Identifier>paExpr.expression;
         const moduleMetaData = symbols.resolve(moduleId.getFullText(source));
         if (isMetadataModuleReferenceExpression(moduleMetaData)) {
-          console.log(4);
           return moduleMetaData.module == module && id.getFullText(source) == identifier;
         }
       }
-      console.log(5);
       return false;
     })
     .filter(expr => expr.arguments[0]
@@ -210,6 +204,7 @@ function _addSymbolToNgModuleMetadata(ngModulePath: string, metadataField: strin
     })
     .then((node: ts.Node) => {
       if (!node) {
+        /* eslint-disable no-console */
         console.log('No app module found. Please add your new class to your component.');
         return new NoopChange();
       }