@ngxs/store 3.8.1-dev.master-d2f9ef4 → 3.8.1-dev.master-22a8ab1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngxs/store",
-  "version": "3.8.1-dev.master-d2f9ef4",
+  "version": "3.8.1-dev.master-22a8ab1",
   "license": "MIT",
   "sideEffects": false,
   "peerDependencies": {

package/schematics/src/ng-add/add-declaration.d.ts

@@ -0,0 +1,4 @@
+import { Rule } from '@angular-devkit/schematics';
+import { NormalizedNgxsPackageSchema } from './ng-add.factory';
+export declare function addDeclarationToStandaloneApp(options: NormalizedNgxsPackageSchema): Rule;
+export declare function addDeclarationToNonStandaloneApp(options: NormalizedNgxsPackageSchema): Rule;

package/schematics/src/ng-add/add-declaration.js

@@ -0,0 +1,109 @@
+"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 });
+exports.addDeclarationToNonStandaloneApp = exports.addDeclarationToStandaloneApp = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const rules_1 = require("../utils/ng-utils/standalone/rules");
+const util_1 = require("../utils/ng-utils/standalone/util");
+const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const app_config_1 = require("../utils/ng-utils/standalone/app_config");
+const lib_config_1 = require("../utils/common/lib.config");
+function addDeclarationToStandaloneApp(options) {
+    return (host) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const mainFilePath = yield (0, util_1.getMainFilePath)(host, options.project);
+        const bootstrapCall = (0, util_1.findBootstrapApplicationCall)(host, mainFilePath);
+        const appConfigFilePath = ((_a = (0, app_config_1.findAppConfig)(bootstrapCall, host, mainFilePath)) === null || _a === void 0 ? void 0 : _a.filePath) || mainFilePath;
+        const plugins = options.plugins
+            .filter(p => pluginData.has(p))
+            .map((p) => [p, pluginData.get(p).standalone]);
+        const importPluginRules = plugins.map(([plugin, standaloneDeclaration]) => {
+            return importTree => {
+                const change = (0, ast_utils_1.insertImport)((0, util_1.getSourceFile)(host, appConfigFilePath), appConfigFilePath, standaloneDeclaration, plugin);
+                (0, util_1.applyChangesToFile)(importTree, appConfigFilePath, [change]);
+            };
+        });
+        const pluginDeclarations = plugins
+            .map(([, standaloneDeclaration]) => `${standaloneDeclaration}()`)
+            .join(',\n');
+        return (0, schematics_1.chain)([
+            ...importPluginRules,
+            (0, rules_1.addRootProvider)(options.project, ({ code, external }) => code `${external('provideStore', '@ngxs/store')}(\n[],\n${pluginDeclarations})`)
+        ]);
+    });
+}
+exports.addDeclarationToStandaloneApp = addDeclarationToStandaloneApp;
+function addDeclarationToNonStandaloneApp(options) {
+    const pluginRules = options.plugins
+        .map(p => { var _a; return [p, (_a = pluginData.get(p)) === null || _a === void 0 ? void 0 : _a.module]; })
+        .filter((v) => !!v[1])
+        .map(([plugin, moduleName]) => {
+        return (0, rules_1.addRootImport)(options.project, ({ code, external }) => code `${external(moduleName, plugin)}.forRoot()`);
+    });
+    const importPath = '@ngxs/store';
+    const moduleImportExtras = '.forRoot([], { developmentMode: /** !environment.production */ false, selectorOptions: { suppressErrors: false, injectContainerState: false } })';
+    return (0, schematics_1.chain)([
+        (0, rules_1.addRootImport)(options.project, ({ code, external }) => code `${external('NgxsModule', importPath)}${moduleImportExtras}`),
+        ...pluginRules
+    ]);
+}
+exports.addDeclarationToNonStandaloneApp = addDeclarationToNonStandaloneApp;
+const pluginData = new Map([
+    [
+        lib_config_1.LIBRARIES.DEVTOOLS,
+        {
+            module: 'NgxsReduxDevtoolsPluginModule',
+            standalone: 'withNgxsReduxDevtoolsPlugin'
+        }
+    ],
+    [
+        lib_config_1.LIBRARIES.FORM,
+        {
+            module: 'NgxsFormPluginModule',
+            standalone: 'withNgxsFormPlugin'
+        }
+    ],
+    [
+        lib_config_1.LIBRARIES.LOGGER,
+        {
+            module: 'NgxsLoggerPluginModule',
+            standalone: 'withNgxsLoggerPlugin'
+        }
+    ],
+    [
+        lib_config_1.LIBRARIES.ROUTER,
+        {
+            module: 'NgxsRouterPluginModule',
+            standalone: 'withNgxsRouterPlugin'
+        }
+    ],
+    [
+        lib_config_1.LIBRARIES.STORAGE,
+        {
+            module: 'NgxsStoragePluginModule',
+            standalone: 'withNgxsStoragePlugin'
+        }
+    ],
+    [
+        lib_config_1.LIBRARIES.STORE,
+        {
+            standalone: 'provideStore'
+        }
+    ],
+    [
+        lib_config_1.LIBRARIES.WEBSOCKET,
+        {
+            module: 'NgxsWebsocketPluginModule',
+            standalone: 'withNgxsWebSocketPlugin'
+        }
+    ]
+]);
+//# sourceMappingURL=add-declaration.js.map

