@nstudio/angular 15.0.4-rc.0 → 15.0.4-rc.1

package/src/utils/ast.js

@@ -1,28 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToComponent = exports.addProviderToModule = exports.addProviderToBootstrapApplication = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.removeFromNgModule = exports._addSymbolToNgModuleMetadata = exports.getDecoratorMetadata = exports.isStandalone = exports.addToCollection = void 0;
-const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
-const typescript_1 = require("nx/src/utils/typescript");
+exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRoute = exports.getBootstrapComponent = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.addSymbolToNgModuleMetadata = exports.addToCollection = void 0;
 const ts = require("typescript");
-const js_1 = require("@nrwl/js");
-const path_1 = require("path");
-const devkit_1 = require("@nrwl/devkit");
-let tsModule;
-function addToCollection(tree, source, barrelIndexPath, symbolName, insertSpaces = '') {
+const typescript_1 = require("nx/src/utils/typescript");
+const path = require("path");
+const xplat_utils_1 = require("@nstudio/xplat-utils");
+const xplat_1 = require("@nstudio/xplat");
+function addToCollection(source, barrelIndexPath, symbolName, insertSpaces = '') {
     const collection = getCollection(source);
     if (!collection)
         return [];
     // if (!collection) return [new NoopChange()];
     // return [new NoopChange()];
-    console.log('collection.hasTrailingComma:', collection.hasTrailingComma);
     if (collection.hasTrailingComma || collection.length === 0) {
-        return [
-            (0, js_1.insertChange)(tree, source, barrelIndexPath, collection.end, symbolName),
-        ];
+        return [new xplat_1.InsertChange(barrelIndexPath, collection.end, symbolName)];
     }
     else {
         return [
-            (0, js_1.insertChange)(tree, source, barrelIndexPath, collection.end, `,\n${insertSpaces}${symbolName}`),
+            new xplat_1.InsertChange(barrelIndexPath, collection.end, `,\n${insertSpaces}${symbolName}`),
         ];
     }
 }
@@ -41,13 +36,10 @@ function getCollection(source) {
     return null;
 }
 function _angularImportsFromNode(node, _sourceFile) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
     const ms = node.moduleSpecifier;
     let modulePath;
     switch (ms.kind) {
-        case tsModule.SyntaxKind.StringLiteral:
+        case ts.SyntaxKind.StringLiteral:
             modulePath = ms.text;
             break;
         default:
@@ -63,10 +55,10 @@ function _angularImportsFromNode(node, _sourceFile) {
         }
         else if (node.importClause.namedBindings) {
             const nb = node.importClause.namedBindings;
-            if (nb.kind == tsModule.SyntaxKind.NamespaceImport) {
+            if (nb.kind == ts.SyntaxKind.NamespaceImport) {
                 // This is of the form `import * as name from 'path'`. Return `name.`.
                 return {
-                    [`${nb.name.text}.`]: modulePath,
+                    [nb.name.text + '.']: modulePath,
                 };
             }
             else {
@@ -87,21 +79,8 @@ function _angularImportsFromNode(node, _sourceFile) {
         return {};
     }
 }
-/**
- * Check if the Component, Directive or Pipe is standalone
- * @param sourceFile TS Source File containing the token to check
- * @param decoratorName The type of decorator to check (Component, Directive, Pipe)
- */
-function isStandalone(sourceFile, decoratorName) {
-    const decoratorMetadata = getDecoratorMetadata(sourceFile, decoratorName, '@angular/core');
-    return decoratorMetadata.some((node) => node.getText().includes('standalone: true'));
-}
-exports.isStandalone = isStandalone;
 function getDecoratorMetadata(source, identifier, module) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const angularImports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
+    const angularImports = (0, typescript_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration)
         .map((node) => _angularImportsFromNode(node, source))
         .reduce((acc, current) => {
         for (const key of Object.keys(current)) {
@@ -109,65 +88,60 @@ function getDecoratorMetadata(source, identifier, module) {
         }
         return acc;
     }, {});
-    return (0, js_1.getSourceNodes)(source)
+    return (0, xplat_1.getSourceNodes)(source)
         .filter((node) => {
-        return (node.kind == tsModule.SyntaxKind.Decorator &&
-            node.expression.kind ==
-                tsModule.SyntaxKind.CallExpression);
+        return (node.kind == ts.SyntaxKind.Decorator &&
+            node.expression.kind == ts.SyntaxKind.CallExpression);
     })
         .map((node) => node.expression)
         .filter((expr) => {
-        if (expr.expression.kind == tsModule.SyntaxKind.Identifier) {
+        if (expr.expression.kind == ts.SyntaxKind.Identifier) {
             const id = expr.expression;
             return (id.getFullText(source) == identifier &&
                 angularImports[id.getFullText(source)] === module);
         }
-        else if (expr.expression.kind == tsModule.SyntaxKind.PropertyAccessExpression) {
+        else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {
             // This covers foo.NgModule when importing * as foo.
             const paExpr = expr.expression;
             // If the left expression is not an identifier, just give up at that point.
-            if (paExpr.expression.kind !== tsModule.SyntaxKind.Identifier) {
+            if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {
                 return false;
             }
             const id = paExpr.name.text;
             const moduleId = paExpr.expression.getText(source);
-            return id === identifier && angularImports[`${moduleId}.`] === module;
+            return id === identifier && angularImports[moduleId + '.'] === module;
         }
         return false;
     })
         .filter((expr) => expr.arguments[0] &&
-        expr.arguments[0].kind == tsModule.SyntaxKind.ObjectLiteralExpression)
+        expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)
         .map((expr) => expr.arguments[0]);
 }
-exports.getDecoratorMetadata = getDecoratorMetadata;
-function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, expression, decoratorName) {
-    const nodes = getDecoratorMetadata(source, decoratorName, '@angular/core');
+function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, expression) {
+    const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
     let node = nodes[0]; // tslint:disable-line:no-any
     // Find the decorator declaration.
     if (!node) {
-        return source;
-    }
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        return [];
     }
     // Get all the children property assignment of object literals.
     const matchingProperties = node.properties
-        .filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
+        .filter((prop) => prop.kind == ts.SyntaxKind.PropertyAssignment)
         // Filter out every fields that's not "metadataField". Also handles string literals
         // (but not expressions).
         .filter((prop) => {
         const name = prop.name;
         switch (name.kind) {
-            case tsModule.SyntaxKind.Identifier:
+            case ts.SyntaxKind.Identifier:
                 return name.getText(source) == metadataField;
-            case tsModule.SyntaxKind.StringLiteral:
+            case ts.SyntaxKind.StringLiteral:
                 return name.text == metadataField;
         }
         return false;
     });
     // Get the last node of the array literal.
     if (!matchingProperties) {
-        return source;
+        return [];
     }
     if (matchingProperties.length == 0) {
         // We haven't found the field in the metadata declaration. Insert a new field.
@@ -190,12 +164,13 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
                 toInsert = `, ${metadataField}: [${expression}]`;
             }
         }
-        return (0, js_1.insertChange)(host, source, filePath, position, toInsert);
+        const newMetadataProperty = new xplat_1.InsertChange(ngModulePath, position, toInsert);
+        return [newMetadataProperty];
     }
     const assignment = matchingProperties[0];
     // If it's not an array, nothing we can do really.
-    if (assignment.initializer.kind !== tsModule.SyntaxKind.ArrayLiteralExpression) {
-        return source;
+    if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {
+        return [];
     }
     const arrLiteral = assignment.initializer;
     if (arrLiteral.elements.length == 0) {
@@ -207,20 +182,20 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
     }
     if (!node) {
         console.log('No app module found. Please add your new class to your component.');
-        return source;
+        return [];
     }
     const isArray = Array.isArray(node);
     if (isArray) {
         const nodeArray = node;
         const symbolsArray = nodeArray.map((node) => node.getText());
         if (symbolsArray.includes(expression)) {
-            return source;
+            return [];
         }
         node = node[node.length - 1];
     }
     let toInsert;
     let position = node.getEnd();
-    if (!isArray && node.kind == tsModule.SyntaxKind.ObjectLiteralExpression) {
+    if (!isArray && node.kind == ts.SyntaxKind.ObjectLiteralExpression) {
         // We haven't found the field in the metadata declaration. Insert a new
         // field.
         const expr = node;
@@ -241,8 +216,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
             }
         }
     }
-    else if (!isArray &&
-        node.kind == tsModule.SyntaxKind.ArrayLiteralExpression) {
+    else if (!isArray && node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
         // We found the field but it's empty. Insert it just before the `]`.
         position--;
         toInsert = `${expression}`;
@@ -257,130 +231,54 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
             toInsert = `, ${expression}`;
         }
     }
-    return (0, js_1.insertChange)(host, source, filePath, position, toInsert);
-}
-function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField, expression) {
-    return _addSymbolToDecoratorMetadata(host, source, ngModulePath, metadataField, expression, 'NgModule');
+    const insert = new xplat_1.InsertChange(ngModulePath, position, toInsert);
+    return [insert];
 }
-exports._addSymbolToNgModuleMetadata = _addSymbolToNgModuleMetadata;
-function removeFromNgModule(host, source, modulePath, property) {
+exports.addSymbolToNgModuleMetadata = addSymbolToNgModuleMetadata;
+function removeFromNgModule(source, modulePath, property) {
     const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
     let node = nodes[0]; // tslint:disable-line:no-any
     // Find the decorator declaration.
     if (!node) {
-        return source;
+        return [];
     }
     // Get all the children property assignment of object literals.
     const matchingProperty = getMatchingProperty(source, property, 'NgModule', '@angular/core');
     if (matchingProperty) {
-        return (0, js_1.removeChange)(host, source, modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source));
+        return [
+            new xplat_1.RemoveChange(modulePath, matchingProperty.getStart(source), matchingProperty.getFullText(source)),
+        ];
+    }
+    else {
+        return [];
     }
 }
 exports.removeFromNgModule = removeFromNgModule;
-/**
- * Add an import to a Standalone Component
- * @param host Virtual Tree
- * @param source TS Source File containing the Component
- * @param componentPath The path to the Component
- * @param symbolName The import to add to the Component
- */
-function addImportToComponent(host, source, componentPath, symbolName) {
-    return _addSymbolToDecoratorMetadata(host, source, componentPath, 'imports', symbolName, 'Component');
-}
-exports.addImportToComponent = addImportToComponent;
-/**
- * Add an import to a Standalone Directive
- * @param host Virtual Tree
- * @param source TS Source File containing the Directive
- * @param directivePath The path to the Directive
- * @param symbolName The import to add to the Directive
- */
-function addImportToDirective(host, source, directivePath, symbolName) {
-    return _addSymbolToDecoratorMetadata(host, source, directivePath, 'imports', symbolName, 'Directive');
-}
-exports.addImportToDirective = addImportToDirective;
-/**
- * Add an import to a Standalone Pipe
- * @param host Virtual Tree
- * @param source TS Source File containing the Pipe
- * @param pipePath The path to the Pipe
- * @param symbolName The import to add to the Pipe
- */
-function addImportToPipe(host, source, pipePath, symbolName) {
-    return _addSymbolToDecoratorMetadata(host, source, pipePath, 'imports', symbolName, 'Pipe');
-}
-exports.addImportToPipe = addImportToPipe;
-/**
- * Add an import to an NgModule
- * @param host Virtual Tree
- * @param source TS Source File containing the NgModule
- * @param modulePath The path to the NgModule
- * @param symbolName The import to add to the NgModule
- */
-function addImportToModule(host, source, modulePath, symbolName) {
-    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'imports', symbolName);
+function addImportToModule(source, modulePath, symbolName) {
+    return addSymbolToNgModuleMetadata(source, modulePath, 'imports', symbolName);
 }
 exports.addImportToModule = addImportToModule;
-function addImportToTestBed(host, source, specPath, symbolName) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
-    const configureTestingModuleObjectLiterals = allCalls
-        .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
-        .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
-        .map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
-        ? c.arguments[0]
-        : null);
-    if (configureTestingModuleObjectLiterals.length > 0) {
-        const startPosition = configureTestingModuleObjectLiterals[0]
-            .getFirstToken(source)
-            .getEnd();
-        return (0, js_1.insertChange)(host, source, specPath, startPosition, `imports: [${symbolName}], `);
-    }
-    return source;
-}
-exports.addImportToTestBed = addImportToTestBed;
-function addDeclarationsToTestBed(host, source, specPath, symbolName) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
+function addImportToTestBed(source, specPath, symbolName) {
+    const allCalls = ((0, typescript_1.findNodes)(source, ts.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
-        .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
+        .filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
         .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
-        .map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
+        .map((c) => c.arguments[0].kind === ts.SyntaxKind.ObjectLiteralExpression
         ? c.arguments[0]
         : null);
     if (configureTestingModuleObjectLiterals.length > 0) {
         const startPosition = configureTestingModuleObjectLiterals[0]
             .getFirstToken(source)
             .getEnd();
-        return (0, js_1.insertChange)(host, source, specPath, startPosition, `declarations: [${symbolName.join(',')}], `);
-    }
-    return source;
-}
-exports.addDeclarationsToTestBed = addDeclarationsToTestBed;
-function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        return [
+            new xplat_1.InsertChange(specPath, startPosition, `imports: [${symbolName}], `),
+        ];
     }
-    const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
-    const configureTestingModuleObjectLiterals = allCalls
-        .filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
-        .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
-        .map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
-        ? c.arguments[0]
-        : null);
-    if (configureTestingModuleObjectLiterals.length > 0) {
-        const startPosition = configureTestingModuleObjectLiterals[0]
-            .getFirstToken(source)
-            .getEnd();
-        return (0, js_1.replaceChange)(host, source, specPath, startPosition, newSymbol, previousSymbol);
+    else {
+        return [];
     }
-    return source;
 }
