@nstudio/angular 12.6.0-rc.0 → 13.4.0

package/src/utils/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 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.isFeatureNxLib = exports.getFeatureName = exports.generate = void 0;
+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 xplat_1 = require("@nstudio/xplat");
@@ -9,14 +9,14 @@ const ast_1 = require("./ast");
 const ts = require("typescript");
 function generate(type, options) {
     if (!options.name) {
-        throw new Error(xplat_1.generateOptionError(type));
+        throw new Error((0, xplat_1.generateOptionError)(type));
     }
     let featureName = getFeatureName(options);
     let platforms = [];
     const externalChains = [];
     if (options.projects) {
         // building in projects
-        const projects = xplat_utils_1.sanitizeCommaDelimitedArg(options.projects);
+        const projects = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.projects);
         for (const name of projects) {
             const nameParts = name.split('-');
             const platPrefix = nameParts[0];
@@ -35,12 +35,12 @@ function generate(type, options) {
     }
     else if (options.platforms) {
         // building in shared code only
-        platforms = xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms);
+        platforms = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms);
     }
     const projectChains = [];
     if (options.projects) {
         for (const fullProjectPath of options.projects.split(',')) {
-            const projectName = xplat_utils_1.parseProjectNameFromPath(fullProjectPath);
+            const projectName = (0, xplat_utils_1.parseProjectNameFromPath)(fullProjectPath);
             const projectParts = projectName.split('-');
             const platform = xplat_utils_1.supportedPlatforms.includes(projectParts[0])
                 ? projectParts[0]
@@ -70,7 +70,7 @@ function generate(type, options) {
                 // console.log('featureModulePath:', featureModulePath);
                 // console.log('projectName:', projectName);
                 if (!tree.exists(featureModulePath)) {
-                    throw new Error(xplat_1.needFeatureModuleError(featureModulePath, featureName, projectName, true));
+                    throw new Error((0, xplat_1.needFeatureModuleError)(featureModulePath, featureName, projectName, true));
                 }
                 return addToFeature(platform, type, options, prefixPath, tree)(tree, context);
             });
@@ -86,7 +86,7 @@ function generate(type, options) {
                     return adjustFeatureModuleForState(options, featureModulePath)(tree, context);
                 });
                 projectChains.push((tree, context) => {
-                    return xplat_1.updatePackageForNgrx(tree, `apps/${fullProjectPath}/package.json`);
+                    return (0, xplat_1.updatePackageForNgrx)(tree, `apps/${fullProjectPath}/package.json`);
                 });
             }
             else {
@@ -103,7 +103,7 @@ function generate(type, options) {
         }
     }
     else {
-        projectChains.push(schematics_1.noop());
+        projectChains.push((0, schematics_1.noop)());
         for (const platform of platforms) {
             if (xplat_utils_1.supportedPlatforms.includes(platform)) {
                 // externalChains.push(externalSchematic(`@nstudio/${platform}-angular`, type, options, {
@@ -123,7 +123,7 @@ function generate(type, options) {
                     const xplatFolderName = xplat_1.XplatHelpers.getXplatFoldername(platform, 'angular');
                     return options.needsIndex
                         ? addToFeature(xplatFolderName, type, options, `libs/xplat/${xplatFolderName}`, tree, '_index')(tree, context)
-                        : schematics_1.noop()(tree, context);
+                        : (0, schematics_1.noop)()(tree, context);
                 });
                 // adjust feature module metadata if needed
                 externalChains.push((tree, context) => {
@@ -132,46 +132,57 @@ function generate(type, options) {
                 });
             }
             else {
-                throw new Error(xplat_1.unsupportedPlatformError(platform));
+                throw new Error((0, xplat_1.unsupportedPlatformError)(platform));
             }
         }
     }
