devextreme-schematics 1.2.23 → 1.3.0

package/src/add-layout/index_spec.ts

@@ -210,8 +210,8 @@ describe('layout', () => {
     const budgets = angularContent.projects.testApp.architect.build.configurations.production.budgets;
     const defaultBudget = {
       type: 'initial',
-      maximumWarning: '2mb',
-      maximumError: '5mb'
+      maximumWarning: '500kb',
+      maximumError: '1mb'
     };
 
     expect(budgets.length).toBe(2);

package/src/add-layout/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsDevextremeAddLayout",
+  "$id": "SchematicsDevextremeAddLayout",
   "title": "Add a DevExtreme layout to a DevExtreme Angular application",
   "type": "object",
   "properties": {
@@ -49,7 +49,7 @@
     },
     "globalNgCliVersion": {
       "type":"string",
-      "default": "^11.2.9"
+      "default": "^12.0.0"
     }
   }
 }

package/src/add-sample-views/index.d.ts

@@ -1,2 +1,2 @@
-import { Rule } from '@angular-devkit/schematics';
-export default function (options: any): Rule;
+import { Rule } from '@angular-devkit/schematics';
+export default function (options: any): Rule;

package/src/add-sample-views/index.js

@@ -1,42 +1,51 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular-devkit/schematics");
-const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-const add_view_1 = require("../add-view");
-const project_1 = require("../utility/project");
-const string_1 = require("../utility/string");
-const change_1 = require("../utility/change");
-const source_1 = require("../utility/source");
-const sampleViewOptions = [
-    {
-        name: 'home',
-        componentName: 'HomeComponent',
-        relativePath: './pages/home/home.component'
-    }, {
-        name: 'profile',
-        componentName: 'ProfileComponent',
-        relativePath: './pages/profile/profile.component'
-    }, {
-        name: 'tasks',
-        componentName: 'TasksComponent',
-        relativePath: './pages/tasks/tasks.component'
-    }
-];
-const devextremeOptions = [
-    {
-        componentName: 'DxDataGridModule',
-        relativePath: 'devextreme-angular'
-    }, {
-        componentName: 'DxFormModule',
-        relativePath: 'devextreme-angular'
-    }
-];
-const navigations = [
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const schematics_1 = require("@angular-devkit/schematics");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const add_view_1 = require("../add-view");
+const project_1 = require("../utility/project");
+const string_1 = require("../utility/string");
+const change_1 = require("../utility/change");
+const source_1 = require("../utility/source");
+const sampleViewOptions = [
+    {
+        name: 'home',
+        componentName: 'HomeComponent',
+        relativePath: './pages/home/home.component'
+    }, {
+        name: 'profile',
+        componentName: 'ProfileComponent',
+        relativePath: './pages/profile/profile.component'
+    }, {
+        name: 'tasks',
+        componentName: 'TasksComponent',
+        relativePath: './pages/tasks/tasks.component'
+    }
+];
+const devextremeOptions = [
+    {
+        componentName: 'DxDataGridModule',
+        relativePath: 'devextreme-angular'
+    }, {
+        componentName: 'DxFormModule',
+        relativePath: 'devextreme-angular'
+    }
+];
+const navigations = [
     `  {
     text: 'Home',
     path: '/home',
     icon: 'home'
-  }`,
+  }`,
     `  {
     text: 'Examples',
     icon: 'folder',
@@ -50,57 +59,57 @@ const navigations = [
         path: '/tasks'
       }
     ]
-  }`
-];
-function addImportsToRoutingModule(isView, routingPath, options) {
-    return (host) => {
-        const source = source_1.getSourceFile(host, routingPath);
-        if (!source) {
-            return host;
-        }
-        let changes;
-        if (isView) {
-            changes = ast_utils_1.addDeclarationToModule(source, routingPath, options.componentName, options.relativePath);
-        }
-        else {
-            changes = ast_utils_1.addImportToModule(source, routingPath, options.componentName, options.relativePath);
-        }
-        return change_1.applyChanges(host, changes, routingPath);
-    };
-}
-function addDefaultNavigation(rootPath) {
-    return (host) => {
-        const navigationPath = rootPath + 'app-navigation.ts';
-        navigations.forEach((navigation) => {
-            const navigationSource = source_1.getSourceFile(host, navigationPath);
-            change_1.insertItemToArray(host, navigationPath, navigationSource, navigation, { location: 'end' });
-        });
-        return host;
-    };
-}
-function default_1(options) {
-    return (host) => {
-        const project = project_1.getProjectName(host, options.project);
-        const rootPath = project_1.getApplicationPath(host, project);
-        const routingPath = rootPath + 'app-routing.module.ts';
-        const rules = [];
-        const templateSource = schematics_1.apply(schematics_1.url('./files'), [
-            schematics_1.template({
-                project: string_1.humanize(project)
-            }),
-            schematics_1.move(rootPath)
-        ]);
-        rules.push(schematics_1.mergeWith(templateSource));
-        sampleViewOptions.forEach((viewOptions) => {
-            rules.push(add_view_1.addViewToRouting({ name: viewOptions.name, project, module: 'app-routing' }));
-            rules.push(addImportsToRoutingModule(true, routingPath, viewOptions));
-        });
-        devextremeOptions.forEach((moduleOptions) => {
-            rules.push(addImportsToRoutingModule(false, routingPath, moduleOptions));
-        });
-        rules.push(addDefaultNavigation(rootPath));
-        return schematics_1.chain(rules);
-    };
-}
-exports.default = default_1;
+  }`
+];
+function addImportsToRoutingModule(isView, routingPath, options) {
+    return (host) => {
+        const source = source_1.getSourceFile(host, routingPath);
+        if (!source) {
+            return host;
+        }
+        let changes;
+        if (isView) {
+            changes = ast_utils_1.addDeclarationToModule(source, routingPath, options.componentName, options.relativePath);
+        }
+        else {
+            changes = ast_utils_1.addImportToModule(source, routingPath, options.componentName, options.relativePath);
+        }
+        return change_1.applyChanges(host, changes, routingPath);
+    };
+}
+function addDefaultNavigation(rootPath) {
+    return (host) => {
+        const navigationPath = rootPath + 'app-navigation.ts';
+        navigations.forEach((navigation) => {
+            const navigationSource = source_1.getSourceFile(host, navigationPath);
+            change_1.insertItemToArray(host, navigationPath, navigationSource, navigation, { location: 'end' });
+        });
+        return host;
+    };
+}
+function default_1(options) {
+    return (host) => __awaiter(this, void 0, void 0, function* () {
+        const project = yield project_1.getProjectName(host, options.project);
+        const rootPath = yield project_1.getApplicationPath(host, project);
+        const routingPath = rootPath + 'app-routing.module.ts';
+        const rules = [];
+        const templateSource = schematics_1.apply(schematics_1.url('./files'), [
+            schematics_1.template({
+                project: string_1.humanize(project)
+            }),
+            schematics_1.move(rootPath)
+        ]);
+        rules.push(schematics_1.mergeWith(templateSource));
+        sampleViewOptions.forEach((viewOptions) => {
+            rules.push(add_view_1.addViewToRouting({ name: viewOptions.name, project, module: 'app-routing' }));
+            rules.push(addImportsToRoutingModule(true, routingPath, viewOptions));
+        });
+        devextremeOptions.forEach((moduleOptions) => {
+            rules.push(addImportsToRoutingModule(false, routingPath, moduleOptions));
+        });
+        rules.push(addDefaultNavigation(rootPath));
+        return schematics_1.chain(rules);
+    });
+}
+exports.default = default_1;
 //# sourceMappingURL=index.js.map

