@nstudio/angular 13.0.1 → 13.4.0

package/src/schematics/pipe/index.spec.js

@@ -19,61 +19,61 @@ describe('pipe schematic', () => {
     };
     beforeEach(() => {
         appTree = schematics_1.Tree.empty();
-        appTree = testing_1.createXplatWithNativeScriptWeb(appTree, null, 'angular');
+        appTree = (0, testing_1.createXplatWithNativeScriptWeb)(appTree, null, 'angular');
     });
     it('should create pipe in libs by default for use across any platform and apps', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
-        let tree = yield testing_2.runSchematic('feature', {
+        let tree = yield (0, testing_2.runSchematic)('feature', {
             name: 'foo',
             platforms: 'nativescript,web',
         }, appTree);
         let options = Object.assign({}, defaultOptions);
-        tree = yield testing_2.runSchematic('pipe', options, tree);
+        tree = yield (0, testing_2.runSchematic)('pipe', options, tree);
         // let files = tree.files;
         // console.log(files.slice(91,files.length));
         // component
         expect(tree.exists('/libs/xplat/features/src/lib/ui/pipes/truncate.pipe.ts')).toBeTruthy();
         // file content
-        let content = testing_1.getFileContent(tree, '/libs/xplat/features/src/lib/ui/pipes/truncate.pipe.ts');
+        let content = (0, testing_1.getFileContent)(tree, '/libs/xplat/features/src/lib/ui/pipes/truncate.pipe.ts');
         // console.log(content);
         expect(content.indexOf(`@Pipe({`)).toBeGreaterThanOrEqual(0);
         expect(content.indexOf(`name: 'truncate'`)).toBeGreaterThanOrEqual(0);
         let modulePath = '/libs/xplat/features/src/lib/ui/ui.module.ts';
-        let moduleContent = testing_1.getFileContent(tree, modulePath);
+        let moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`...UI_PIPES`)).toBeGreaterThanOrEqual(0);
         options = Object.assign(Object.assign({}, defaultOptions), { feature: 'foo' });
-        tree = yield testing_2.runSchematic('pipe', options, tree);
+        tree = yield (0, testing_2.runSchematic)('pipe', options, tree);
         // files = tree.files;
         // console.log(files.slice(91,files.length));
         // component
         expect(tree.exists('/libs/xplat/features/src/lib/foo/pipes/truncate.pipe.ts')).toBeTruthy();
         // file content
-        content = testing_1.getFileContent(tree, '/libs/xplat/features/src/lib/foo/pipes/truncate.pipe.ts');
+        content = (0, testing_1.getFileContent)(tree, '/libs/xplat/features/src/lib/foo/pipes/truncate.pipe.ts');
         // console.log(content);
         expect(content.indexOf(`@Pipe({`)).toBeGreaterThanOrEqual(0);
         expect(content.indexOf(`name: 'truncate'`)).toBeGreaterThanOrEqual(0);
         modulePath = '/libs/xplat/features/src/lib/foo/foo.module.ts';
-        moduleContent = testing_1.getFileContent(tree, modulePath);
+        moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`...FOO_PIPES`)).toBeGreaterThanOrEqual(0);
     }));
     it('should create pipe in libs and handle camel case properly', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
-        let tree = yield testing_2.runSchematic('feature', {
+        let tree = yield (0, testing_2.runSchematic)('feature', {
             name: 'foo',
             platforms: 'nativescript,web',
         }, appTree);
         let options = Object.assign(Object.assign({}, defaultOptions), { name: 'test-with-dashes' });
-        tree = yield testing_2.runSchematic('pipe', options, tree);
+        tree = yield (0, testing_2.runSchematic)('pipe', options, tree);
         const files = tree.files;
         // console.log(files.slice(91,files.length));
         // component
         expect(tree.exists('/libs/xplat/features/src/lib/ui/pipes/test-with-dashes.pipe.ts')).toBeTruthy();
         // file content
-        let content = testing_1.getFileContent(tree, '/libs/xplat/features/src/lib/ui/pipes/test-with-dashes.pipe.ts');
+        let content = (0, testing_1.getFileContent)(tree, '/libs/xplat/features/src/lib/ui/pipes/test-with-dashes.pipe.ts');
         // console.log(content);
         expect(content.indexOf(`@Pipe({`)).toBeGreaterThanOrEqual(0);
         expect(content.indexOf(`name: 'testWithDashes'`)).toBeGreaterThanOrEqual(0);
@@ -83,11 +83,11 @@ describe('pipe schematic', () => {
         let tree;
         const options = Object.assign({}, defaultOptions);
         options.feature = 'register';
-        yield expect(testing_2.runSchematic('pipe', options, appTree)).rejects.toThrow(`libs/xplat/features/src/lib/register/register.module.ts does not exist. Create the feature module first. For example: nx g @nstudio/angular:feature register`);
+        yield expect((0, testing_2.runSchematic)('pipe', options, appTree)).rejects.toThrow(`libs/xplat/features/src/lib/register/register.module.ts does not exist. Create the feature module first. For example: nx g @nstudio/angular:feature register`);
     }));
     it('should create pipe for specified projects only', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
-        let tree = yield testing_2.runSchematic('feature', {
+        let tree = yield (0, testing_2.runSchematic)('feature', {
             name: 'foo',
             projects: 'nativescript-viewer,web-viewer',
             onlyProject: true,
@@ -97,7 +97,7 @@ describe('pipe schematic', () => {
             feature: 'foo',
             projects: 'nativescript-viewer,web-viewer',
         };
-        tree = yield testing_2.runSchematic('pipe', options, tree);
+        tree = yield (0, testing_2.runSchematic)('pipe', options, tree);
         const files = tree.files;
         // console.log(files. slice(91,files.length));
         // pipe should not be setup to share
@@ -109,23 +109,23 @@ describe('pipe schematic', () => {
         expect(tree.exists('/apps/web-viewer/src/app/features/foo/pipes/truncate.pipe.ts')).toBeTruthy();
         // file content
         let pipeIndexPath = '/apps/nativescript-viewer/src/features/foo/pipes/index.ts';
-        let pipeIndex = testing_1.getFileContent(tree, pipeIndexPath);
+        let pipeIndex = (0, testing_1.getFileContent)(tree, pipeIndexPath);
         // console.log(barrelPath + ':');
         // console.log(barrelIndex);
         // component symbol should be at end of components collection
         expect(pipeIndex.indexOf(`TruncatePipe`)).toBeGreaterThanOrEqual(0);
         let modulePath = '/apps/nativescript-viewer/src/features/foo/foo.module.ts';
-        let moduleContent = testing_1.getFileContent(tree, modulePath);
+        let moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`...FOO_PIPES`)).toBeGreaterThanOrEqual(0);
         pipeIndexPath = '/apps/web-viewer/src/app/features/foo/pipes/index.ts';
-        pipeIndex = testing_1.getFileContent(tree, pipeIndexPath);
+        pipeIndex = (0, testing_1.getFileContent)(tree, pipeIndexPath);
         // console.log(barrelPath + ':');
         // console.log(barrelIndex);
         expect(pipeIndex.indexOf(`TruncatePipe`)).toBeGreaterThanOrEqual(0);
         modulePath = '/apps/web-viewer/src/app/features/foo/foo.module.ts';
-        moduleContent = testing_1.getFileContent(tree, modulePath);
+        moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`...FOO_PIPES`)).toBeGreaterThanOrEqual(0);
@@ -138,7 +138,7 @@ describe('pipe schematic', () => {
             feature: 'register',
             platforms: 'nativescript,web',
         };
-        yield expect(testing_2.runSchematic('pipe', options, appTree)).rejects.toThrow(`libs/xplat/nativescript/features/src/lib/register/register.module.ts does not exist. Create the feature module first. For example: nx g @nstudio/angular:feature register --platforms=nativescript --onlyModule`);
+        yield expect((0, testing_2.runSchematic)('pipe', options, appTree)).rejects.toThrow(`libs/xplat/nativescript/features/src/lib/register/register.module.ts does not exist. Create the feature module first. For example: nx g @nstudio/angular:feature register --platforms=nativescript --onlyModule`);
     }));
     it('should THROW if feature module does not exist in projects', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
@@ -148,6 +148,6 @@ describe('pipe schematic', () => {
             feature: 'register',
             projects: 'nativescript-viewer,web-viewer',
         };
-        yield expect(testing_2.runSchematic('pipe', options, appTree)).rejects.toThrow(`apps/nativescript-viewer/src/features/register/register.module.ts does not exist. Create the feature module first. For example: nx g @nstudio/angular:feature register --projects=nativescript-viewer --onlyModule`);
+        yield expect((0, testing_2.runSchematic)('pipe', options, appTree)).rejects.toThrow(`apps/nativescript-viewer/src/features/register/register.module.ts does not exist. Create the feature module first. For example: nx g @nstudio/angular:feature register --projects=nativescript-viewer --onlyModule`);
     }));
 });

package/src/schematics/service/index.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const angular_1 = require("@nstudio/angular");
 function default_1(options) {
-    return angular_1.generate('service', options);
+    return (0, angular_1.generate)('service', options);
 }
 exports.default = default_1;

package/src/schematics/service/index.spec.js

@@ -19,35 +19,35 @@ describe('service schematic', () => {
     };
     beforeEach(() => {
         appTree = schematics_1.Tree.empty();
-        appTree = testing_1.createXplatWithNativeScriptWeb(appTree, null, 'angular');
+        appTree = (0, testing_1.createXplatWithNativeScriptWeb)(appTree, null, 'angular');
     });
     it('should create service in libs by default for use across any platform and apps', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
-        let tree = yield testing_2.runSchematic('feature', {
+        let tree = yield (0, testing_2.runSchematic)('feature', {
             name: 'foo',
             platforms: 'nativescript,web',
         }, appTree);
         const options = Object.assign({}, defaultOptions);
-        tree = yield testing_2.runSchematic('service', options, tree);
+        tree = yield (0, testing_2.runSchematic)('service', options, tree);
         // console.log(files.slice(91,files.length));
         expect(tree.exists('/libs/xplat/core/src/lib/services/auth.service.ts')).toBeTruthy();
         // file content
-        let content = testing_1.getFileContent(tree, '/libs/xplat/core/src/lib/services/auth.service.ts');
+        let content = (0, testing_1.getFileContent)(tree, '/libs/xplat/core/src/lib/services/auth.service.ts');
         // console.log(content);
         expect(content.indexOf(`@Injectable({`)).toBeGreaterThanOrEqual(0);
         expect(content.indexOf(`AuthService`)).toBeGreaterThanOrEqual(0);
-        content = testing_1.getFileContent(tree, '/libs/xplat/core/src/lib/services/index.ts');
+        content = (0, testing_1.getFileContent)(tree, '/libs/xplat/core/src/lib/services/index.ts');
         // console.log(content);
         expect(content.indexOf(`./auth.service`)).toBeGreaterThanOrEqual(0);
         let modulePath = '/libs/xplat/core/src/lib/core.module.ts';
-        let moduleContent = testing_1.getFileContent(tree, modulePath);
+        let moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`AuthService`)).toBe(-1);
     }));
     it('should create service for specified projects only', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
-        let tree = yield testing_2.runSchematic('feature', {
+        let tree = yield (0, testing_2.runSchematic)('feature', {
             name: 'foo',
             projects: 'nativescript-viewer,web-viewer',
             onlyProject: true,
@@ -57,7 +57,7 @@ describe('service schematic', () => {
             feature: 'foo',
             projects: 'nativescript-viewer,web-viewer',
         };
-        tree = yield testing_2.runSchematic('service', options, tree);
+        tree = yield (0, testing_2.runSchematic)('service', options, tree);
         const files = tree.files;
         // console.log(files. slice(91,files.length));
         // service should not be setup to share
@@ -69,25 +69,25 @@ describe('service schematic', () => {
         expect(files.indexOf('/apps/web-viewer/src/app/features/foo/services/auth.service.ts')).toBeGreaterThanOrEqual(0);
         // file content
         let indexPath = '/apps/nativescript-viewer/src/features/foo/services/index.ts';
-        let index = testing_1.getFileContent(tree, indexPath);
+        let index = (0, testing_1.getFileContent)(tree, indexPath);
         // console.log(barrelPath + ':');
         // console.log(barrelIndex);
         // symbol should be at end of components collection
         expect(index.indexOf(`./auth.service`)).toBeGreaterThanOrEqual(0);
         let modulePath = '/apps/nativescript-viewer/src/features/foo/foo.module.ts';
-        let moduleContent = testing_1.getFileContent(tree, modulePath);
+        let moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`./services`)).toBe(-1);
         indexPath = '/apps/web-viewer/src/app/features/foo/services/index.ts';
-        index = testing_1.getFileContent(tree, indexPath);
+        index = (0, testing_1.getFileContent)(tree, indexPath);
         // console.log(barrelPath + ':');
         // console.log(barrelIndex);
         expect(index.indexOf(`./auth.service`)).toBeGreaterThanOrEqual(0);
     }));
     it('should create service for specified platform with targeted feature only', () => __awaiter(void 0, void 0, void 0, function* () {
         // console.log('appTree:', appTree);
-        let tree = yield testing_2.runSchematic('feature', {
+        let tree = yield (0, testing_2.runSchematic)('feature', {
             name: 'foo',
             platforms: 'nativescript',
         }, appTree);
@@ -96,22 +96,22 @@ describe('service schematic', () => {
             feature: 'foo',
             platforms: 'nativescript',
         };
-        tree = yield testing_2.runSchematic('service', options, tree);
+        tree = yield (0, testing_2.runSchematic)('service', options, tree);
         const files = tree.files;
         // console.log(files.slice(91,files.length));
         expect(files.indexOf('/libs/xplat/nativescript/features/src/lib/foo/services/auth.service.ts')).toBeGreaterThanOrEqual(0);
         // should NOT add for other platform
         expect(files.indexOf('/libs/xplat/web/features/src/lib/foo/services/auth.service.ts')).toBe(-1);
         // file content
-        let content = testing_1.getFileContent(tree, '/libs/xplat/nativescript/features/src/lib/foo/services/auth.service.ts');
+        let content = (0, testing_1.getFileContent)(tree, '/libs/xplat/nativescript/features/src/lib/foo/services/auth.service.ts');
         // console.log(content);
         expect(content.indexOf(`@Injectable({`)).toBeGreaterThanOrEqual(0);
         expect(content.indexOf(`AuthService`)).toBeGreaterThanOrEqual(0);
-        content = testing_1.getFileContent(tree, '/libs/xplat/nativescript/features/src/lib/foo/services/index.ts');
+        content = (0, testing_1.getFileContent)(tree, '/libs/xplat/nativescript/features/src/lib/foo/services/index.ts');
         // console.log(content);
         expect(content.indexOf(`./auth.service`)).toBeGreaterThanOrEqual(0);
         let modulePath = '/libs/xplat/nativescript/features/src/lib/foo/foo.module.ts';
-        let moduleContent = testing_1.getFileContent(tree, modulePath);
+        let moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`AuthService`)).toBe(-1);
@@ -122,22 +122,22 @@ describe('service schematic', () => {
             name: 'auth',
             platforms: 'nativescript',
         };
-        let tree = yield testing_2.runSchematic('service', options, appTree);
+        let tree = yield (0, testing_2.runSchematic)('service', options, appTree);
         const files = tree.files;
         // console.log(files.slice(91,files.length));
         expect(files.indexOf('/libs/xplat/nativescript/core/src/lib/services/auth.service.ts')).toBeGreaterThanOrEqual(0);
         // should NOT add for other platform
         expect(files.indexOf('/libs/xplat/web/core/src/lib/services/auth.service.ts')).toBe(-1);
         // file content
-        let content = testing_1.getFileContent(tree, '/libs/xplat/nativescript/core/src/lib/services/auth.service.ts');
+        let content = (0, testing_1.getFileContent)(tree, '/libs/xplat/nativescript/core/src/lib/services/auth.service.ts');
         // console.log(content);
         expect(content.indexOf(`@Injectable({`)).toBeGreaterThanOrEqual(0);
         expect(content.indexOf(`AuthService`)).toBeGreaterThanOrEqual(0);
-        content = testing_1.getFileContent(tree, '/libs/xplat/nativescript/core/src/lib/services/index.ts');
+        content = (0, testing_1.getFileContent)(tree, '/libs/xplat/nativescript/core/src/lib/services/index.ts');
         // console.log(content);
         expect(content.indexOf(`./auth.service`)).toBeGreaterThanOrEqual(0);
         let modulePath = '/libs/xplat/nativescript/core/src/lib/core.module.ts';
-        let moduleContent = testing_1.getFileContent(tree, modulePath);
+        let moduleContent = (0, testing_1.getFileContent)(tree, modulePath);
         // console.log(modulePath + ':');
         // console.log(moduleContent);
         expect(moduleContent.indexOf(`AuthService`)).toBe(-1);

package/src/schematics/xplat/index.js

@@ -9,8 +9,8 @@ const focus_1 = require("@nstudio/focus");
 function default_1(options) {
     // console.log(`Generating xplat angular support for: ${options.platforms}`);
     const externalChains = xplat_2.XplatAngularHelpers.externalChains(options);
-    return schematics_1.chain([
-        xplat_utils_1.prerun(options, true),
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)(options, true),
         // libs
         xplat_1.XplatHelpers.generateLib(options, 'core', 'xplat', 'node'),
         xplat_1.XplatHelpers.cleanupLib(options, 'core', 'xplat'),
@@ -25,22 +25,22 @@ function default_1(options) {
         xplat_1.XplatHelpers.cleanupLib(options, 'utils', 'xplat'),
         xplat_2.XplatAngularHelpers.addLibFiles(options, './', 'utils'),
         // cross platform support
-        (tree, context) => schematics_1.chain(externalChains),
+        (tree, context) => (0, schematics_1.chain)(externalChains),
         xplat_2.XplatAngularHelpers.updateRootDeps(options),
         // adjust root tsconfig
         (tree, context) => {
-            return xplat_1.updateTsConfig(tree, (tsConfig) => {
+            return (0, xplat_1.updateTsConfig)(tree, (tsConfig) => {
                 if (tsConfig) {
                     if (!tsConfig.compilerOptions) {
                         tsConfig.compilerOptions = {};
                     }
-                    if (!tsConfig.compilerOptions.paths[`@${xplat_utils_1.getNpmScope()}/xplat/environments`]) {
-                        tsConfig.compilerOptions.paths[`@${xplat_utils_1.getNpmScope()}/xplat/environments`] = [`libs/xplat/core/src/lib/environments/base/index.ts`];
+                    if (!tsConfig.compilerOptions.paths[`@${(0, xplat_utils_1.getNpmScope)()}/xplat/environments`]) {
+                        tsConfig.compilerOptions.paths[`@${(0, xplat_utils_1.getNpmScope)()}/xplat/environments`] = [`libs/xplat/core/src/lib/environments/base/index.ts`];
                     }
                 }
             });
         },
-        workspace_1.formatFiles({ skipFormat: options.skipFormat }),
+        (0, workspace_1.formatFiles)({ skipFormat: options.skipFormat }),
         // clean shared code script - don't believe need this anymore
         // (tree: Tree) => {
         //   const scripts = {};

package/src/schematics/xplat/index.spec.js

@@ -13,7 +13,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const testing_1 = require("@nstudio/xplat/testing");
 const testing_2 = require("../../utils/testing");
-xplat_utils_1.setTest();
+(0, xplat_utils_1.setTest)();
 describe('xplat schematic', () => {
     let appTree;
     const defaultOptions = {
@@ -22,12 +22,12 @@ describe('xplat schematic', () => {
     };
     beforeEach(() => {
         appTree = schematics_1.Tree.empty();
-        appTree = testing_1.createEmptyWorkspace(appTree, 'angular');
+        appTree = (0, testing_1.createEmptyWorkspace)(appTree, 'angular');
     });
     it('should create default xplat support for web,nativescript + libs + testing support', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'web,nativescript';
-        const tree = yield testing_2.runSchematic('xplat', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('xplat', options, appTree);
         const files = tree.files;
         // console.log(files);
         expect(files.indexOf('/libs/xplat/core/src/lib/index.ts')).toBeGreaterThanOrEqual(0);
@@ -36,14 +36,14 @@ describe('xplat schematic', () => {
         expect(files.indexOf('/libs/xplat/web/core/src/lib/index.ts')).toBeGreaterThanOrEqual(0);
         expect(files.indexOf('/libs/xplat/nativescript/core/src/lib/index.ts')).toBeGreaterThanOrEqual(0);
         let filePath = '/tsconfig.base.json';
-        let fileContent = xplat_utils_1.jsonParse(testing_1.getFileContent(tree, filePath));
+        let fileContent = (0, xplat_utils_1.jsonParse)((0, testing_1.getFileContent)(tree, filePath));
         // console.log(fileContent);
         expect(fileContent.compilerOptions.paths['@testing/xplat/environments']).toBeTruthy();
     }));
     it('should create default xplat support for web,nativescript', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'web,nativescript';
-        const tree = yield testing_2.runSchematic('xplat', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('xplat', options, appTree);
         const files = tree.files;
         expect(files.indexOf('/libs/xplat/web/features/src/lib/items/items.module.ts')).toBe(-1);
         expect(files.indexOf('/libs/xplat/web/core/src/lib/index.ts')).toBeGreaterThanOrEqual(0);
@@ -54,13 +54,13 @@ describe('xplat schematic', () => {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'ionic';
         options.framework = 'angular';
-        const tree = yield testing_2.runSchematic('xplat', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('xplat', options, appTree);
         const files = tree.files;
         expect(files.indexOf('/xplat/web/index.ts')).toBeGreaterThanOrEqual(0);
         expect(files.indexOf('/xplat/ionic/index.ts')).toBeGreaterThanOrEqual(0);
         expect(files.indexOf('/xplat/nativescript/index.ts')).toBeGreaterThanOrEqual(-1);
         const packagePath = '/package.json';
-        const packageFile = xplat_utils_1.jsonParse(testing_1.getFileContent(tree, packagePath));
+        const packageFile = (0, xplat_utils_1.jsonParse)((0, testing_1.getFileContent)(tree, packagePath));
         const hasScss = packageFile.dependencies[`@testing/scss`];
         expect(hasScss).not.toBeUndefined();
         const hasWebScss = packageFile.dependencies[`@testing/web-scss`];
@@ -72,13 +72,13 @@ describe('xplat schematic', () => {
     it('should create default xplat support for electron which should always include web as well', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'electron';
-        const tree = yield testing_2.runSchematic('xplat', options, appTree);
+        const tree = yield (0, testing_2.runSchematic)('xplat', options, appTree);
         const files = tree.files;
         expect(files.indexOf('/libs/xplat/web/core/src/lib/index.ts')).toBeGreaterThanOrEqual(0);
         expect(files.indexOf('/libs/xplat/electron/core/src/lib/index.ts')).toBeGreaterThanOrEqual(0);
         expect(files.indexOf('/libs/xplat/nativescript/core/src/lib/index.ts')).toBeGreaterThanOrEqual(-1);
         const packagePath = '/package.json';
-        const packageFile = xplat_utils_1.jsonParse(testing_1.getFileContent(tree, packagePath));
+        const packageFile = (0, xplat_utils_1.jsonParse)((0, testing_1.getFileContent)(tree, packagePath));
         const hasScss = packageFile.dependencies[`@testing/xplat-scss`];
         expect(hasScss).not.toBeUndefined();
         // const hasWebScss = packageFile.dependencies[`@testing/xplat-web-scss`];
@@ -93,7 +93,7 @@ describe('xplat schematic', () => {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'ionic,web';
         options.framework = 'angular';
-        let tree = yield testing_2.runSchematic('xplat', options, appTree);
+        let tree = yield (0, testing_2.runSchematic)('xplat', options, appTree);
         // let files = tree.files;
         expect(tree.exists('/libs/xplat/web/core/src/lib/index.ts')).toBeTruthy();
         expect(tree.exists('/libs/xplat/ionic/core/src/lib/index.ts')).toBeTruthy();
@@ -101,7 +101,7 @@ describe('xplat schematic', () => {
         options.platforms = 'nativescript';
         // let packageFile = jsonParse(getFileContent(tree, 'package.json'));
         // console.log('packageFile.xplat:', packageFile.xplat);
-        tree = yield testing_2.runSchematic('xplat', options, tree);
+        tree = yield (0, testing_2.runSchematic)('xplat', options, tree);
         // packageFile = jsonParse(getFileContent(tree, 'package.json'));
         // console.log('after 2nd xplat run packageFile.xplat:', packageFile.xplat);
         // files = tree.files;
@@ -113,11 +113,11 @@ describe('xplat schematic', () => {
     }));
     it('should NOT create xplat unless platforms are specified', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
-        yield expect(testing_2.runSchematic('xplat', options, appTree)).rejects.toThrow(`You must specify which platforms you wish to generate support for. For example: nx g @nstudio/xplat:init --prefix=foo --platforms=${xplat_utils_1.supportedPlatforms.join(',')}`);
+        yield expect((0, testing_2.runSchematic)('xplat', options, appTree)).rejects.toThrow(`You must specify which platforms you wish to generate support for. For example: nx g @nstudio/xplat:init --prefix=foo --platforms=${xplat_utils_1.supportedPlatforms.join(',')}`);
     }));
     it('should NOT create unsupported xplat option and throw', () => __awaiter(void 0, void 0, void 0, function* () {
         const options = Object.assign({}, defaultOptions);
         options.platforms = 'desktop';
-        yield expect(testing_2.runSchematic('xplat', options, appTree)).rejects.toThrow(`desktop is currently not a supported platform. Supported at the moment: ${xplat_utils_1.supportedPlatforms}. Please request support for this platform if you'd like and/or submit a PR which we would greatly appreciate.`);
+        yield expect((0, testing_2.runSchematic)('xplat', options, appTree)).rejects.toThrow(`desktop is currently not a supported platform. Supported at the moment: ${xplat_utils_1.supportedPlatforms}. Please request support for this platform if you'd like and/or submit a PR which we would greatly appreciate.`);
     }));
 });

package/src/utils/ast.js

@@ -4,7 +4,7 @@ exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addE
 const ts = require("typescript");
 const ast_utils_1 = require("@nrwl/workspace/src/utils/ast-utils");
 const path = require("path");
-const workspace_1 = require("@nrwl/workspace");
+const xplat_utils_1 = require("@nstudio/xplat-utils");
 function addToCollection(source, barrelIndexPath, symbolName, insertSpaces = '') {
     const collection = getCollection(source);
     if (!collection)
@@ -22,7 +22,7 @@ function addToCollection(source, barrelIndexPath, symbolName, insertSpaces = '')
 }
 exports.addToCollection = addToCollection;
 function getCollection(source) {
-    const allCollections = ast_utils_1.findNodes(source, ts.SyntaxKind.ArrayLiteralExpression);
+    const allCollections = (0, ast_utils_1.findNodes)(source, ts.SyntaxKind.ArrayLiteralExpression);
     // console.log('allCollections:', allCollections);
     // allCollections.forEach((i: ts.ArrayLiteralExpression) => {
     //   console.log('getText:',i.getText());
@@ -79,7 +79,7 @@ function _angularImportsFromNode(node, _sourceFile) {
     }
 }
 function getDecoratorMetadata(source, identifier, module) {
-    const angularImports = ast_utils_1.findNodes(source, ts.SyntaxKind.ImportDeclaration)
+    const angularImports = (0, ast_utils_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration)
         .map((node) => _angularImportsFromNode(node, source))
         .reduce((acc, current) => {
         for (const key of Object.keys(current)) {
@@ -87,7 +87,7 @@ function getDecoratorMetadata(source, identifier, module) {
         }
         return acc;
     }, {});
-    return ast_utils_1.getSourceNodes(source)
+    return (0, ast_utils_1.getSourceNodes)(source)
         .filter((node) => {
         return (node.kind == ts.SyntaxKind.Decorator &&
             node.expression.kind == ts.SyntaxKind.CallExpression);
@@ -258,7 +258,7 @@ function addImportToModule(source, modulePath, symbolName) {
 }
 exports.addImportToModule = addImportToModule;
 function addImportToTestBed(source, specPath, symbolName) {
-    const allCalls = (ast_utils_1.findNodes(source, ts.SyntaxKind.CallExpression));
+    const allCalls = ((0, ast_utils_1.findNodes)(source, ts.SyntaxKind.CallExpression));
     const configureTestingModuleObjectLiterals = allCalls
         .filter((c) => c.expression.kind === ts.SyntaxKind.PropertyAccessExpression)
         .filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
@@ -346,7 +346,7 @@ function addEntryComponents(source, modulePath, symbolName) {
 }
 exports.addEntryComponents = addEntryComponents;
 function readBootstrapInfo(host, app) {
-    const config = ast_utils_1.getProjectConfig(host, app);
+    const config = (0, ast_utils_1.getProjectConfig)(host, app);
     let mainPath;
     try {
         mainPath = config.architect.build.options.main;
@@ -359,7 +359,7 @@ function readBootstrapInfo(host, app) {
     }
     const mainSource = host.read(mainPath).toString('utf-8');
     const main = ts.createSourceFile(mainPath, mainSource, ts.ScriptTarget.Latest, true);
-    const moduleImports = ast_utils_1.getImport(main, (s) => s.indexOf('.module') > -1);
+    const moduleImports = (0, ast_utils_1.getImport)(main, (s) => s.indexOf('.module') > -1);
     if (moduleImports.length !== 1) {
         throw new Error(`main.ts can only import a single module`);
     }
@@ -372,7 +372,7 @@ function readBootstrapInfo(host, app) {
     const moduleSourceText = host.read(modulePath).toString('utf-8');
     const moduleSource = ts.createSourceFile(modulePath, moduleSourceText, ts.ScriptTarget.Latest, true);
     const bootstrapComponentClassName = getBootstrapComponent(moduleSource, moduleClassName);
-    const bootstrapComponentFileName = `./${path.join(path.dirname(moduleImport.moduleSpec), `${workspace_1.toFileName(bootstrapComponentClassName.substring(0, bootstrapComponentClassName.length - 9))}.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,