package/schematics/src/ng-add/add-declaration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-declaration.js","sourceRoot":"","sources":["../../../../../packages/store/schematics/src/ng-add/add-declaration.ts"],"names":[],"mappings":"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"}

package/schematics/src/ng-add/ng-add.factory.d.ts

@@ -1,3 +1,9 @@
 import { Rule } from '@angular-devkit/schematics';
+import { LIBRARIES } from '../utils/common/lib.config';
 import { NgxsPackageSchema } from './ng-add.schema';
+export declare type NormalizedNgxsPackageSchema = {
+    skipInstall: boolean;
+    plugins: LIBRARIES[];
+    project: string;
+};
 export declare function ngAdd(options: NgxsPackageSchema): Rule;

package/schematics/src/ng-add/ng-add.factory.js

@@ -1,33 +1,42 @@
 "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 });
 exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
-const ts = require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript");
-const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-const change_1 = require("@schematics/angular/utility/change");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
-const ng_ast_utils_1 = require("@schematics/angular/utility/ng-ast-utils");
 const lib_config_1 = require("../utils/common/lib.config");
-const project_1 = require("../utils/project");
+const project_1 = require("../utils/ng-utils/project");
+const ng_ast_utils_1 = require("../utils/ng-utils/ng-ast-utils");
+const add_declaration_1 = require("./add-declaration");
+const project_2 = require("../utils/project");
 const versions = require('./../utils/versions.json');
 function ngAdd(options) {
-    return (0, schematics_1.chain)([
-        addNgxsPackageToPackageJson(options),
-        addDeclarationToNgModule(options),
-        options.skipInstall ? (0, schematics_1.noop)() : runNpmPackageInstall()
-    ]);
+    return (host) => {
+        const normalizedSchema = normalizeSchema(host, options);
+        return (0, schematics_1.chain)([
+            addNgxsPackageToPackageJson(normalizedSchema),
+            addDeclaration(normalizedSchema),
+            normalizedSchema.skipInstall ? (0, schematics_1.noop)() : runNpmPackageInstall()
+        ]);
+    };
 }
 exports.ngAdd = ngAdd;