package/src/add-sample-views/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2DASoC;AAEpC,qEAG+C;AAE/C,0CAA+C;AAE/C,gDAG6B;AAE7B,8CAA6C;AAE7C,8CAG4B;AAE5B,8CAAkD;AAElD,MAAM,iBAAiB,GAAG;IACxB;QACE,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,eAAe;QAC9B,YAAY,EAAE,6BAA6B;KAC5C,EAAE;QACD,IAAI,EAAE,SAAS;QACf,aAAa,EAAE,kBAAkB;QACjC,YAAY,EAAE,mCAAmC;KAClD,EAAE;QACD,IAAI,EAAE,OAAO;QACb,aAAa,EAAE,gBAAgB;QAC/B,YAAY,EAAE,+BAA+B;KAChD;CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG;IACxB;QACE,aAAa,EAAE,kBAAkB;QACjC,YAAY,EAAE,oBAAoB;KACnC,EAAE;QACD,aAAa,EAAE,cAAc;QAC7B,YAAY,EAAE,oBAAoB;KACrC;CAAC,CAAC;AAEH,MAAM,WAAW,GAAG;IAClB;;;;IAIE;IACF;;;;;;;;;;;;;IAaE;CACH,CAAC;AAEF,SAAS,yBAAyB,CAAC,MAAe,EAAE,WAAmB,EAAE,OAAY;IACnF,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,sBAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEhD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,IAAI,OAAO,CAAC;QAEZ,IAAI,MAAM,EAAE;YACV,OAAO,GAAG,kCAAsB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SACpG;aAAM;YACL,OAAO,GAAG,6BAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SAC/F;QAED,OAAO,qBAAY,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,cAAc,GAAG,QAAQ,GAAG,mBAAmB,CAAC;QAEtD,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACjC,MAAM,gBAAgB,GAAG,sBAAa,CAAC,IAAI,EAAE,cAAc,CAAE,CAAC;YAC9D,0BAAiB,CAAC,IAAI,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,mBAAwB,OAAY;IAClC,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,MAAM,wBAAc,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,4BAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,QAAQ,GAAG,uBAAuB,CAAC;QACvD,MAAM,KAAK,GAAU,EAAE,CAAC;QAExB,MAAM,cAAc,GAAG,kBAAK,CAAC,gBAAG,CAAC,SAAS,CAAC,EAAE;YAC3C,qBAAQ,CAAC;gBACP,OAAO,EAAE,iBAAQ,CAAC,OAAO,CAAC;aAC3B,CAAC;YACF,iBAAI,CAAC,QAAQ,CAAC;SACf,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,sBAAS,CAAC,cAAc,CAAC,CAAC,CAAC;QAEtC,iBAAiB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACxC,KAAK,CAAC,IAAI,CAAC,2BAAgB,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;YACzF,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;QAEH,iBAAiB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC1C,KAAK,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3C,OAAO,kBAAK,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAA,CAAC;AACJ,CAAC;AA7BD,4BA6BC"}

