fix(schematics): use correct date adapter when using moment

Closes #1133

Author: mattlewis92

package.json

@@ -15,7 +15,7 @@
     "build": "run-s build:copy-package-json build:lib build:date-adapters build:styles build:schematics build:copyfiles",
     "test:single": "cross-env TZ=UTC ng test angular-calendar --watch=false --code-coverage",
     "test:watch": "cross-env TZ=UTC ng test angular-calendar",
-    "test:schematics": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} mocha --require ts-node/register projects/angular-calendar/schematics/**/*.spec.ts",
+    "test:schematics": "cross-env TS_NODE_COMPILER_OPTIONS={\\\"module\\\":\\\"commonjs\\\"} TS_NODE_PREFER_TS_EXTS=true mocha --require ts-node/register projects/angular-calendar/schematics/**/*.spec.ts",
     "test": "run-s lint test:single test:schematics build build:clean",
     "lint:styles": "stylelint \"{projects,src}/**/*.scss\" --fix",
     "lint:ts": "ng lint",

projects/angular-calendar/schematics/ng-add/index.spec.ts

@@ -83,7 +83,7 @@ describe('angular-calendar schematics', () => {
 
     const rootModule = tree.readContent(rootModulePath);
 
-    const calendarModuleImport = `import { CalendarModule } from 'angular-calendar'`;
+    const calendarModuleImport = `import { CalendarModule, DateAdapter } from 'angular-calendar';`;
     expect(rootModule).contain(calendarModuleImport);
   });
 
@@ -100,4 +100,30 @@ describe('angular-calendar schematics', () => {
     expect(styles[0]).to.contains(defaultAngularCalendarStylePath);
     expect(stylesTest[0]).to.contains(defaultAngularCalendarStylePath);
   });
+
+  it('should add the momentAdapterFactory when using moment', async () => {
+    const rootModulePath = `/projects/${projectName}/src/app/app.module.ts`;
+    tree = await runner
+      .runSchematicAsync(
+        'ng-add',
+        {
+          ...defaultOptions,
+          dateAdapter: 'moment'
+        },
+        appTree
+      )
+      .toPromise();
+    expect(tree.files).contain(rootModulePath);
+
+    const rootModule = tree.readContent(rootModulePath);
+
+    expect(rootModule).contain(
+      `import { adapterFactory } from 'angular-calendar/date-adapters/moment';`
+    );
+    expect(rootModule).contain(`import * as moment from 'moment';`);
+    expect(rootModule).contain(`export function momentAdapterFactory() {
+  return adapterFactory(moment);
+}`);
+    expect(rootModule).contain(`useFactory: momentAdapterFactory`);
+  });
 });

projects/angular-calendar/schematics/ng-add/index.ts

@@ -21,7 +21,9 @@ import {
   addStyle,
   getSourceFile,
   getProjectMainFile,
-  getProjectFromWorkspace
+  getProjectFromWorkspace,
+  insertWildcardImport,
+  insertAfterImports
 } from '../utils';
 
 import { Schema } from './schema';
@@ -109,31 +111,56 @@ function addModuleToImports(options: Schema): Rule {
     const appModulePath = options.module
       ? options.module
       : getAppModulePath(host, mainPath);
-    const moduleSource = getSourceFile(host, appModulePath);
-    const moduleName = `CalendarModule.forRoot({ provide: DateAdapter, useFactory: adapterFactory })`;
+    const moduleName = `CalendarModule.forRoot({ provide: DateAdapter, useFactory: ${
+      options.dateAdapter === 'moment'
+        ? 'momentAdapterFactory'
+        : 'adapterFactory'
+    } })`;
     const moduleCalendarSrc = 'angular-calendar';
-    const PEER_DEPENDENCIES = ['DateAdapter', 'adapterFactory'];
 
     addModuleImportToRootModule(host, moduleName, moduleCalendarSrc, project);
 
-    const peerDependencyChange1 = insertImport(
-      moduleSource as ts.SourceFile,
-      appModulePath,
-      PEER_DEPENDENCIES[0],
-      moduleCalendarSrc
-    ) as InsertChange;
+    const moduleSource = getSourceFile(host, appModulePath);
 
-    const peerDependencyChange2 = insertImport(
-      moduleSource as ts.SourceFile,
-      appModulePath,
-      PEER_DEPENDENCIES[1],
-      `${moduleCalendarSrc}/date-adapters/${options.dateAdapter}`
-    ) as InsertChange;
+    const updates: InsertChange[] = [
+      insertImport(
+        moduleSource as ts.SourceFile,
+        appModulePath,
+        'DateAdapter',
+        moduleCalendarSrc
+      ) as InsertChange,
+      insertImport(
+        moduleSource as ts.SourceFile,
+        appModulePath,
+        'adapterFactory',
+        `${moduleCalendarSrc}/date-adapters/${options.dateAdapter}`
+      ) as InsertChange
+    ];
+
+    if (options.dateAdapter === 'moment') {
+      updates.push(
+        insertWildcardImport(
+          moduleSource as ts.SourceFile,
+          appModulePath,
+          'moment',
+          'moment'
+        ) as InsertChange
+      );
+      updates.push(
+        insertAfterImports(
+          moduleSource as ts.SourceFile,
+          appModulePath,
+          `;\n\nexport function momentAdapterFactory() {
+  return adapterFactory(moment);
+}`
+        ) as InsertChange
+      );
+    }
 
     const recorder = host.beginUpdate(appModulePath);
-
-    recorder.insertLeft(peerDependencyChange1.pos, peerDependencyChange1.toAdd);
-    recorder.insertLeft(peerDependencyChange2.pos, peerDependencyChange2.toAdd);
+    updates.forEach(update => {
+      recorder.insertLeft(update.pos, update.toAdd);
+    });
     host.commitUpdate(recorder);
 
     return host;

projects/angular-calendar/schematics/utils/ast.ts

@@ -1,8 +1,13 @@
 import { Tree, SchematicsException } from '@angular-devkit/schematics';
 import { InsertChange, Change } from '@schematics/angular/utility/change';
-import { addImportToModule } from '@schematics/angular/utility/ast-utils';
+import {
+  addImportToModule,
+  findNodes,
+  insertAfterLastOccurrence
+} from '@schematics/angular/utility/ast-utils';
 import { getAppModulePath } from '@schematics/angular/utility/ng-ast-utils';
 import { WorkspaceProject } from '@schematics/angular/utility/workspace-models';
+import * as ts from 'typescript';
 
 import { getSourceFile } from './file';
 
@@ -64,3 +69,32 @@ function addModuleImportToModule(
 
   host.commitUpdate(recorder);
 }
+
+export function insertAfterImports(
+  source: ts.SourceFile,
+  fileToEdit: string,
+  toInsert: string
+): Change {
+  const allImports = findNodes(source, ts.SyntaxKind.ImportDeclaration);
+
+  return insertAfterLastOccurrence(
+    allImports,
+    toInsert,
+    fileToEdit,
+    0,
+    ts.SyntaxKind.StringLiteral
+  );
+}
+
+export function insertWildcardImport(
+  source: ts.SourceFile,
+  fileToEdit: string,
+  symbolName: string,
+  fileName: string
+): Change {
+  return insertAfterImports(
+    source,
+    fileToEdit,
+    `;\nimport * as ${symbolName} from '${fileName}'`
+  );
+}