Directory restructuring

clbond · clbond · commit 44e13a1962b4 · 2017-02-09T14:32:48.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -5,14 +5,16 @@ node_modules
 **/*.orig
 **/*.rej
 
-modules/**/*.ngfactory.ts
-modules/**/*.ngfactory.js
-modules/**/*.ngsummary.json
-modules/**/*.ngstyle.ts
-modules/**/*.shim.ts
-modules/**/*.shim.jsq
-modules/**/*.metadata.json
-modules/**/*.js
-modules/**/*.js.map
+source/**/*.ngfactory.ts
+source/**/*.ngfactory.js
+source/**/*.ngsummary.json
+source/**/*.ngstyle.ts
+source/**/*.shim.ts
+source/**/*.shim.jsq
+source/**/*.metadata.json
+source/**/*.js
+source/**/*.js.map
 
 npm-debug.*
+
+.DS_Store
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,22 +1,23 @@
 module.exports = function (config) {
-  const coverage = config.singleRun ? ['coverage'] : [];
-
   config.set({
     frameworks: [
       'jasmine',
-      'source-map-support',
       'karma-typescript',
     ],
 
     files: [
-      {pattern: 'source/**/*.ts'},
+      {pattern: './source/**/*.ts'},
     ],
 
     preprocessors: {
-      '**/*.ts': ['karma-typescript', ...coverage],
+      '**/*.ts': ['karma-typescript'],
     },
 
-    reporters: ['spec', 'progress', 'karma-typescript'],
+    reporters: [
+      'spec',
+      'progress',
+      'karma-typescript',
+    ],
 
     browsers: ['Chrome'],
 
diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
     "prebuild": "rimraf build",
     "build": "tsc",
     "watch": "tsc --watch",
+    "pretest": "rimraf coverage",
     "test": "karma start --singleRun=true"
   },
   "repository": {
@@ -54,7 +55,10 @@
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-jasmine": "^1.1.0",
+    "karma-remap-istanbul": "0.1.1",
     "karma-source-map-support": "^1.2.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-sourcemap-writer": "^0.1.2",
     "karma-spec-reporter": "0.0.26",
     "karma-typescript": "^2.1.7"
   }
diff --git a/source/exception/exception.ts b/source/exception/exception.ts
diff --git a/source/exception/index.ts b/source/exception/index.ts
@@ -0,0 +1 @@
+export * from './exception';
diff --git a/source/index.ts b/source/index.ts
@@ -1,3 +1,4 @@
 export * from './cache';
+export * from './exception';
 export * from './platform';
 export * from './renderer';
diff --git a/source/renderer/impl/index.ts b/source/renderer/impl/index.ts
diff --git a/source/renderer/index.ts b/source/renderer/index.ts
@@ -1,4 +1,5 @@
-export * from './impl';
+export * from './module';
+export * from './render';
+export * from './route';
 export * from './snapshot';
-export * from './types';
 export * from './variance';
diff --git a/source/renderer/module/exception.ts b/source/renderer/module/exception.ts
@@ -0,0 +1,3 @@
+import {Exception} from '../../exception';
+
+export class BootstrapException extends Exception {}
diff --git a/source/renderer/module/index.ts b/source/renderer/module/index.ts
@@ -0,0 +1,2 @@
+export * from './exception';
+export * from './module';
diff --git a/source/renderer/module/module.ts b/source/renderer/module/module.ts
@@ -5,11 +5,11 @@ import {
   Type
 } from '@angular/core';
 
-import {
-  BootstrapException,
-  RenderVariantOperation,
-  ComposedTransition,
-} from '../types';
+import {BootstrapException} from './exception';
+
+import {ComposedTransition} from '../variance';
+
+import {RenderVariantOperation} from '../render';
 
 export const browserModuleToServerModule = <M, V>(vop: RenderVariantOperation<M, V>): Type<any> => {
   const moduleType = adjustModule(vop.scope.moduleType);
diff --git a/source/renderer/render/exception.ts b/source/renderer/render/exception.ts
@@ -0,0 +1,3 @@
+import {Exception} from '../../exception';
+
+export class RenderException extends Exception {}
diff --git a/source/renderer/render/index.ts b/source/renderer/render/index.ts
@@ -0,0 +1,5 @@
+export * from './exception';
+export * from './operation';
+export * from './render';
+export * from './state-reader';
+export * from './template';
diff --git a/source/renderer/render/operation.ts b/source/renderer/render/operation.ts
@@ -1,21 +1,27 @@
 import {Type} from '@angular/core';
 
-import {RenderRoute} from './route';
+import {Route} from '../route';
+
 import {StateReader} from './state-reader';
+
 import {TemplateDocument} from './template';
-import {Variant, ComposedTransition} from './variance';
+
+import {
+  ComposedTransition,
+  Variant
+} from '../variance';
 
 export interface RenderOperation<M, V> {
   template: TemplateDocument;
   moduleType: Type<M>;
-  routes: Array<RenderRoute>;
+  routes: Array<Route>;
   variance: Array<[V, ComposedTransition]>;
   stateReader?: StateReader;
 }
 
 export interface RenderVariantOperation<M, V> {
   scope: RenderOperation<M, V>;
-  route: RenderRoute;
+  route: Route;
   variance: V;
   transition: ComposedTransition;
 }
diff --git a/source/renderer/render/render.ts b/source/renderer/render/render.ts
@@ -3,17 +3,20 @@ import {Type} from '@angular/core';
 import {Observable} from 'rxjs';
 
 import {
-  RenderOperation,
-  RenderVariantOperation,
-  RenderRoute,
+  Route,
   RouteException,
-} from '../types';
+} from '../route';
 
 import {acquirePlatform} from '../../platform';
 
+import {browserModuleToServerModule} from '../module';
+
 import {Snapshot, snapshot} from '../snapshot';
 
-import {browserModuleToServerModule} from './module';
+import {
+  RenderOperation,
+  RenderVariantOperation,
+} from './operation';
 
 export const render = <M, V>(operation: RenderOperation<M, V>): Observable<Snapshot<V>> => {
   return Observable.create(publish => {
diff --git a/source/renderer/render/state-reader.ts b/source/renderer/render/state-reader.ts
diff --git a/source/renderer/render/template.ts b/source/renderer/render/template.ts
diff --git a/source/renderer/route/exception.ts b/source/renderer/route/exception.ts
@@ -0,0 +1,3 @@
+import {Exception} from '../../exception';
+
+export class RouteException extends Exception {}
diff --git a/source/renderer/route/index.ts b/source/renderer/route/index.ts
@@ -0,0 +1,3 @@
+export * from './exception';
+export * from './route';
+export * from './transform';
diff --git a/source/renderer/route/route.ts b/source/renderer/route/route.ts
@@ -1,4 +1,4 @@
-export interface RenderRoute {
+export interface Route {
   path: Array<string>;
   parameters: Map<string, string>;
-}
+}
diff --git a/source/renderer/route/transform.ts b/source/renderer/route/transform.ts
@@ -1,6 +1,8 @@
-import {RouteException, RenderRoute} from '../types';
+import {Route} from './route';
 
-export const routeToUri = (route: RenderRoute): string => {
+import {RouteException} from './exception';
+
+export const routeToUri = (route: Route): string => {
   const split = route.path.reduce((p, c) => p.concat(c.split('/')), []);
 
   const mapped = split.map(component => {
diff --git a/source/renderer/snapshot/exception.ts b/source/renderer/snapshot/exception.ts
@@ -0,0 +1,3 @@
+import {Exception} from '../../exception';
+
+export class SnapshotException extends Exception {}
diff --git a/source/renderer/snapshot/index.ts b/source/renderer/snapshot/index.ts
@@ -1,3 +1,4 @@
 export * from './document';
+export * from './exception';
 export * from './snapshot';
 export * from './stable';
diff --git a/source/renderer/snapshot/snapshot.ts b/source/renderer/snapshot/snapshot.ts
@@ -1,9 +1,8 @@
 import {NgModuleRef} from '@angular/core';
 
-import {
-  RenderVariantOperation,
-  SnapshotException
-} from '../types';
+import {SnapshotException} from './exception';
+
+import {RenderVariantOperation} from '../render/operation';
 
 import {waitStable} from './stable';
 
diff --git a/source/renderer/types/exception.ts b/source/renderer/types/exception.ts
diff --git a/source/renderer/types/index.ts b/source/renderer/types/index.ts
diff --git a/source/renderer/variance/contracts.ts b/source/renderer/variance/contracts.ts
diff --git a/source/renderer/variance/index.ts b/source/renderer/variance/index.ts
@@ -1 +1,3 @@
-export * from './permutations';
+export * from './contracts';
+export * from './permutations';
+export * from './transition';
diff --git a/source/renderer/variance/permutations.ts b/source/renderer/variance/permutations.ts
@@ -1,5 +1,4 @@
 import {
-  NgModuleRef,
   Injector,
   ReflectiveInjector,
   Type
@@ -8,9 +7,10 @@ import {
 import {
   Variant,
   VariantDefinitions,
-  ComposedTransition,
-  StateTransition,
-} from '../types';
+  ComposedTransition
+} from './contracts';
+
+import {StateTransition} from './transition';
 
 export const permutations =
     <V>(variance: VariantDefinitions): Array<[V, ComposedTransition]> => {
diff --git a/source/renderer/variance/transition.ts b/source/renderer/variance/transition.ts
diff --git a/source/tests/application-basic.ts b/source/tests/application-basic.ts
diff --git a/source/tests/document.ts b/source/tests/document.ts
diff --git a/source/tests/permutations.ts b/source/tests/permutations.ts
@@ -1,7 +1,7 @@
 import {
   permutations,
   ComposedTransition,
-} from '../source';
+} from '..';
 
 describe('variant permutations', () => {
   it('should return all permutations of variant options', () => {
diff --git a/source/tests/render.ts b/source/tests/render.ts
@@ -1,7 +1,7 @@
 import {
   RenderOperation,
   render,
-} from '../source';
+} from '..';
 
 describe('renderer', () => {
   it('should be able to render a basic application', () => {
diff --git a/tsconfig.json b/tsconfig.json
@@ -4,17 +4,12 @@
     "lib": ["es2016", "dom"],
     "module": "commonjs",
     "moduleResolution": "node",
-    "sourceRoot": "source",
     "sourceMap": false,
+    "sourceRoot": "source",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "inlineSourceMap": true,
     "declaration": true,
     "outDir": "build"
-  },
-  "exclude": [
-    "build",
-    "node_modules",
-    "tests"
-  ]
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import {Exception} from '../../exception';`
	`2`	`+`
	`3`	`+export class BootstrapException extends Exception {}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+export * from './exception';`
	`2`	`+export * from './module';`