@nstudio/angular 15.0.4-rc.1 → 16.5.0

package/src/utils/generator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adjustSandbox = exports.adjustRouting = exports.adjustFeatureModuleForState = exports.adjustFeatureModule = exports.adjustModule = exports.adjustBarrelIndexForType = exports.adjustBarrelIndex = exports.adjustBarrel = exports.shouldTargetCoreBarrel = exports.isFeatureInGeneralBarrel = exports.addToFeature = exports.getNxFeaturePath = exports.getFeatureName = exports.generate = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
-const workspace_1 = require("@nrwl/workspace");
+const workspace_1 = require("@nx/workspace");
 const xplat_1 = require("@nstudio/xplat");
 const xplat_utils_1 = require("@nstudio/xplat-utils");
 const ast_1 = require("./ast");
@@ -331,12 +331,13 @@ function adjustBarrel(type, options, prefix) {
 }
 exports.adjustBarrel = adjustBarrel;
 function adjustBarrelIndex(type, options, indexFilePath, inSubFolder, isBase, importIfSubFolder) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         // console.log('adjustBarrelIndex:', indexFilePath);
         // console.log('host.exists(indexFilePath):', host.exists(indexFilePath));
         if (host.exists(indexFilePath)) {
             const indexSource = host.read(indexFilePath).toString('utf-8');
-            const indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
+            let indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
             const changes = [];
             const name = options.name.toLowerCase();
             if (!isBase && type !== 'service') {
@@ -346,45 +347,52 @@ function adjustBarrelIndex(type, options, indexFilePath, inSubFolder, isBase, im
                     const symbolName = `${xplat_1.stringUtils
                         .sanitize(options.subFolder)
                         .toUpperCase()}_${type.toUpperCase()}S`;
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${options.subFolder}';`), ...(0, ast_1.addToCollection)(indexSourceFile, indexFilePath, `...${symbolName}`, '  '));
+                    indexSourceFile = (0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `import { ${symbolName} } from './${options.subFolder}';`, false);
+                    indexSourceFile = (0, ast_1.addToCollection)(devKitTree, indexSourceFile, indexFilePath, `...${symbolName}`, '  ');
+                    changes.push(indexSourceFile);
                 }
                 else {
                     const symbolName = `${xplat_1.stringUtils.classify(name)}${xplat_1.stringUtils.capitalize(type)}`;
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${inSubFolder ? `${name}/` : ''}${name}.${type}';`), ...(0, ast_1.addToCollection)(indexSourceFile, indexFilePath, symbolName, '  '));
+                    indexSourceFile = (0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `import { ${symbolName} } from './${inSubFolder ? `${name}/` : ''}${name}.${type}';`);
+                    indexSourceFile = (0, ast_1.addToCollection)(devKitTree, indexSourceFile, indexFilePath, symbolName, '  ');
+                    changes.push(indexSourceFile);
                 }
             }
             if (type === 'component' || type === 'service' || type === 'pipe') {
                 // export symbol from barrel
                 if ((isBase || importIfSubFolder) && options.subFolder) {
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${options.subFolder}';`, true));
+                    indexSourceFile = (0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${options.subFolder}';`, true);
+                    changes.push(indexSourceFile);
                 }
                 else {
                     const subFolder = inSubFolder ? `${name}/` : '';
-                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${subFolder}${name}.${isBase ? 'base-' : ''}${type}';`, true));
+                    indexSourceFile = (0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${subFolder}${name}.${isBase ? 'base-' : ''}${type}';`, true);
+                    changes.push(indexSourceFile);
                 }
             }
-            (0, xplat_1.insert)(host, indexFilePath, changes);
+            // insert(devKitTree.tree, indexFilePath, changes);
         }
         else {
             options.needsIndex = true;
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustBarrelIndex = adjustBarrelIndex;
 function adjustBarrelIndexForType(type, options, indexFilePath) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         if (host.exists(indexFilePath)) {
             const indexSource = host.read(indexFilePath).toString('utf-8');
             const indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
             const changes = [];
-            changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${type}';`, true));
-            (0, xplat_1.insert)(host, indexFilePath, changes);
+            changes.push((0, xplat_1.addGlobal)(devKitTree, indexSourceFile, indexFilePath, `export * from './${type}';`, true));
+            // insert(devKitTree.tree, indexFilePath, changes);
         }
         else {
             options.needsIndex = true;
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustBarrelIndexForType = adjustBarrelIndexForType;
@@ -413,11 +421,12 @@ function adjustModule(tree, type, options, prefixPath) {
 }
 exports.adjustModule = adjustModule;
 function adjustFeatureModule(type, options, modulePath) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         // console.log('adjustFeatureModule:', modulePath);
         if (host.exists(modulePath)) {
             const moduleSource = host.read(modulePath).toString('utf-8');
-            const moduleSourceFile = ts.createSourceFile(modulePath, moduleSource, ts.ScriptTarget.Latest, true);
+            const moduleSourceFile = (0, ast_1.getTsSourceFile)(devKitTree, modulePath);
             const changes = [];
             let featureName;
             if (options.feature) {
@@ -463,59 +472,70 @@ function adjustFeatureModule(type, options, modulePath) {
             else {
                 if (type !== 'service') {
                     // add to module
-                    changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${collectionName} } from './${type}s';`));
-                    changes.push(...(0, ast_1.addDeclarationToModule)(moduleSourceFile, modulePath, `...${collectionName}`), ...(0, ast_1.addSymbolToNgModuleMetadata)(moduleSourceFile, modulePath, 'exports', `...${collectionName}`));
+                    changes.push((0, ast_1._addSymbolToNgModuleMetadata)(devKitTree, (0, ast_1.addDeclarationToModule)(devKitTree, (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${collectionName} } from './${type}s';`), modulePath, `...${collectionName}`), modulePath, 'exports', `...${collectionName}`));
                 }
-                (0, xplat_1.insert)(host, modulePath, changes);
+                // insert(devKitTree.tree, modulePath, changes);
             }
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustFeatureModule = adjustFeatureModule;
 function adjustFeatureModuleForState(options, modulePath) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         // console.log('adjustFeatureModuleForState:', modulePath);
         if (host.exists(modulePath)) {
             const moduleSource = host.read(modulePath).toString('utf-8');
-            const moduleSourceFile = ts.createSourceFile(modulePath, moduleSource, ts.ScriptTarget.Latest, true);
+            let moduleSourceFile = ts.createSourceFile(modulePath, moduleSource, ts.ScriptTarget.Latest, true);
             // console.log('moduleSource:', moduleSource);
             const isInLibs = modulePath.indexOf('libs/xplat/core') === 0;
             const name = options.name.toLowerCase();
             const changes = [];
             if (moduleSource.indexOf('StoreModule') === -1) {
-                changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { StoreModule } from '@ngrx/store';`));
+                moduleSourceFile = (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { StoreModule } from '@ngrx/store';`);
+                changes.push(moduleSourceFile);
             }
             if (moduleSource.indexOf('EffectsModule') === -1) {
-                changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { EffectsModule } from '@ngrx/effects';`));
+                moduleSourceFile = (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { EffectsModule } from '@ngrx/effects';`);
+                changes.push(moduleSourceFile);
             }
-            changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}Effects } from './state/${name}.effects';`), ...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.camelize(name)}Reducer } from './state/${name}.reducer';`), ...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}State } from './state/${name}.state';`));
+            moduleSourceFile = (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}Effects } from './state/${name}.effects';`);
+            moduleSourceFile = (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.camelize(name)}Reducer } from './state/${name}.reducer';`);
+            moduleSourceFile = (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}State } from './state/${name}.state';`);
+            changes.push(moduleSourceFile);
             if (options.root) {
                 if (moduleSource.indexOf('environments/environment') === -1) {
                     const envFrom = isInLibs
                         ? './environments/environment'
                         : `@${(0, xplat_utils_1.getNpmScope)()}/xplat/core`;
-                    changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { environment } from '${envFrom}';`));
+                    moduleSourceFile = (0, xplat_1.addGlobal)(devKitTree, moduleSourceFile, modulePath, `import { environment } from '${envFrom}';`);
+                    changes.push(moduleSourceFile);
                 }
-                changes.push(...(0, ast_1.addImportToModule)(moduleSourceFile, modulePath, `StoreModule.forRoot(
-      { ${xplat_1.stringUtils.camelize(name)}: ${xplat_1.stringUtils.camelize(name)}Reducer },
-      {
-        initialState: { ${xplat_1.stringUtils.camelize(name)}: ${xplat_1.stringUtils.classify(name)}State.initialState }
-      }
-    ), EffectsModule.forRoot([${xplat_1.stringUtils.classify(name)}Effects])`), ...(0, ast_1.addProviderToModule)(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
+                moduleSourceFile = (0, ast_1.addImportToModule)(devKitTree, moduleSourceFile, modulePath, `StoreModule.forRoot(
+    { ${xplat_1.stringUtils.camelize(name)}: ${xplat_1.stringUtils.camelize(name)}Reducer },
+    {
+      initialState: { ${xplat_1.stringUtils.camelize(name)}: ${xplat_1.stringUtils.classify(name)}State.initialState }
+    }
+  ), EffectsModule.forRoot([${xplat_1.stringUtils.classify(name)}Effects])`);
+                moduleSourceFile = (0, ast_1.addProviderToModule)(devKitTree, moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`);
+                changes.push(moduleSourceFile);
             }
             else {
+                moduleSourceFile = (0, ast_1.addImportToModule)(devKitTree, moduleSourceFile, modulePath, `StoreModule.forFeature('${xplat_1.stringUtils.camelize(name)}', ${xplat_1.stringUtils.camelize(name)}Reducer, { initialState: ${xplat_1.stringUtils.classify(name)}State.initialState }), EffectsModule.forFeature([${xplat_1.stringUtils.classify(name)}Effects])`);
+                moduleSourceFile = (0, ast_1.addProviderToModule)(devKitTree, moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`);
                 // feature state
-                changes.push(...(0, ast_1.addImportToModule)(moduleSourceFile, modulePath, `StoreModule.forFeature('${xplat_1.stringUtils.camelize(name)}', ${xplat_1.stringUtils.camelize(name)}Reducer, { initialState: ${xplat_1.stringUtils.classify(name)}State.initialState }), EffectsModule.forFeature([${xplat_1.stringUtils.classify(name)}Effects])`), ...(0, ast_1.addProviderToModule)(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
+                changes.push(moduleSourceFile);
             }
-            (0, xplat_1.insert)(host, modulePath, changes);
+            // insert(devKitTree.tree, modulePath, changes);
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustFeatureModuleForState = adjustFeatureModuleForState;
 function adjustRouting(options, routingModulePaths, platform) {
-    return (host) => {
+    return (host, context) => {
+        const devKitTree = (0, xplat_1.convertNgTreeToDevKit)(host, context);
         const featureName = options.name.toLowerCase();
         let routingModulePath;
         // check which routing naming convention might be in use
@@ -533,13 +553,13 @@ function adjustRouting(options, routingModulePaths, platform) {
             const routingSourceFile = ts.createSourceFile(routingModulePath, routingSource, ts.ScriptTarget.Latest, true);
             const changes = [];
             // add component to route config
-            changes.push(...(0, ast_1.addToCollection)(routingSourceFile, routingModulePath, `{ 
+            changes.push((0, ast_1.addToCollection)(devKitTree, routingSourceFile, routingModulePath, `{ 
               path: '${featureName}',
               loadChildren: () => import('./features/${options.directory ? options.directory + '/' : ''}${featureName}/${featureName}.module').then(m => m.${xplat_1.stringUtils.classify(featureName)}Module)
           }`));
-            (0, xplat_1.insert)(host, routingModulePath, changes);
+            // insert(devKitTree.tree, routingModulePath, changes);
         }
-        return host;
+        return devKitTree.tree;
     };
 }
 exports.adjustRouting = adjustRouting;