-function addNgxsPackageToPackageJson(options) {
+function addNgxsPackageToPackageJson(schema) {
     return (host, context) => {
         const ngxsStoreVersion = versions['@ngxs/store'];
         if (!ngxsStoreVersion) {
             throw new schematics_1.SchematicsException('Could not resolve the version of "@ngxs/store"');
         }
-        Object.values(lib_config_1.LIBRARIES)
-            .filter(lib => { var _a; return (_a = options.plugins) === null || _a === void 0 ? void 0 : _a.includes(lib); })
-            .forEach(name => {
+        schema.plugins.forEach(name => {
             const packageExists = (0, dependencies_1.getPackageJsonDependency)(host, name);
             if (packageExists === null) {
                 (0, dependencies_1.addPackageJsonDependency)(host, {
@@ -50,35 +59,28 @@ function runNpmPackageInstall() {
         context.logger.info(`🔍 Installing packages...`);
     };
 }
-function addDeclarationToNgModule(options) {
-    return (host) => {
-        const project = (0, project_1.getProject)(host, { project: options.project });
-        if (typeof project === 'undefined' || project === null) {
-            const message = options.project
-                ? `Project "${options.project}" does not exist.`
-                : 'Could not determine the project to update.';
-            throw new schematics_1.SchematicsException(message);
+function addDeclaration(schema) {
+    return (host) => __awaiter(this, void 0, void 0, function* () {
+        const mainFile = (0, project_1.getProjectMainFile)(host, schema.project);
+        const isStandalone = (0, ng_ast_utils_1.isStandaloneApp)(host, mainFile);
+        if (isStandalone) {
+            return (0, add_declaration_1.addDeclarationToStandaloneApp)(schema);
         }
-        const modulePath = (0, ng_ast_utils_1.getAppModulePath)(host, `${project.root}/src/main.ts`);
-        if (typeof modulePath === 'undefined') {
-            throw new schematics_1.SchematicsException(`Module path for project "${options.project}" does not exist.`);
+        else {
+            return (0, add_declaration_1.addDeclarationToNonStandaloneApp)(schema);
         }
-        const importPath = '@ngxs/store';
-        const moduleImport = 'NgxsModule.forRoot([], { developmentMode: /** !environment.production */ false, selectorOptions: { suppressErrors: false, injectContainerState: false } })';
-        const sourceBuffer = host.read(modulePath);
-        if (sourceBuffer !== null) {
-            const sourceText = sourceBuffer.toString();
-            const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
-            const changes = (0, ast_utils_1.addImportToModule)(source, modulePath, moduleImport, importPath);
-            const recorder = host.beginUpdate(modulePath);
-            for (const change of changes) {
-                if (change instanceof change_1.InsertChange) {
-                    recorder.insertLeft(change.pos, change.toAdd);
-                }
-            }
-            host.commitUpdate(recorder);
-        }
-        return host;
+    });
+}
+function normalizeSchema(host, schema) {
+    var _a, _b;
+    const projectName = (_a = (0, project_2.getProject)(host, schema.project)) === null || _a === void 0 ? void 0 : _a.name;
+    if (!projectName) {
+        throw new schematics_1.SchematicsException(`Project "${schema.project}" does not exist.`);
+    }
+    return {
+        skipInstall: !!schema.skipInstall,
+        plugins: (_b = Object.values(lib_config_1.LIBRARIES).filter(lib => { var _a; return (_a = schema.plugins) === null || _a === void 0 ? void 0 : _a.includes(lib); })) !== null && _b !== void 0 ? _b : [],
+        project: projectName
     };
 }
 //# sourceMappingURL=ng-add.factory.js.map

package/schematics/src/ng-add/ng-add.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ng-add.factory.js","sourceRoot":"","sources":["../../../../../packages/store/schematics/src/ng-add/ng-add.factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ng-add.factory.js","sourceRoot":"","sources":["../../../../../packages/store/schematics/src/ng-add/ng-add.factory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAOoC;AACpC,4DAA0E;AAC1E,2EAIkD;AAElD,2DAAuD;AAGvD,uDAA+D;AAC/D,iEAAiE;AACjE,uDAG2B;AAC3B,8CAA8C;AAE9C,MAAM,QAAQ,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAQrD,SAAgB,KAAK,CAAC,OAA0B;IAC9C,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAExD,OAAO,IAAA,kBAAK,EAAC;YACX,2BAA2B,CAAC,gBAAgB,CAAC;YAC7C,cAAc,CAAC,gBAAgB,CAAC;YAChC,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,oBAAoB,EAAE;SAC/D,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAVD,sBAUC;AAED,SAAS,2BAA2B,CAAC,MAAmC;IACtE,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,gBAAgB,GAAW,QAAQ,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,IAAI,gCAAmB,CAAC,gDAAgD,CAAC,CAAC;SACjF;QAED,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC7B,MAAM,aAAa,GAAG,IAAA,uCAAwB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC3D,IAAI,aAAa,KAAK,IAAI,EAAE;gBAC1B,IAAA,uCAAwB,EAAC,IAAI,EAAE;oBAC7B,IAAI,EAAE,iCAAkB,CAAC,OAAO;oBAChC,IAAI;oBACJ,OAAO,EAAE,gBAAgB;iBAC1B,CAAC,CAAC;gBACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,UAAU,iCAAkB,CAAC,OAAO,EAAE,CAAC,CAAC;aAC9E;iBAAM;gBACL,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,OAAO,IAAI,2BAA2B,iCAAkB,CAAC,OAAO,EAAE,CACnE,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB;IAC3B,OAAO,CAAC,CAAO,EAAE,OAAyB,EAAE,EAAE;QAC5C,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,MAAmC;IACzD,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,QAAQ,GAAG,IAAA,4BAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAA,8BAAe,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAErD,IAAI,YAAY,EAAE;YAChB,OAAO,IAAA,+CAA6B,EAAC,MAAM,CAAC,CAAC;SAC9C;aAAM;YACL,OAAO,IAAA,kDAAgC,EAAC,MAAM,CAAC,CAAC;SACjD;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,MAAyB;;IAC5D,MAAM,WAAW,GAAG,MAAA,IAAA,oBAAU,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAC;IAC3D,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,gCAAmB,CAAC,YAAY,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;KAC9E;IACD,OAAO;QACL,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW;QACjC,OAAO,EAAE,MAAA,MAAM,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,WAAC,OAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,QAAQ,CAAC,GAAG,CAAC,CAAA,EAAA,CAAC,mCAAI,EAAE;QACpF,OAAO,EAAE,WAAW;KACrB,CAAC;AACJ,CAAC"}

package/schematics/src/utils/config.d.ts

@@ -115,5 +115,5 @@ export interface AppConfig {
         route: string;
     };
 }
-export declare function getWorkspacePath(host: Tree): string;
+export declare function getWorkspacePath(host: Tree): string | undefined;
 export declare function getWorkspace(host: Tree): any;

package/schematics/src/utils/config.js

@@ -4,13 +4,13 @@ exports.getWorkspace = exports.getWorkspacePath = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 function getWorkspacePath(host) {
     const possibleFiles = ['/angular.json', '/.angular.json', '/workspace.json'];
-    const path = possibleFiles.filter(path => host.exists(path))[0];
+    const path = possibleFiles.find(path => host.exists(path));
     return path;
 }
 exports.getWorkspacePath = getWorkspacePath;
 function getWorkspace(host) {
     const path = getWorkspacePath(host);
-    const configBuffer = host.read(path);
+    const configBuffer = path ? host.read(path) : null;
     if (configBuffer === null) {
         throw new schematics_1.SchematicsException(`Could not find (${path})`);
     }

package/schematics/src/utils/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/store/schematics/src/utils/config.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AAkIvE,SAAgB,gBAAgB,CAAC,IAAU;IACzC,MAAM,aAAa,GAAG,CAAC,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhE,OAAO,IAAI,CAAC;AACd,CAAC;AALD,4CAKC;AAED,SAAgB,YAAY,CAAC,IAAU;IACrC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,YAAY,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,gCAAmB,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAC;KAC3D;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;IAEvC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AATD,oCASC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../packages/store/schematics/src/utils/config.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AAkIvE,SAAgB,gBAAgB,CAAC,IAAU;IACzC,MAAM,aAAa,GAAG,CAAC,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3D,OAAO,IAAI,CAAC;AACd,CAAC;AALD,4CAKC;AAED,SAAgB,YAAY,CAAC,IAAU;IACrC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,IAAI,YAAY,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,gCAAmB,CAAC,mBAAmB,IAAI,GAAG,CAAC,CAAC;KAC3D;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;IAEvC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AATD,oCASC"}

package/schematics/src/utils/ng-utils/README.md

@@ -0,0 +1 @@
+The ng-utils folder represents a set of files copied from the @schematics/angular package's latest version. These utilities can be removed once @ngxs supports @angular >=16 as the minimum required version.

package/schematics/src/utils/ng-utils/ast-utils.d.ts

@@ -0,0 +1,99 @@
+import * as ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
+import { Change } from '@schematics/angular/utility/change';
+/**
+ * Add Import `import { symbolName } from fileName` if the import doesn't exit
+ * already. Assumes fileToEdit can be resolved and accessed.
+ * @param fileToEdit File we want to add import to.
+ * @param symbolName Item to import.
+ * @param fileName Path to the file.
+ * @param isDefault If true, import follows style for importing default exports.
+ * @param alias Alias that the symbol should be inserted under.
+ * @return Change
+ */
+export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean, alias?: string): Change;
+/**
+ * Find all nodes from the AST in the subtree of node of SyntaxKind kind.
+ * @param node
+ * @param kind
+ * @param max The maximum number of items to return.
+ * @param recursive Continue looking for nodes of kind recursive until end
+ * the last child even when node of kind has been found.
+ * @return all nodes of kind, or [] if none is found
+ */
+export declare function findNodes(node: ts.Node, kind: ts.SyntaxKind, max?: number, recursive?: boolean): ts.Node[];
+/**
+ * Find all nodes from the AST in the subtree that satisfy a type guard.
+ * @param node
+ * @param guard
+ * @param max The maximum number of items to return.
+ * @param recursive Continue looking for nodes of kind recursive until end
+ * the last child even when node of kind has been found.
+ * @return all nodes that satisfy the type guard, or [] if none is found
+ */
+export declare function findNodes<T extends ts.Node>(node: ts.Node, guard: (node: ts.Node) => node is T, max?: number, recursive?: boolean): T[];
+/**
+ * Get all the nodes from a source.
+ * @param sourceFile The source file object.
+ * @returns {Array<ts.Node>} An array of all the nodes in the source.
+ */
+export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
+export declare function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null;
+/**
+ * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`
+ * or after the last of occurence of `syntaxKind` if the last occurence is a sub child
+ * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.
+ *
+ * @param nodes insert after the last occurence of nodes
+ * @param toInsert string to insert
+ * @param file file to insert changes into
+ * @param fallbackPos position to insert if toInsert happens to be the first occurence
+ * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after
+ * @return Change instance
+ * @throw Error if toInsert is first occurence but fall back is not set
+ */
+export declare function insertAfterLastOccurrence(nodes: ts.Node[] | ts.NodeArray<ts.Node>, toInsert: string, file: string, fallbackPos: number, syntaxKind?: ts.SyntaxKind): Change;
+export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
+export declare function getMetadataField(node: ts.ObjectLiteralExpression, metadataField: string): ts.ObjectLiteralElement[];
+export declare function addSymbolToNgModuleMetadata(source: ts.SourceFile, ngModulePath: string, metadataField: string, symbolName: string, importPath?: string | null): Change[];
+/**
+ * Custom function to insert a declaration (component, pipe, directive)
+ * into NgModule declarations. It also imports the component.
+ */
+export declare function addDeclarationToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an NgModule into NgModule imports. It also imports the module.
+ */
+export declare function addImportToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert a provider into NgModule. It also imports it.
+ */
+export declare function addProviderToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an export into NgModule. It also imports it.
+ */
+export declare function addExportToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an export into NgModule. It also imports it.
+ */
+export declare function addBootstrapToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Determine if an import already exists.
+ */
+export declare function isImported(source: ts.SourceFile, classifiedName: string, importPath: string): boolean;
+/**
+ * Returns the RouterModule declaration from NgModule metadata, if any.
+ */
+export declare function getRouterModuleDeclaration(source: ts.SourceFile): ts.Expression | undefined;
+/**
+ * Adds a new route declaration to a router module (i.e. has a RouterModule declaration)
+ */
+export declare function addRouteDeclarationToModule(source: ts.SourceFile, fileToAdd: string, routeLiteral: string): Change;
+/**
+ * Determines if a SourceFile has a top-level declaration whose name matches a specific symbol.
+ * Can be used to avoid conflicts when inserting new imports into a file.
+ * @param sourceFile File in which to search.
+ * @param symbolName Name of the symbol to search for.
+ * @param skipModule Path of the module that the symbol may have been imported from. Used to
+ * avoid false positives where the same symbol we're looking for may have been imported.
+ */
+export declare function hasTopLevelIdentifier(sourceFile: ts.SourceFile, symbolName: string, skipModule?: string | null): boolean;