-    return schematics_1.chain([
-        xplat_utils_1.prerun(),
+    return (0, schematics_1.chain)([
+        (0, xplat_utils_1.prerun)(),
         (tree, context) => 
         // for entire workspace usage
         // no projects and no specific platforms specified
         !options.projects && platforms.length === 0
             ? addToFeature('', type, options, 'libs/xplat', tree)(tree, context)
-            : schematics_1.noop()(tree, context),
+            : (0, schematics_1.noop)()(tree, context),
         // adjust libs barrel
         (tree, context) => !options.projects && platforms.length === 0
             ? adjustBarrel(type, options, 'libs/xplat')(tree, context)
-            : schematics_1.noop()(tree, context),
+            : (0, schematics_1.noop)()(tree, context),
         // add index barrel if needed
         (tree, context) => options.needsIndex
             ? addToFeature('', type, options, 'libs/xplat', tree, '_index')(tree, context)
-            : schematics_1.noop()(tree, context),
+            : (0, schematics_1.noop)()(tree, context),
         // adjust feature module metadata if needed
         (tree, context) => !options.projects && platforms.length === 0
             ? adjustModule(tree, type, options, 'libs/xplat')(tree, context)
-            : schematics_1.noop()(tree, context),
+            : (0, schematics_1.noop)()(tree, context),
         // project handling
-        (tree, context) => schematics_1.chain(projectChains),
-        (tree, context) => schematics_1.chain(externalChains),
+        (tree, context) => (0, schematics_1.chain)(projectChains),
+        (tree, context) => (0, schematics_1.chain)(externalChains),
         // dependency updates
         (tree, context) => !options.projects && type === 'state'
             ? // ensure ngrx dependencies are added to root package
-                xplat_1.updatePackageForNgrx(tree)
-            : schematics_1.noop()(tree, context),
-        workspace_1.formatFiles({ skipFormat: options.skipFormat }),
+                (0, xplat_1.updatePackageForNgrx)(tree)
+            : (0, schematics_1.noop)()(tree, context),
+        (0, workspace_1.formatFiles)({ skipFormat: options.skipFormat }),
     ]);
 }
 exports.generate = generate;
 function getFeatureName(options) {
     let featureName;
+    const isNxLib = xplat_1.XplatHelpers.isFeatureNxLib(options.feature);
     if (options.feature) {
-        featureName = options.feature.toLowerCase();
+        if (isNxLib) {
+            // use lib name "as-is"
+            featureName = options.feature.toLowerCase();
+        }
+        else {
+            // otherwise, user is wanting to target a feature nested in a folder (within features)
+            const dirParts = options.feature.split('/');
+            if (dirParts.length) {
+                featureName = dirParts.pop().toLowerCase();
+            }
+        }
     }
     if (!featureName) {
         if (options.projects) {
@@ -186,12 +197,8 @@ function getFeatureName(options) {
     return featureName;
 }
 exports.getFeatureName = getFeatureName;
-function isFeatureNxLib(featureName) {
-    return featureName && featureName.indexOf('@') === 0;
-}
-exports.isFeatureNxLib = isFeatureNxLib;
 function getNxFeaturePath(tree, featureName) {
-    const tsConfig = workspace_1.readJsonInTree(tree, 'tsconfig.base.json');
+    const tsConfig = (0, workspace_1.readJsonInTree)(tree, 'tsconfig.base.json');
     if (tsConfig) {
         if (tsConfig.compilerOptions &&
             tsConfig.compilerOptions.paths &&
@@ -211,7 +218,19 @@ function getNxFeaturePath(tree, featureName) {
 exports.getNxFeaturePath = getNxFeaturePath;
 function addToFeature(xplatFolderName, type, options, prefixPath, tree, extra = '', forSubFolder) {
     let featureName = getFeatureName(options);
-    const isNxLib = isFeatureNxLib(featureName);
+    const isNxLib = xplat_1.XplatHelpers.isFeatureNxLib(featureName);
+    let directory = '';
+    let relativeDirectory = '';
+    if (!isNxLib && options.feature) {
+        const dirParts = options.feature.split('/');
+        if (dirParts.length) {
+            dirParts.pop();
+            directory = dirParts.join('/');
+            const relative = [];
+            dirParts.forEach(() => relative.push('..'));
+            relativeDirectory = relative.join('/') + '/';
+        }
+    }
     options.needsIndex = false; // reset
     const srcSubFolderPath = options.projects ? '' : '/src/lib';
     let featurePath;
@@ -226,7 +245,7 @@ function addToFeature(xplatFolderName, type, options, prefixPath, tree, extra =
         featurePath = `${prefixPath}/${featureName}${srcSubFolderPath}`;
     }
     else {
-        featurePath = `${prefixPath}/features${srcSubFolderPath}/${featureName}`;
+        featurePath = `${prefixPath}/features${srcSubFolderPath}/${directory ? directory + '/' : ''}${featureName}`;
     }
     const featureModulePath = `${featurePath}/${featureName}.module.ts`;
     let moveTo;
@@ -245,7 +264,7 @@ function addToFeature(xplatFolderName, type, options, prefixPath, tree, extra =
                     optionName = parts[2];
                 }
             }
-            throw new Error(xplat_1.needFeatureModuleError(featureModulePath, featureName, optionName));
+            throw new Error((0, xplat_1.needFeatureModuleError)(featureModulePath, featureName, optionName));
         }
     }
     if (forSubFolder && options.subFolder) {
@@ -256,14 +275,15 @@ function addToFeature(xplatFolderName, type, options, prefixPath, tree, extra =
     if ((extra === '_index' || extra === '_base_index') &&
         tree.exists(indexPath)) {
         // already has an index barrel
-        return schematics_1.noop();
+        return (0, schematics_1.noop)();
     }
     else {
-        return schematics_1.branchAndMerge(schematics_1.mergeWith(schematics_1.apply(schematics_1.url(`./${extra}_files`), [
-            schematics_1.template(Object.assign(Object.assign(Object.assign({}, options), xplat_1.getDefaultTemplateOptions()), { name: options.name.toLowerCase(), xplatFolderName,
+        return (0, schematics_1.branchAndMerge)((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(`./${extra}_files`), [
+            (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({}, options), (0, xplat_1.getDefaultTemplateOptions)()), { name: options.name.toLowerCase(), relativeDirectory,
+                xplatFolderName,
                 // feature: featureName,
                 forSubFolder })),
-            schematics_1.move(moveTo),
+            (0, schematics_1.move)(moveTo),
         ])));
     }
 }
@@ -326,24 +346,24 @@ function adjustBarrelIndex(type, options, indexFilePath, inSubFolder, isBase, im
                     const symbolName = `${xplat_1.stringUtils
                         .sanitize(options.subFolder)
                         .toUpperCase()}_${type.toUpperCase()}S`;
-                    changes.push(...xplat_1.addGlobal(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${options.subFolder}';`), ...ast_1.addToCollection(indexSourceFile, indexFilePath, `...${symbolName}`, '  '));
+                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${options.subFolder}';`), ...(0, ast_1.addToCollection)(indexSourceFile, indexFilePath, `...${symbolName}`, '  '));
                 }
                 else {
                     const symbolName = `${xplat_1.stringUtils.classify(name)}${xplat_1.stringUtils.capitalize(type)}`;
-                    changes.push(...xplat_1.addGlobal(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${inSubFolder ? `${name}/` : ''}${name}.${type}';`), ...ast_1.addToCollection(indexSourceFile, indexFilePath, symbolName, '  '));
+                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `import { ${symbolName} } from './${inSubFolder ? `${name}/` : ''}${name}.${type}';`), ...(0, ast_1.addToCollection)(indexSourceFile, indexFilePath, symbolName, '  '));
                 }
             }
             if (type === 'component' || type === 'service' || type === 'pipe') {
                 // export symbol from barrel
                 if ((isBase || importIfSubFolder) && options.subFolder) {
-                    changes.push(...xplat_1.addGlobal(indexSourceFile, indexFilePath, `export * from './${options.subFolder}';`, true));
+                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${options.subFolder}';`, true));
                 }
                 else {
                     const subFolder = inSubFolder ? `${name}/` : '';
-                    changes.push(...xplat_1.addGlobal(indexSourceFile, indexFilePath, `export * from './${subFolder}${name}.${isBase ? 'base-' : ''}${type}';`, true));
+                    changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${subFolder}${name}.${isBase ? 'base-' : ''}${type}';`, true));
                 }
             }
-            xplat_1.insert(host, indexFilePath, changes);
+            (0, xplat_1.insert)(host, indexFilePath, changes);
         }
         else {
             options.needsIndex = true;
@@ -358,8 +378,8 @@ function adjustBarrelIndexForType(type, options, indexFilePath) {
             const indexSource = host.read(indexFilePath).toString('utf-8');
             const indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
             const changes = [];
-            changes.push(...xplat_1.addGlobal(indexSourceFile, indexFilePath, `export * from './${type}';`, true));
-            xplat_1.insert(host, indexFilePath, changes);
+            changes.push(...(0, xplat_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${type}';`, true));
+            (0, xplat_1.insert)(host, indexFilePath, changes);
         }
         else {
             options.needsIndex = true;
@@ -370,7 +390,7 @@ function adjustBarrelIndexForType(type, options, indexFilePath) {
 exports.adjustBarrelIndexForType = adjustBarrelIndexForType;
 function adjustModule(tree, type, options, prefixPath) {
     let featureName = getFeatureName(options);
-    const isNxLib = isFeatureNxLib(featureName);
+    const isNxLib = xplat_1.XplatHelpers.isFeatureNxLib(featureName);
     let featurePath;
     if (isNxLib) {
         featurePath = getNxFeaturePath(tree, featureName);
@@ -443,10 +463,10 @@ function adjustFeatureModule(type, options, modulePath) {
             else {
                 if (type !== 'service') {
                     // add to module
-                    changes.push(...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { ${collectionName} } from './${type}s';`));
-                    changes.push(...ast_1.addDeclarationToModule(moduleSourceFile, modulePath, `...${collectionName}`), ...ast_1.addSymbolToNgModuleMetadata(moduleSourceFile, modulePath, 'exports', `...${collectionName}`));
+                    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}`));
                 }
-                xplat_1.insert(host, modulePath, changes);
+                (0, xplat_1.insert)(host, modulePath, changes);
             }
         }
         return host;
@@ -464,31 +484,31 @@ function adjustFeatureModuleForState(options, modulePath) {
             const name = options.name.toLowerCase();
             const changes = [];
             if (moduleSource.indexOf('StoreModule') === -1) {
-                changes.push(...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { StoreModule } from '@ngrx/store';`));
+                changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { StoreModule } from '@ngrx/store';`));
             }
             if (moduleSource.indexOf('EffectsModule') === -1) {
-                changes.push(...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { EffectsModule } from '@ngrx/effects';`));
+                changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { EffectsModule } from '@ngrx/effects';`));
             }
-            changes.push(...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}Effects } from './state/${name}.effects';`), ...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.camelize(name)}Reducer } from './state/${name}.reducer';`), ...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { ${xplat_1.stringUtils.classify(name)}State } from './state/${name}.state';`));
+            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';`));
             if (options.root) {
                 if (moduleSource.indexOf('environments/environment') === -1) {
                     const envFrom = isInLibs
                         ? './environments/environment'
-                        : `@${xplat_utils_1.getNpmScope()}/xplat/core`;
-                    changes.push(...xplat_1.addGlobal(moduleSourceFile, modulePath, `import { environment } from '${envFrom}';`));
+                        : `@${(0, xplat_utils_1.getNpmScope)()}/xplat/core`;
+                    changes.push(...(0, xplat_1.addGlobal)(moduleSourceFile, modulePath, `import { environment } from '${envFrom}';`));
                 }
-                changes.push(...ast_1.addImportToModule(moduleSourceFile, modulePath, `StoreModule.forRoot(
+                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])`), ...ast_1.addProviderToModule(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
+    ), EffectsModule.forRoot([${xplat_1.stringUtils.classify(name)}Effects])`), ...(0, ast_1.addProviderToModule)(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
             }
             else {
                 // feature state
-                changes.push(...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])`), ...ast_1.addProviderToModule(moduleSourceFile, modulePath, `${xplat_1.stringUtils.classify(name)}Effects`));
+                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`));
             }
-            xplat_1.insert(host, modulePath, changes);
+            (0, xplat_1.insert)(host, modulePath, changes);
         }
         return host;
     };
@@ -513,11 +533,11 @@ function adjustRouting(options, routingModulePaths, platform) {
             const routingSourceFile = ts.createSourceFile(routingModulePath, routingSource, ts.ScriptTarget.Latest, true);
             const changes = [];
             // add component to route config
-            changes.push(...ast_1.addToCollection(routingSourceFile, routingModulePath, `{ 
+            changes.push(...(0, ast_1.addToCollection)(routingSourceFile, routingModulePath, `{ 
               path: '${featureName}',
-              loadChildren: () => import('./features/${featureName}/${featureName}.module').then(m => m.${xplat_1.stringUtils.classify(featureName)}Module)
+              loadChildren: () => import('./features/${options.directory ? options.directory + '/' : ''}${featureName}/${featureName}.module').then(m => m.${xplat_1.stringUtils.classify(featureName)}Module)
           }`));
-            xplat_1.insert(host, routingModulePath, changes);
+            (0, xplat_1.insert)(host, routingModulePath, changes);
         }
         return host;
     };
@@ -569,7 +589,7 @@ function adjustSandbox(options, platform, appDirectory) {
                             homeTemplate.slice(buttonEndIndex + 9);
                     break;
             }
-            workspace_1.createOrUpdate(tree, homeCmpPath, homeTemplate);
+            (0, workspace_1.createOrUpdate)(tree, homeCmpPath, homeTemplate);
         }
         else {
             throw new schematics_1.SchematicsException(`The --adjustSandbox option is only supported on the following at the moment: ${xplat_1.supportedSandboxPlatforms}`);

package/src/utils/testing.js

@@ -5,7 +5,7 @@ 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';
-const testRunner = new testing_1.SchematicTestRunner('@nstudio/angular', path_1.join(__dirname, '../../collection.json'));
+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,13 +1,11 @@
 export declare const xplatVersion = "*";
-export declare const nxVersion = "12.6.6";
-export declare const angularVersion = "^12.0.0";
-export declare const angularDevkitVersion = "^12.0.0";
-export declare const ngxTranslateVersion = "~13.0.0";
-export declare const ngxTranslateHttpVersion = "~6.0.0";
+export declare const nxVersion = "^13.0.0";
+export declare const angularVersion = "^13.0.0";
+export declare const angularDevkitVersion = "~13.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 = "^6.6.0";
-export declare const zonejsVersion = "~0.11.1";
-export declare const codelyzerVersion = "~6.0.0";
-export declare const jestJasmine2 = "~25.2.0";
-export declare const jestPresetAngular = "8.4.0";
-export declare const typesJest = "26.0.8";
+export declare const rxjsVersion = "^7.4.0";
+export declare const zonejsVersion = "~0.11.4";
+export declare const jestPresetAngular = "11.0.0";
+export declare const typesJest = "27.0.2";

package/src/utils/versions.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typesJest = exports.jestPresetAngular = exports.jestJasmine2 = exports.codelyzerVersion = exports.zonejsVersion = exports.rxjsVersion = exports.coreJsVersion = exports.ngxTranslateHttpVersion = exports.ngxTranslateVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = exports.xplatVersion = void 0;
-exports.xplatVersion = '12.6.0-rc.0';
-exports.nxVersion = '12.6.6';
-exports.angularVersion = '^12.0.0';
-exports.angularDevkitVersion = '^12.0.0';
-exports.ngxTranslateVersion = '~13.0.0';
-exports.ngxTranslateHttpVersion = '~6.0.0';
+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 = '13.4.0';
+exports.nxVersion = '^13.0.0';
+exports.angularVersion = '^13.0.0';
+exports.angularDevkitVersion = '~13.0.0';
+exports.ngxTranslateVersion = '~14.0.0';
+exports.ngxTranslateHttpVersion = '~7.0.0';
 exports.coreJsVersion = '^3.6.5';
-exports.rxjsVersion = '^6.6.0';
-exports.zonejsVersion = '~0.11.1';
-exports.codelyzerVersion = '~6.0.0';
-exports.jestJasmine2 = '~25.2.0';
-exports.jestPresetAngular = '8.4.0';
-exports.typesJest = '26.0.8';
+exports.rxjsVersion = '^7.4.0';
+exports.zonejsVersion = '~0.11.4';
+exports.jestPresetAngular = '11.0.0';
+exports.typesJest = '27.0.2';

package/src/utils/xplat.js

@@ -9,32 +9,32 @@ const versions_1 = require("./versions");
 var ComponentHelpers;
 (function (ComponentHelpers) {
     function platformGenerator(options, platform) {
-        const chains = [xplat_utils_1.prerun()];
+        const chains = [(0, xplat_utils_1.prerun)()];
         const componentSettings = xplat_1.XplatComponentHelpers.prepare(options);
         if (options.onlyProject) {
             for (const fullProjectPath of componentSettings.projectNames) {
-                const projectName = xplat_utils_1.parseProjectNameFromPath(fullProjectPath);
+                const projectName = (0, xplat_utils_1.parseProjectNameFromPath)(fullProjectPath);
                 const projectParts = projectName.split('-');
                 const platPrefix = projectParts[0];
                 const platSuffix = projectParts.pop();
                 if (platPrefix === platform || platSuffix === platform) {
                     const appDir = platform === 'web' ? '/app' : '';
                     const prefixPath = `apps/${fullProjectPath}/src${appDir}`;
-                    const featurePath = `${prefixPath}/features/${componentSettings.featureName}`;
+                    const featurePath = `${prefixPath}/features/${componentSettings.directory ? componentSettings.directory + '/' : ''}${componentSettings.featureName}`;
                     const featureModulePath = `${featurePath}/${componentSettings.featureName}.module.ts`;
                     const barrelIndex = `${featurePath}/components/index.ts`;
                     // console.log('will adjustProject:', projectName);
                     chains.push((tree, context) => {
                         if (!tree.exists(featureModulePath)) {
-                            throw new Error(xplat_1.needFeatureModuleError(featureModulePath, componentSettings.featureName, fullProjectPath, true));
+                            throw new Error((0, xplat_1.needFeatureModuleError)(featureModulePath, componentSettings.featureName, fullProjectPath, true));
                         }
-                        return generator_1.addToFeature('', 'component', options, prefixPath, tree)(tree, context);
+                        return (0, generator_1.addToFeature)('', 'component', options, prefixPath, tree)(tree, context);
                     });
                     chains.push((tree, context) => {
-                        return generator_1.adjustBarrelIndex('component', options, barrelIndex, true)(tree, context);
+                        return (0, generator_1.adjustBarrelIndex)('component', options, barrelIndex, true)(tree, context);
                     });
                     chains.push((tree, context) => {
-                        return generator_1.addToFeature('', 'component', options, prefixPath, tree, '_index')(tree, context);
+                        return (0, generator_1.addToFeature)('', 'component', options, prefixPath, tree, '_index')(tree, context);
                     });
                 }
             }
@@ -43,31 +43,33 @@ var ComponentHelpers;
             // add component
             chains.push((tree, context) => {
                 const xplatFolderName = xplat_1.XplatHelpers.getXplatFoldername(platform, 'angular');
-                return generator_1.addToFeature(xplatFolderName, 'component', options, `libs/xplat/${xplatFolderName}`, tree, ``, true)(tree, context);
+                return (0, generator_1.addToFeature)(xplatFolderName, 'component', options, `libs/xplat/${xplatFolderName}`, tree, ``, true)(tree, context);
             });
             if (options.subFolder) {
                 // adjust components barrel for subFolder
                 chains.push((tree, context) => {
                     const xplatFolderName = xplat_1.XplatHelpers.getXplatFoldername(platform, 'angular');
-                    return generator_1.adjustBarrelIndex('component', options, `libs/xplat/${xplatFolderName}/features/src/lib/${componentSettings.featureName}/components/${options.subFolder}/index.ts`, true)(tree, context);
+                    return (0, generator_1.adjustBarrelIndex)('component', options, `libs/xplat/${xplatFolderName}/features/src/lib/${componentSettings.directory
+                        ? componentSettings.directory + '/'
+                        : ''}${componentSettings.featureName}/components/${options.subFolder}/index.ts`, true)(tree, context);
                 });
                 chains.push((tree, context) => {
                     const xplatFolderName = xplat_1.XplatHelpers.getXplatFoldername(platform, 'angular');
                     return options.needsIndex
-                        ? generator_1.addToFeature(xplatFolderName, 'component', options, `libs/xplat/${xplatFolderName}`, tree, '_index', true)(tree, context)
-                        : schematics_1.noop()(tree, context);
+                        ? (0, generator_1.addToFeature)(xplatFolderName, 'component', options, `libs/xplat/${xplatFolderName}`, tree, '_index', true)(tree, context)
+                        : (0, schematics_1.noop)()(tree, context);
                 });
             }
             // adjust overall components barrel
             chains.push((tree, context) => {
                 const xplatFolderName = xplat_1.XplatHelpers.getXplatFoldername(platform, 'angular');
-                return generator_1.adjustBarrelIndex('component', options, `libs/xplat/${xplatFolderName}/features/src/lib/${componentSettings.featureName}/components/index.ts`, true, false, true)(tree, context);
+                return (0, generator_1.adjustBarrelIndex)('component', options, `libs/xplat/${xplatFolderName}/features/src/lib/${componentSettings.directory ? componentSettings.directory + '/' : ''}${componentSettings.featureName}/components/index.ts`, true, false, true)(tree, context);
             });
             chains.push((tree, context) => {
                 const xplatFolderName = xplat_1.XplatHelpers.getXplatFoldername(platform, 'angular');
                 return options.needsIndex
-                    ? generator_1.addToFeature(xplatFolderName, 'component', options, `libs/xplat/${xplatFolderName}`, tree, '_index')(tree, context)
-                    : schematics_1.noop()(tree, context);
+                    ? (0, generator_1.addToFeature)(xplatFolderName, 'component', options, `libs/xplat/${xplatFolderName}`, tree, '_index')(tree, context)
+                    : (0, schematics_1.noop)()(tree, context);
             });
         }
         return chains;
@@ -80,7 +82,7 @@ var XplatAngularHelpers;
         return (tree, context) => {
             const dependencies = {};
             const devDependencies = {};
-            const packageJson = xplat_utils_1.getJsonFromFile(tree, 'package.json');
+            const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, 'package.json');
             const hasAngularDeps = packageJson.dependencies['@angular/core'];
             if (!hasAngularDeps) {
                 dependencies[`@angular/animations`] = versions_1.angularVersion;
@@ -97,7 +99,6 @@ var XplatAngularHelpers;
                 devDependencies[`@angular/compiler-cli`] = versions_1.angularVersion;
                 devDependencies[`@angular/language-service`] = versions_1.angularVersion;
                 devDependencies[`@angular-devkit/build-angular`] = versions_1.angularDevkitVersion;
-                devDependencies[`codelyzer`] = versions_1.codelyzerVersion;
             }
             if (!packageJson.devDependencies['@nrwl/angular']) {
                 packageJson.devDependencies['@nrwl/angular'] = versions_1.nxVersion;
@@ -108,10 +109,10 @@ var XplatAngularHelpers;
             if (!packageJson.devDependencies['@nstudio/web']) {
                 packageJson.devDependencies['@nstudio/web'] = versions_1.xplatVersion;
             }
-            dependencies[`@${xplat_utils_1.getNpmScope()}/xplat-scss`] = 'file:libs/xplat/scss/src';
+            dependencies[`@${(0, xplat_utils_1.getNpmScope)()}/xplat-scss`] = 'file:libs/xplat/scss/src';
             return xplat_1.XplatHelpers.updatePackageForXplat(options, {
                 dependencies: Object.assign(Object.assign({}, dependencies), { '@ngx-translate/core': versions_1.ngxTranslateVersion, '@ngx-translate/http-loader': versions_1.ngxTranslateHttpVersion }),
-                devDependencies: Object.assign(Object.assign({}, devDependencies), { '@types/jest': versions_1.typesJest, 'jest-jasmine2': versions_1.jestJasmine2, 'jest-preset-angular': versions_1.jestPresetAngular }),
+                devDependencies: Object.assign(Object.assign({}, devDependencies), { '@types/jest': versions_1.typesJest, 'jest-preset-angular': versions_1.jestPresetAngular }),
             })(tree, context);
         };
     }
@@ -121,7 +122,7 @@ var XplatAngularHelpers;
         const chains = [];
         for (const platform of platforms) {
             // console.log('angular externalChains:', `@nstudio/${platform}-angular`)
-            chains.push(schematics_1.externalSchematic(`@nstudio/${platform}-angular`, 'xplat', options, {
+            chains.push((0, schematics_1.externalSchematic)(`@nstudio/${platform}-angular`, 'xplat', options, {
                 interactive: false,
             }));
         }
@@ -132,15 +133,15 @@ var XplatAngularHelpers;
         return (tree, context) => {
             if (libName === 'scss' &&
                 tree.exists(`libs/xplat/${libName}/src/package.json`)) {
-                return schematics_1.noop()(tree, context);
+                return (0, schematics_1.noop)()(tree, context);
             }
             else if (tree.exists(`libs/xplat/${libName}/src/lib/index.ts`)) {
-                return schematics_1.noop()(tree, context);
+                return (0, schematics_1.noop)()(tree, context);
             }
             const libSrcFolder = `/${libName}/src${libName === 'scss' ? '' : '/lib'}`;
-            return schematics_1.branchAndMerge(schematics_1.mergeWith(schematics_1.apply(schematics_1.url(`${relativeTo}_files_${libName}`), [
-                schematics_1.template(Object.assign(Object.assign({}, options), xplat_1.getDefaultTemplateOptions())),
-                schematics_1.move(`libs/xplat/${libSrcFolder}`),
+            return (0, schematics_1.branchAndMerge)((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(`${relativeTo}_files_${libName}`), [
+                (0, schematics_1.template)(Object.assign(Object.assign({}, options), (0, xplat_1.getDefaultTemplateOptions)())),
+                (0, schematics_1.move)(`libs/xplat/${libSrcFolder}`),
             ])))(tree, context);
         };
     }