Refactoring files, tests, and fixing linting errors.

Author: hansl

lib/packages.js

@@ -11,7 +11,8 @@ const packages = fs.readdirSync(packageRoot)
   .map(pkgName => ({ name: pkgName, root: path.join(packageRoot, pkgName) }))
   .filter(pkg => fs.statSync(pkg.root).isDirectory())
   .reduce((packages, pkg) => {
-    let name = pkg == 'angular-cli' ? 'angular-cli' : `@angular-cli/${pkg.name}`;
+    let pkgJson = JSON.parse(fs.readFileSync(path.join(pkg.root, 'package.json'), 'utf8'));
+    let name = pkgJson['name'];
     packages[name] = {
       root: pkg.root,
       main: path.resolve(pkg.root, 'src/index.ts')

packages/base-href-webpack/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "experimentalDecorators": true,
     "mapRoot": "",
     "module": "commonjs",
     "moduleResolution": "node",

packages/webpack/package.json

@@ -1,20 +1,11 @@
 {
-  "name": "@angular-cli/webpack",
+  "name": "@ngtools/webpack",
   "version": "1.0.0",
   "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "build:main": "tsc",
-    "test": "echo \"Error: no test specified\" && exit 0"
-  },
-  "author": "Rob Wormald <[email protected]>",
+  "main": "./src/index.js",
   "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^6.0.39",
-    "node-sass": "^3.8.0",
-    "sass-loader": "^4.0.1",
+  "peerDependencies": {
     "typescript": "2.0.2",
-    "webpack": "^2.1.0-beta.21",
     "@angular/compiler-cli": "^0.6.0",
     "@angular/core": "^2.0.0"
   }

packages/webpack/src/codegen.ts

@@ -1,31 +1,22 @@
-import {Observable} from 'rxjs/Rx'
-import * as ts from 'typescript'
-import * as ngCompiler from '@angular/compiler-cli'
-import * as tscWrapped from '@angular/tsc-wrapped'
-import * as tsc from '@angular/tsc-wrapped/src/tsc'
-import * as path from 'path'
-import * as fs from 'fs'
+import {Observable} from 'rxjs/Rx';
+import * as ts from 'typescript';
+import * as ngCompiler from '@angular/compiler-cli';
+
 
 export interface CodeGenOptions {
   program: ts.Program;
   ngcOptions: any;
   i18nOptions: any;
-  resourceLoader?:any; //impl of ResourceLoader
+  resourceLoader?: any;  // Impl of ResourceLoader
   compilerHost: any;
 }
 
-function _readConfig(tsConfigPath){
-    let {config, error} = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
-    if(error){
-      throw error;
-    }
-    return config;
-  }
 
-export function createCodeGenerator({ngcOptions, i18nOptions, resourceLoader, compilerHost}){
+type ProgramFile = { fileName: string, sourceText: string };
 
-  return program => new Observable<{fileName:string, sourceText: string}>(codegenOutput => {
-    //emit files from observable monkeypatch
+export function createCodeGenerator({ngcOptions, i18nOptions, resourceLoader, compilerHost}) {
+  return (program: ts.Program) => new Observable<ProgramFile>(codegenOutput => {
+    // Emit files from observable monkeypatch
     const writeFile = compilerHost.writeFile;
 
     compilerHost.writeFile = (fileName, sourceText) => {
@@ -37,7 +28,7 @@ export function createCodeGenerator({ngcOptions, i18nOptions, resourceLoader, co
       i18nOptions,
       program,
       compilerHost,
-      undefined, //TODO: hook in reflector host context
+      undefined, // TODO: hook in reflector host context
       resourceLoader
     );
 

packages/webpack/src/compiler.ts

@@ -1,17 +1,16 @@
-import * as ngCompiler from '@angular/compiler-cli'
-import * as tscWrapped from '@angular/tsc-wrapped/src/compiler_host'
-import * as ts from 'typescript'
+import * as tscWrapped from '@angular/tsc-wrapped/src/compiler_host';
+import * as ts from 'typescript';
 
 
 export class NgcWebpackCompilerHost extends tscWrapped.DelegatingHost {
-  fileCache:Map<string,string> = new Map<string, string> ()
-  constructor(delegate: ts.CompilerHost){
-    super(delegate);
+  fileCache = new Map<string, string>();
 
+  constructor(delegate: ts.CompilerHost) {
+    super(delegate);
   }
 }
 
-export function createCompilerHost(tsConfig){
-  const delegateHost = ts.createCompilerHost(tsConfig.compilerOptions);
+export function createCompilerHost(tsConfig: any) {
+  const delegateHost = ts.createCompilerHost(tsConfig['compilerOptions']);
   return new NgcWebpackCompilerHost(delegateHost);
 }

packages/webpack/src/loader.ts

@@ -1,9 +1,12 @@
-//super simple TS transpiler loader for testing / isolated usage. does not type check!
-import * as path from 'path'
-import * as fs from 'fs'
-import * as ts from 'typescript'
+import * as ts from 'typescript';
 
-export function ngcLoader(sourceFile){
 
-  return ts.transpileModule(sourceFile, {compilerOptions: {target: ts.ScriptTarget.ES5, module: ts.ModuleKind.ES2015}}).outputText;
+// Super simple TS transpiler loader for testing / isolated usage. does not type check!
+export function ngcLoader(sourceFile: string) {
+  return ts.transpileModule(sourceFile, {
+    compilerOptions: {
+      target: ts.ScriptTarget.ES5,
+      module: ts.ModuleKind.ES2015,
+    }
+  }).outputText;
 }