package/src/add-sample-views/index.ts

@@ -110,9 +110,9 @@ function addDefaultNavigation(rootPath: string) {
 }
 
 export default function(options: any): Rule {
-  return (host: Tree) => {
-    const project = getProjectName(host, options.project);
-    const rootPath = getApplicationPath(host, project);
+  return async (host: Tree) => {
+    const project = await getProjectName(host, options.project);
+    const rootPath = await getApplicationPath(host, project);
     const routingPath = rootPath + 'app-routing.module.ts';
     const rules: any[] = [];
 

package/src/add-sample-views/index_spec.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/src/add-sample-views/index_spec.js

@@ -1,52 +1,53 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const testing_1 = require("@angular-devkit/schematics/testing");
-const path = require("path");
-const collectionPath = path.join(__dirname, '../collection.json');
-describe('sample views', () => {
-    const appOptions = {
-        name: 'testApp',
-        projectRoot: '',
-        inlineStyle: false,
-        inlineTemplate: false,
-        routing: true,
-        style: 'css',
-        skipTests: false,
-        skipPackageJson: false
-    };
-    const workspaceOptions = {
-        name: 'workspace',
-        version: '6.0.0'
-    };
-    const sampleViewsOptions = {
-        project: 'testApp'
-    };
-    const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
-    const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
-    let appTree;
-    beforeEach(() => __awaiter(this, void 0, void 0, function* () {
-        appTree = yield schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-        appTree = yield schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
-    }));
-    it('should add sample views', () => __awaiter(this, void 0, void 0, function* () {
-        const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
-        let tree = yield runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
-        tree = yield runner.runSchematicAsync('add-sample-views', sampleViewsOptions, tree).toPromise();
-        const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
-        expect(moduleContent).toMatch(/component: HomeComponent/);
-        expect(moduleContent).toMatch(/path: 'home'/);
-        expect(moduleContent).toMatch(/import { HomeComponent } from /);
-        expect(moduleContent).toMatch(/declarations: \[HomeComponent/);
-        const navigationContent = tree.readContent('/src/app/app-navigation.ts');
-        expect(navigationContent).toMatch(/text: 'Home'/);
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const testing_1 = require("@angular-devkit/schematics/testing");
+const path = require("path");
+const collectionPath = path.join(__dirname, '../collection.json');
+describe('sample views', () => {
+    const appOptions = {
+        name: 'testApp',
+        projectRoot: '',
+        inlineStyle: false,
+        inlineTemplate: false,
+        routing: true,
+        style: 'css',
+        skipTests: false,
+        skipPackageJson: false
+    };
+    const workspaceOptions = {
+        name: 'workspace',
+        version: '6.0.0'
+    };
+    const sampleViewsOptions = {
+        project: 'testApp'
+    };
+    const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
+    const schematicRunner = new testing_1.SchematicTestRunner('@schematics/angular', angularSchematicsCollection);
+    let appTree;
+    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        appTree = yield schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
+        appTree = yield schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
+    }));
+    it('should add sample views', () => __awaiter(void 0, void 0, void 0, function* () {
+        const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
+        let tree = yield runner.runSchematicAsync('add-layout', { layout: 'side-nav-outer-toolbar' }, appTree).toPromise();
+        tree = yield runner.runSchematicAsync('add-sample-views', sampleViewsOptions, tree).toPromise();
+        const moduleContent = tree.readContent('/src/app/app-routing.module.ts');
+        expect(moduleContent).toMatch(/component: HomeComponent/);
+        expect(moduleContent).toMatch(/path: 'home'/);
+        expect(moduleContent).toMatch(/import { HomeComponent } from /);
+        expect(moduleContent).toMatch(/declarations:\s\[\n*\s*HomeComponent/);
+        const navigationContent = tree.readContent('/src/app/app-navigation.ts');
+        expect(navigationContent).toMatch(/text: 'Home'/);
         expect(navigationContent).toContain(`export const navigation = [
   {
     text: 'Home',
@@ -67,7 +68,7 @@ describe('sample views', () => {
       }
     ]
   }
-];`);
-    }));
-});
+];`);
+    }));
+});
 //# sourceMappingURL=index_spec.js.map

package/src/add-sample-views/index_spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9F,OAAO,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;IACpG,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QACnH,IAAI,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QAEhG,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAChE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAE/D,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;GAoBrC,CAAC,CAAC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gEAAuF;AAEvF,6BAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,UAAU,GAAQ;QACtB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,KAAK;QACrB,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,KAAK;QAChB,eAAe,EAAE,KAAK;KACvB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,MAAM,kBAAkB,GAAQ;QAC9B,OAAO,EAAE,SAAS;KACnB,CAAC;IAEF,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IAC9G,MAAM,eAAe,GAAG,IAAI,6BAAmB,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,CAAC;IACpG,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,GAAS,EAAE;QACpB,OAAO,GAAI,MAAM,eAAe,CAAC,iBAAiB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,SAAS,EAAE,CAAC;QAC9F,OAAO,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;IACpG,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAS,EAAE;QACvC,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,IAAI,IAAI,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;QACnH,IAAI,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QAEhG,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,CAAC;QAEzE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC1D,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;QAChE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;QAEtE,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QACzE,MAAM,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,MAAM,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;GAoBrC,CAAC,CAAC;IACH,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/add-sample-views/index_spec.ts

@@ -45,7 +45,7 @@ describe('sample views', () => {
     expect(moduleContent).toMatch(/path: 'home'/);
 
     expect(moduleContent).toMatch(/import { HomeComponent } from /);
-    expect(moduleContent).toMatch(/declarations: \[HomeComponent/);
+    expect(moduleContent).toMatch(/declarations:\s\[\n*\s*HomeComponent/);
 
     const navigationContent = tree.readContent('/src/app/app-navigation.ts');
     expect(navigationContent).toMatch(/text: 'Home'/);

package/src/add-sample-views/schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsDevextremeAddSamplesViews",
+  "$id": "SchematicsDevextremeAddSamplesViews",
   "title": "Add sample views to a DevExtreme Angular application",
   "type": "object",
   "properties": {

package/src/add-view/index.d.ts

@@ -1,3 +1,3 @@
-import { Rule } from '@angular-devkit/schematics';
-export declare function addViewToRouting(options: any): (host: import("@angular-devkit/schematics/src/tree/interface").Tree) => import("@angular-devkit/schematics/src/tree/interface").Tree;
-export default function (options: any): Rule;
+import { Rule, Tree } from '@angular-devkit/schematics';
+export declare function addViewToRouting(options: any): (host: Tree) => Promise<import("@angular-devkit/schematics/src/tree/interface").Tree>;
+export default function (options: any): Rule;