package/src/utils/testing.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLibConfig = exports.getAppConfig = exports.callRule = exports.runSchematic = void 0;
 const path_1 = require("path");
 const testing_1 = require("@angular-devkit/schematics/testing");
-// import { createApp, createLib } from '@nrwl/angular/testing';
-// import { names, toFileName } from '@nrwl/workspace';
+// import { createApp, createLib } from '@nx/angular/testing';
+// import { names, toFileName } from '@nx/workspace';
 const testRunner = new testing_1.SchematicTestRunner('@nstudio/angular', (0, path_1.join)(__dirname, '../../collection.json'));
 function runSchematic(schematicName, options, tree) {
     return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();

package/src/utils/versions.d.ts

@@ -1,11 +1,10 @@
 export declare const xplatVersion = "*";
-export declare const nxVersion = "^15.0.0";
-export declare const angularVersion = "^15.0.0";
-export declare const angularDevkitVersion = "^15.0.0";
+export declare const nxVersion = "^16.2.0";
+export declare const angularVersion = "^16.0.0";
+export declare const angularDevkitVersion = "^16.0.0";
 export declare const ngxTranslateVersion = "~14.0.0";
 export declare const ngxTranslateHttpVersion = "~7.0.0";
-export declare const coreJsVersion = "^3.6.5";
 export declare const rxjsVersion = "^7.8.0";
 export declare const zonejsVersion = "~0.13.0";
-export declare const jestPresetAngular = "11.0.0";
+export declare const jestPresetAngular = "^13.0.0";
 export declare const typesJest = "29.4.0";

package/src/utils/versions.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typesJest = exports.jestPresetAngular = exports.zonejsVersion = exports.rxjsVersion = exports.coreJsVersion = exports.ngxTranslateHttpVersion = exports.ngxTranslateVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = exports.xplatVersion = void 0;
-exports.xplatVersion = '15.0.4-rc.1';
-exports.nxVersion = '^15.0.0';
-exports.angularVersion = '^15.0.0';
-exports.angularDevkitVersion = '^15.0.0';
+exports.typesJest = exports.jestPresetAngular = exports.zonejsVersion = exports.rxjsVersion = exports.ngxTranslateHttpVersion = exports.ngxTranslateVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = exports.xplatVersion = void 0;
+exports.xplatVersion = '16.5.0';
+exports.nxVersion = '^16.2.0';
+exports.angularVersion = '^16.0.0';
+exports.angularDevkitVersion = '^16.0.0';
 exports.ngxTranslateVersion = '~14.0.0';
 exports.ngxTranslateHttpVersion = '~7.0.0';
-exports.coreJsVersion = '^3.6.5';
 exports.rxjsVersion = '^7.8.0';
 exports.zonejsVersion = '~0.13.0';
-exports.jestPresetAngular = '11.0.0';
+exports.jestPresetAngular = '^13.0.0';
 exports.typesJest = '29.4.0';

package/src/utils/xplat.js

@@ -100,17 +100,18 @@ var XplatAngularHelpers;
                 dependencies[`@angular/platform-browser`] = ngVersion;
                 dependencies[`@angular/platform-browser-dynamic`] = ngVersion;
                 dependencies[`@angular/router`] = ngVersion;
-                dependencies[`core-js`] = versions_1.coreJsVersion;
-                dependencies[`rxjs`] = versions_1.rxjsVersion;
+                if (!dependencies[`rxjs`]) {
+                    dependencies[`rxjs`] = versions_1.rxjsVersion;
+                }
                 dependencies[`zone.js`] = versions_1.zonejsVersion;
                 devDependencies[`@angular/compiler-cli`] = ngVersion;
                 devDependencies[`@angular/language-service`] = ngVersion;
             }
-            if (!packageJson.devDependencies['@nrwl/angular']) {
-                packageJson.devDependencies['@nrwl/angular'] = versions_1.nxVersion;
+            if (!packageJson.devDependencies['@nx/angular']) {
+                packageJson.devDependencies['@nx/angular'] = versions_1.nxVersion;
             }
-            if (!packageJson.devDependencies['@nrwl/jest']) {
-                packageJson.devDependencies['@nrwl/jest'] = versions_1.nxVersion;
+            if (!packageJson.devDependencies['@nx/jest']) {
+                packageJson.devDependencies['@nx/jest'] = versions_1.nxVersion;
             }
             if (!packageJson.devDependencies['@nstudio/web']) {
                 packageJson.devDependencies['@nstudio/web'] = versions_1.xplatVersion;