-exports.replaceIntoToTestBed = replaceIntoToTestBed;
+exports.addImportToTestBed = addImportToTestBed;
 function getBootstrapComponent(source, moduleClassName) {
     const bootstrap = getMatchingProperty(source, 'bootstrap', 'NgModule', '@angular/core');
     if (!bootstrap) {
@@ -403,113 +301,56 @@ function getMatchingProperty(source, property, identifier, module) {
     // Get all the children property assignment of object literals.
     return getMatchingObjectLiteralElement(node, source, property);
 }
-function addRouteToNgModule(host, ngModulePath, source, route) {
+function addRoute(ngModulePath, source, route) {
     const routes = getListOfRoutes(source);
     if (!routes)
-        return source;
+        return [];
     if (routes.hasTrailingComma || routes.length === 0) {
-        return (0, js_1.insertChange)(host, source, ngModulePath, routes.end, route);
+        return [new xplat_1.InsertChange(ngModulePath, routes.end, route)];
     }
     else {
-        return (0, js_1.insertChange)(host, source, ngModulePath, routes.end, `, ${route}`);
+        return [new xplat_1.InsertChange(ngModulePath, routes.end, `, ${route}`)];
     }
 }
-exports.addRouteToNgModule = addRouteToNgModule;
+exports.addRoute = addRoute;
 function getListOfRoutes(source) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
     const imports = getMatchingProperty(source, 'imports', 'NgModule', '@angular/core');
-    if ((imports === null || imports === void 0 ? void 0 : imports.initializer.kind) === tsModule.SyntaxKind.ArrayLiteralExpression) {
+    if (imports.initializer.kind === ts.SyntaxKind.ArrayLiteralExpression) {
         const a = imports.initializer;
-        for (const e of a.elements) {
-            if (e.kind === tsModule.SyntaxKind.CallExpression) {
+        for (let e of a.elements) {
+            if (e.kind === ts.SyntaxKind.CallExpression) {
                 const ee = e;
                 const text = ee.expression.getText(source);
                 if ((text === 'RouterModule.forRoot' ||
                     text === 'RouterModule.forChild') &&
                     ee.arguments.length > 0) {
                     const routes = ee.arguments[0];
-                    if (routes.kind === tsModule.SyntaxKind.ArrayLiteralExpression) {
+                    if (routes.kind === ts.SyntaxKind.ArrayLiteralExpression) {
                         return routes.elements;
                     }
-                    else if (routes.kind === tsModule.SyntaxKind.Identifier) {
-                        // find the array expression
-                        const variableDeclarations = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
-                        const routesDeclaration = variableDeclarations.find((x) => {
-                            return x.name.getText() === routes.getText();
-                        });
-                        if (routesDeclaration) {
-                            return routesDeclaration.initializer.elements;
-                        }
-                    }
                 }
             }
         }
     }
     return null;
 }
-/**
- * Add a provider to bootstrapApplication call for Standalone Applications
- * @param tree Virtual Tree
- * @param filePath Path to the file containing the bootstrapApplication call
- * @param providerToAdd Provider to add
- */
-function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
-    (0, ensure_typescript_1.ensureTypescript)();
-    const { tsquery } = require('@phenomnomnominal/tsquery');
-    const PROVIDERS_ARRAY_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression';
-    const fileContents = tree.read(filePath, 'utf-8');
-    const ast = tsquery.ast(fileContents);
-    const providersArrayNodes = tsquery(ast, PROVIDERS_ARRAY_SELECTOR, {
-        visitAllChildren: true,
-    });
-    if (providersArrayNodes.length === 0) {
-        throw new Error(`Providers does not exist in the bootstrapApplication call within ${filePath}.`);
-    }
-    const arrayNode = providersArrayNodes[0];
-    const newFileContents = `${fileContents.slice(0, arrayNode.getStart() + 1)}${providerToAdd},${fileContents.slice(arrayNode.getStart() + 1, fileContents.length)}`;
-    tree.write(filePath, newFileContents);
-}
-exports.addProviderToBootstrapApplication = addProviderToBootstrapApplication;
-/**
- * Add a provider to an NgModule
- * @param host Virtual Tree
- * @param source TS Source File containing the NgModule
- * @param modulePath Path to the NgModule
- * @param symbolName The provider to add
- */
-function addProviderToModule(host, source, modulePath, symbolName) {
-    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'providers', symbolName);
+function addProviderToModule(source, modulePath, symbolName) {
+    return addSymbolToNgModuleMetadata(source, modulePath, 'providers', symbolName);
 }
 exports.addProviderToModule = addProviderToModule;
-/**
- * Add a provider to a Standalone Component
- * @param host Virtual Tree
- * @param source TS Source File containing the Component
- * @param componentPath Path to the Component
- * @param symbolName The provider to add
- */
-function addProviderToComponent(host, source, componentPath, symbolName) {
-    return _addSymbolToDecoratorMetadata(host, source, componentPath, 'providers', symbolName, 'Component');
-}
-exports.addProviderToComponent = addProviderToComponent;
-function addDeclarationToModule(host, source, modulePath, symbolName) {
-    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'declarations', symbolName);
+function addDeclarationToModule(source, modulePath, symbolName) {
+    return addSymbolToNgModuleMetadata(source, modulePath, 'declarations', symbolName);
 }
 exports.addDeclarationToModule = addDeclarationToModule;
-function addEntryComponents(host, source, modulePath, symbolName) {
-    return _addSymbolToNgModuleMetadata(host, source, modulePath, 'entryComponents', symbolName);
+function addEntryComponents(source, modulePath, symbolName) {
+    return addSymbolToNgModuleMetadata(source, modulePath, 'entryComponents', symbolName);
 }
 exports.addEntryComponents = addEntryComponents;
 function readBootstrapInfo(host, app) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const config = (0, devkit_1.readProjectConfiguration)(host, app);
+    const config = (0, xplat_1.getProjectConfig)(host, app);
     let mainPath;
     try {
-        mainPath = config.targets.build.options.main;
+        mainPath = config.architect.build.options.main;
     }
     catch (e) {
         throw new Error('Main file cannot be located');
@@ -518,21 +359,21 @@ function readBootstrapInfo(host, app) {
         throw new Error('Main file cannot be located');
     }
     const mainSource = host.read(mainPath).toString('utf-8');
-    const main = tsModule.createSourceFile(mainPath, mainSource, tsModule.ScriptTarget.Latest, true);
-    const moduleImports = (0, js_1.getImport)(main, (s) => s.indexOf('.module') > -1);
+    const main = ts.createSourceFile(mainPath, mainSource, ts.ScriptTarget.Latest, true);
+    const moduleImports = (0, xplat_1.getImport)(main, (s) => s.indexOf('.module') > -1);
     if (moduleImports.length !== 1) {
         throw new Error(`main.ts can only import a single module`);
     }
     const moduleImport = moduleImports[0];
     const moduleClassName = moduleImport.bindings.filter((b) => b.endsWith('Module'))[0];
-    const modulePath = `${(0, path_1.join)((0, path_1.dirname)(mainPath), moduleImport.moduleSpec)}.ts`;
+    const modulePath = `${path.join(path.dirname(mainPath), moduleImport.moduleSpec)}.ts`;
     if (!host.exists(modulePath)) {
         throw new Error(`Cannot find '${modulePath}'`);
     }
     const moduleSourceText = host.read(modulePath).toString('utf-8');
-    const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
+    const moduleSource = ts.createSourceFile(modulePath, moduleSourceText, ts.ScriptTarget.Latest, true);
     const bootstrapComponentClassName = getBootstrapComponent(moduleSource, moduleClassName);
-    const bootstrapComponentFileName = `./${(0, path_1.join)((0, path_1.dirname)(moduleImport.moduleSpec), `${(0, devkit_1.names)(bootstrapComponentClassName.substring(0, bootstrapComponentClassName.length - 9)).fileName}.component`)}`;
+    const bootstrapComponentFileName = `./${path.join(path.dirname(moduleImport.moduleSpec), `${(0, xplat_utils_1.toFileName)(bootstrapComponentClassName.substring(0, bootstrapComponentClassName.length - 9))}.component`)}`;
     return {
         moduleSpec: moduleImport.moduleSpec,
         mainPath,
@@ -545,44 +386,25 @@ function readBootstrapInfo(host, app) {
 }
 exports.readBootstrapInfo = readBootstrapInfo;
 function getDecoratorPropertyValueNode(host, modulePath, identifier, property, module) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
     const moduleSourceText = host.read(modulePath).toString('utf-8');
-    const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
+    const moduleSource = ts.createSourceFile(modulePath, moduleSourceText, ts.ScriptTarget.Latest, true);
     const templateNode = getMatchingProperty(moduleSource, property, identifier, module);
     return templateNode.getChildAt(templateNode.getChildCount() - 1);
 }
 exports.getDecoratorPropertyValueNode = getDecoratorPropertyValueNode;
 function getMatchingObjectLiteralElement(node, source, property) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
     return (node.properties
-        .filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
+        .filter((prop) => prop.kind == ts.SyntaxKind.PropertyAssignment)
         // Filter out every fields that's not "metadataField". Also handles string literals
         // (but not expressions).
         .filter((prop) => {
         const name = prop.name;
         switch (name.kind) {
-            case tsModule.SyntaxKind.Identifier:
+            case ts.SyntaxKind.Identifier:
                 return name.getText(source) === property;
-            case tsModule.SyntaxKind.StringLiteral:
+            case ts.SyntaxKind.StringLiteral:
                 return name.text === property;
         }
         return false;
     })[0]);
 }
-function getTsSourceFile(host, path) {
-    if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
-    }
-    const buffer = host.read(path);
-    if (!buffer) {
-        throw new Error(`Could not read TS file (${path}).`);
-    }
-    const content = buffer.toString();
-    const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);
-    return source;
-}
-exports.getTsSourceFile = getTsSourceFile;

package/src/utils/generator.d.ts

@@ -1,7 +1,7 @@
 import { Tree, Rule } from '@angular-devkit/schematics';
 import { XplatFeatureHelpers } from '@nstudio/xplat';
 import { PlatformTypes } from '@nstudio/xplat-utils';
-export declare type IGenerateType = 'component' | 'directive' | 'pipe' | 'service' | 'state';
+export type IGenerateType = 'component' | 'directive' | 'pipe' | 'service' | 'state';
 export interface IGenerateOptions {
     name: string;
     feature?: string;