@nstudio/xplat 12.6.0-rc.0 → 13.4.0

package/src/utils/xplat.js

@@ -33,20 +33,24 @@ exports.packageInnerDependencies = {
 };
 var XplatHelpers;
 (function (XplatHelpers) {
+    function isFeatureNxLib(featureName) {
+        return featureName && featureName.indexOf('@') === 0;
+    }
+    XplatHelpers.isFeatureNxLib = isFeatureNxLib;
     /**
      * Calls ng-add _if_ the package does not already exist
      * Otherwise calls that schematic if desired, otherwise noop
      */
     function addPackageWithNgAdd(packageName, options, callSchematicIfAdded) {
         return (host) => {
-            const { dependencies, devDependencies } = workspace_1.readJsonInTree(host, 'package.json');
+            const { dependencies, devDependencies } = (0, workspace_1.readJsonInTree)(host, 'package.json');
             return dependencies[packageName] || devDependencies[packageName]
                 ? callSchematicIfAdded
-                    ? schematics_1.externalSchematic(packageName, callSchematicIfAdded, options, {
+                    ? (0, schematics_1.externalSchematic)(packageName, callSchematicIfAdded, options, {
                         interactive: false,
                     })
-                    : schematics_1.noop()
-                : schematics_1.externalSchematic(packageName, 'ng-add', options, {
+                    : (0, schematics_1.noop)()
+                : (0, schematics_1.externalSchematic)(packageName, 'ng-add', options, {
                     interactive: false,
                 });
         };
@@ -61,10 +65,10 @@ var XplatHelpers;
             }
         }
         else {
-            const platformArgList = xplat_utils_1.sanitizeCommaDelimitedArg(platformArgument);
+            const platformArgList = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(platformArgument);
             if (platformArgList.length === 0) {
                 if (required) {
-                    throw new Error(errors_1.noPlatformError());
+                    throw new Error((0, errors_1.noPlatformError)());
                 }
             }
             else {
@@ -73,7 +77,7 @@ var XplatHelpers;
                         platforms.push(platform);
                     }
                     else {
-                        throw new Error(errors_1.unsupportedPlatformError(platform));
+                        throw new Error((0, errors_1.unsupportedPlatformError)(platform));
                     }
                 }
             }
@@ -87,7 +91,7 @@ var XplatHelpers;
         // always default framework choice to first in list when multiple
         return ((frameworkArgument === 'all'
             ? xplat_utils_1.supportedFrameworks
-            : xplat_utils_1.sanitizeCommaDelimitedArg(frameworkArgument)));
+            : (0, xplat_utils_1.sanitizeCommaDelimitedArg)(frameworkArgument)));
     }
     XplatHelpers.getFrameworksFromOptions = getFrameworksFromOptions;
     function getFrameworkChoice(frameworkArgument, frameworks) {
@@ -99,7 +103,7 @@ var XplatHelpers;
         const frameworks = getFrameworksFromOptions(options.framework);
         const frameworkChoice = XplatHelpers.getFrameworkChoice(options.framework, frameworks);
         const xplatSettings = {
-            prefix: xplat_utils_1.getPrefix(),
+            prefix: (0, xplat_utils_1.getPrefix)(),
         };
         if (frameworkChoice && frameworks.length === 1) {
             // when only 1 framework is specified, auto add as default
@@ -119,8 +123,8 @@ var XplatHelpers;
      * @param platform
      */
     function getPlatformName(name, platform) {
-        const nameSanitized = workspace_1.toFileName(name);
-        return xplat_utils_1.getGroupByName()
+        const nameSanitized = (0, xplat_utils_1.toFileName)(name);
+        return (0, xplat_utils_1.getGroupByName)()
             ? `${nameSanitized}-${platform}`
             : `${platform}-${nameSanitized}`;
     }
@@ -133,7 +137,7 @@ var XplatHelpers;
      * @param framework
      */
     function getXplatFoldername(platform, framework) {
-        const frontendFramework = xplat_utils_1.getFrontendFramework();
+        const frontendFramework = (0, xplat_utils_1.getFrontendFramework)();
         // console.log('getXplatFoldername frontendFramework:', frontendFramework);
         // console.log('framework:', framework);
         let frameworkSuffix = '';
@@ -159,7 +163,7 @@ var XplatHelpers;
             default:
                 isApp = ['application', 'app'].includes(generator);
                 generatorSettings = {
-                    platforms: xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms),
+                    platforms: (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms),
                 };
                 break;
         }
@@ -208,7 +212,7 @@ var XplatHelpers;
                     }
                 }
                 else {
-                    throw new schematics_1.SchematicsException(errors_1.unsupportedFrameworkError(framework));
+                    throw new schematics_1.SchematicsException((0, errors_1.unsupportedFrameworkError)(framework));
                 }
             }
         }
@@ -229,7 +233,7 @@ var XplatHelpers;
                     packagesToRunXplat.push(packageName);
                 }
                 else {
-                    throw new schematics_1.SchematicsException(errors_1.unsupportedPlatformError(platform));
+                    throw new schematics_1.SchematicsException((0, errors_1.unsupportedPlatformError)(platform));
                 }
             }
         }
@@ -237,7 +241,7 @@ var XplatHelpers;
             externalChains.push((tree, context) => {
                 // check if othet nstudio or nrwl dependencies are needed
                 // check user's package for current version
-                const packageJson = xplat_utils_1.getJsonFromFile(tree, 'package.json');
+                const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, 'package.json');
                 if (packageJson) {
                     for (const packageName in devDependencies) {
                         if (exports.packageInnerDependencies[packageName]) {
@@ -276,7 +280,7 @@ var XplatHelpers;
                 // console.log('packagesToRunXplat:', packagesToRunXplat)
                 if (packagesToRunXplat.length) {
                     for (const packageName of packagesToRunXplat) {
-                        externalChains.push(schematics_1.externalSchematic(packageName, generator, options, {
+                        externalChains.push((0, schematics_1.externalSchematic)(packageName, generator, options, {
                             interactive: false,
                         }));
                     }
@@ -298,7 +302,7 @@ var XplatHelpers;
     XplatHelpers.getExternalChainsForGenerator = getExternalChainsForGenerator;
     function getExternalChainsForApplication(options, generator, packagesToRun) {
         let generatorSettings = {
-            platforms: xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms),
+            platforms: (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms),
         };
         const platforms = generatorSettings.platforms;
         const externalChains = [];
@@ -318,7 +322,7 @@ var XplatHelpers;
                     packagesToRun.push(packageName);
                 }
                 else {
-                    throw new schematics_1.SchematicsException(errors_1.unsupportedPlatformError(platform));
+                    throw new schematics_1.SchematicsException((0, errors_1.unsupportedPlatformError)(platform));
                 }
             }
         }
@@ -326,7 +330,7 @@ var XplatHelpers;
             externalChains.push((tree, context) => {
                 // check if othet nstudio or nrwl dependencies are needed
                 // check user's package for current version
-                const packageJson = xplat_utils_1.getJsonFromFile(tree, 'package.json');
+                const packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, 'package.json');
                 if (packageJson) {
                     for (const packageName in devDependencies) {
                         if (exports.packageInnerDependencies[packageName]) {
@@ -364,7 +368,7 @@ var XplatHelpers;
         if (options.isTesting) {
             // necessary to unit test the appropriately
             if (xplatPlatforms) {
-                externalChains.push(schematics_1.externalSchematic('@nstudio/xplat', 'app-generate', options, {
+                externalChains.push((0, schematics_1.externalSchematic)('@nstudio/xplat', 'app-generate', options, {
                     interactive: false,
                 }));
             }
@@ -374,9 +378,9 @@ var XplatHelpers;
                     const { name, directory } = getAppNamingConvention(options, nxPlatform);
                     output_1.output.log({
                         title: 'Note:',
-                        bodyLines: [errors_1.noXplatLayerNote(nxPlatform)],
+                        bodyLines: [(0, errors_1.noXplatLayerNote)(nxPlatform)],
                     });
-                    externalChains.push(schematics_1.externalSchematic(packageName, generator, Object.assign(Object.assign({}, options), { name,
+                    externalChains.push((0, schematics_1.externalSchematic)(packageName, generator, Object.assign(Object.assign({}, options), { name,
                         directory }), {
                         interactive: false,
                     }));
@@ -385,7 +389,7 @@ var XplatHelpers;
         }
         else {
             if (xplatPlatforms) {
-                externalChains.push(schematics_1.externalSchematic('@nstudio/xplat', 'app-generate', options, {
+                externalChains.push((0, schematics_1.externalSchematic)('@nstudio/xplat', 'app-generate', options, {
                     interactive: true,
                 }));
             }
@@ -399,7 +403,7 @@ var XplatHelpers;
                         const { name, directory } = getAppNamingConvention(options, nxPlatform);
                         output_1.output.log({
                             title: 'Note:',
-                            bodyLines: [errors_1.noXplatLayerNote(nxPlatform)],
+                            bodyLines: [(0, errors_1.noXplatLayerNote)(nxPlatform)],
                         });
                         context.addTask(new tasks_1.RunSchematicTask(packageName, generator, Object.assign(Object.assign({}, options), { name,
                             directory })), [installPackageTask]);
@@ -417,7 +421,7 @@ var XplatHelpers;
             options.directory = directory;
             // console.log('applyAppNamingConvention:', options);
             // adjusted name, nothing else to do
-            return schematics_1.noop()(tree, context);
+            return (0, schematics_1.noop)()(tree, context);
         };
     }
     XplatHelpers.applyAppNamingConvention = applyAppNamingConvention;
@@ -425,10 +429,10 @@ var XplatHelpers;
         let name = '';
         let directory = '';
         if (options.directory) {
-            directory = workspace_1.toFileName(options.directory);
+            directory = (0, xplat_utils_1.toFileName)(options.directory);
             if (directory === platform &&
                 xplat_utils_1.supportedPlatformsWithNx.includes(directory)) {
-                name = workspace_1.toFileName(options.name);
+                name = (0, xplat_utils_1.toFileName)(options.name);
             }
             else {
                 name = getPlatformName(options.name, platform);
@@ -445,12 +449,12 @@ var XplatHelpers;
     XplatHelpers.getAppNamingConvention = getAppNamingConvention;
     function generateLib(options, libName, directory = '', testEnvironment = 'jsdom', framework = 'angular') {
         return (tree, context) => {
-            if (!xplat_utils_1.getFrontendFramework() && framework) {
+            if (!(0, xplat_utils_1.getFrontendFramework)() && framework) {
                 directory = `${directory}-${framework}`;
             }
             if (tree.exists(`libs/${directory ? directory + '/' : ''}${libName}/tsconfig.json`)) {
                 // console.log(`externalSchematic('@nrwl/workspace', 'lib') ALREADY EXISTS for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
-                return schematics_1.noop()(tree, context);
+                return (0, schematics_1.noop)()(tree, context);
             }
             const libOptions = {
                 name: libName,
@@ -462,13 +466,13 @@ var XplatHelpers;
                 libOptions.skipTsConfig = true;
             }
             // console.log(`CALLING externalSchematic('@nrwl/workspace', 'lib') for:`, `libs/${directory ? directory + '/' : ''}${libName}`)
-            return schematics_1.chain([schematics_1.externalSchematic('@nrwl/workspace', 'lib', libOptions)]);
+            return (0, schematics_1.chain)([(0, schematics_1.externalSchematic)('@nrwl/workspace', 'lib', libOptions)]);
         };
     }
     XplatHelpers.generateLib = generateLib;
     function cleanupLib(options, libName, directory = '', framework = 'angular') {
         return (tree, context) => {
-            if (!xplat_utils_1.getFrontendFramework() && framework) {
+            if (!(0, xplat_utils_1.getFrontendFramework)() && framework) {
                 directory = `${directory}-${framework}`;
             }
             // adjust index files
@@ -516,7 +520,7 @@ var XplatHelpers;
                 }
             }
             if (needsTsConfigUpdate && tsConfig) {
-                xplat_utils_1.updateJsonFile(tree, tsConfigPath, tsConfig);
+                (0, xplat_utils_1.updateJsonFile)(tree, tsConfigPath, tsConfig);
             }
             return tree;
         };
@@ -524,10 +528,10 @@ var XplatHelpers;
     XplatHelpers.cleanupLib = cleanupLib;
     function addPlatformFiles(options, platform, libName, checkExistingFile) {
         return (tree, context) => {
-            let frontendFramework = xplat_utils_1.getFrontendFramework();
+            let frontendFramework = (0, xplat_utils_1.getFrontendFramework)();
             if (tree.exists(`libs/xplat/${platform}/${libName}/src/lib/index.ts`)) {
                 // check if framework had been set
-                frontendFramework = xplat_utils_1.getFrontendFramework();
+                frontendFramework = (0, xplat_utils_1.getFrontendFramework)();
                 // console.log('addPlatformFiles frontendFramework:', frontendFramework)
                 // console.log('addPlatformFiles options.framework:', options.framework)
                 if (frontendFramework && !options.framework) {
@@ -536,22 +540,22 @@ var XplatHelpers;
                     // ie: vanilla {N}, vanilla web, vanilla ionic, etc. (without angular, react, vue, etc.)
                     // if user had set a default framework and is now attempting to generate base platform support
                     // TODO: add schematic to reconfigure workspace to rename xplat folders to support full multi-framework setup
-                    throw new schematics_1.SchematicsException(errors_1.noteAboutXplatSetupWithFramework(frontendFramework, platform));
+                    throw new schematics_1.SchematicsException((0, errors_1.noteAboutXplatSetupWithFramework)(frontendFramework, platform));
                 }
                 // already added
-                return schematics_1.noop();
+                return (0, schematics_1.noop)();
             }
             const xplatFolderName = XplatHelpers.getXplatFoldername(platform, options.framework);
             // src should go into Nx library structure
             const libFolder = `/${libName}/src${libName === 'scss' ? '' : '/lib'}`;
             if (checkExistingFile &&
                 tree.exists(`libs/xplat/${xplatFolderName}/${libFolder}/${checkExistingFile}`)) {
-                return schematics_1.noop();
+                return (0, schematics_1.noop)();
             }
             else {
-                return schematics_1.branchAndMerge(schematics_1.mergeWith(schematics_1.apply(schematics_1.url(`./_files_${libName}`), [
-                    schematics_1.template(Object.assign(Object.assign(Object.assign({}, options), general_1.getDefaultTemplateOptions()), { xplatFolderName })),
-                    schematics_1.move(`libs/xplat/${xplatFolderName}${libFolder}`),
+                return (0, schematics_1.branchAndMerge)((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(`./_files_${libName}`), [
+                    (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({}, options), (0, general_1.getDefaultTemplateOptions)()), { xplatFolderName })),
+                    (0, schematics_1.move)(`libs/xplat/${xplatFolderName}${libFolder}`),
                 ])));
             }
         };
@@ -560,7 +564,7 @@ var XplatHelpers;
     function updatePackageForXplat(options, updates) {
         return (tree, context) => {
             const packagePath = 'package.json';
-            let packageJson = xplat_utils_1.getJsonFromFile(tree, packagePath);
+            let packageJson = (0, xplat_utils_1.getJsonFromFile)(tree, packagePath);
             if (packageJson) {
                 // could introduce xplat.json but trying to avoid too much extra overhead so just store in package.json for now
                 // can migrate this later if decide enough settings for xplat.json
@@ -570,13 +574,13 @@ var XplatHelpers;
                     // just updating xplat internal settings
                     packageJson.xplat = Object.assign(Object.assign({}, (packageJson.xplat || {})), xplatSettings);
                     // just update xplat workspace settings
-                    return xplat_utils_1.updateJsonFile(tree, packagePath, packageJson);
+                    return (0, xplat_utils_1.updateJsonFile)(tree, packagePath, packageJson);
                 }
                 else if (updates) {
                     // update root dependencies for the generated xplat support
                     packageJson = Object.assign(Object.assign({}, packageJson), { dependencies: Object.assign(Object.assign({}, (packageJson.dependencies || {})), (updates.dependencies || {})), devDependencies: Object.assign(Object.assign({}, (packageJson.devDependencies || {})), (updates.devDependencies || {})), xplat: Object.assign(Object.assign({}, (packageJson.xplat || {})), xplatSettings) });
                     // console.log('updatePackageForXplat:', serializeJson(packageJson));
-                    return xplat_utils_1.updateJsonFile(tree, packagePath, packageJson);
+                    return (0, xplat_utils_1.updateJsonFile)(tree, packagePath, packageJson);
                 }
             }
             return tree;
@@ -609,15 +613,23 @@ var XplatComponentHelpers;
 (function (XplatComponentHelpers) {
     function prepare(options) {
         if (!options.name) {
-            throw new Error(errors_1.generateOptionError('component'));
+            throw new Error((0, errors_1.generateOptionError)('component'));
         }
         // reset module globals
         options.needsIndex = false;
         let featureName;
+        let directory = '';
         let projectNames = null;
         let platforms = [];
+        const isNxLib = XplatHelpers.isFeatureNxLib(featureName);
         if (options.feature) {
-            featureName = options.feature.toLowerCase();
+            const dirParts = options.feature.split('/');
+            if (dirParts.length) {
+                featureName = dirParts.pop().toLowerCase();
+                if (!isNxLib) {
+                    directory = dirParts.join('/');
+                }
+            }
         }
         const projects = options.projects;
         if (projects) {
@@ -627,9 +639,9 @@ var XplatComponentHelpers;
                 featureName = 'shared';
             }
             // building feature in shared code and in projects
-            projectNames = xplat_utils_1.sanitizeCommaDelimitedArg(projects);
+            projectNames = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(projects);
             for (const fullProjectPath of 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();
@@ -649,15 +661,15 @@ var XplatComponentHelpers;
                 featureName = 'ui';
             }
             // building feature in shared code only
-            platforms = xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms);
+            platforms = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms);
         }
         if (platforms.length === 0) {
             let error = projects
-                ? errors_1.platformAppPrefixError()
-                : errors_1.generatorError('component');
-            throw new Error(errors_1.optionsMissingError(error));
+                ? (0, errors_1.platformAppPrefixError)()
+                : (0, errors_1.generatorError)('component');
+            throw new Error((0, errors_1.optionsMissingError)(error));
         }
-        return { featureName, projectNames, platforms };
+        return { directory, featureName, projectNames, platforms };
     }
     XplatComponentHelpers.prepare = prepare;
 })(XplatComponentHelpers = exports.XplatComponentHelpers || (exports.XplatComponentHelpers = {}));
@@ -683,7 +695,7 @@ var XplatFeatureHelpers;
                     projects = 'nativescript-sandbox';
                 }
                 else {
-                    platforms = xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms);
+                    platforms = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms);
                     const projectSandboxNames = [];
                     // default to project with sandbox name
                     for (const p of platforms) {
@@ -703,9 +715,9 @@ var XplatFeatureHelpers;
         }
         if (projects) {
             // building feature in shared code and in projects
-            projectNames = xplat_utils_1.sanitizeCommaDelimitedArg(projects);
+            projectNames = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(projects);
             for (const name of projectNames) {
-                let projectName = xplat_utils_1.parseProjectNameFromPath(name);
+                let projectName = (0, xplat_utils_1.parseProjectNameFromPath)(name);
                 const projectParts = projectName.split('-');
                 const platPrefix = projectParts[0];
                 const platSuffix = projectParts.pop();
@@ -723,13 +735,13 @@ var XplatFeatureHelpers;
         }
         else if (options.platforms) {
             // building feature in shared code only
-            platforms = xplat_utils_1.sanitizeCommaDelimitedArg(options.platforms);
+            platforms = (0, xplat_utils_1.sanitizeCommaDelimitedArg)(options.platforms);
         }
         if (platforms.length === 0 && !options.onlyModule) {
             let error = projects
-                ? errors_1.platformAppPrefixError()
-                : errors_1.generatorError('feature');
-            throw new schematics_1.SchematicsException(errors_1.optionsMissingError(error));
+                ? (0, errors_1.platformAppPrefixError)()
+                : (0, errors_1.generatorError)('feature');
+            throw new schematics_1.SchematicsException((0, errors_1.optionsMissingError)(error));
         }
         return { featureName, projectNames, platforms };
     }
@@ -741,7 +753,7 @@ var XplatFeatureHelpers;
         }
         else {
             target = 'lib';
-            moveTo = `libs/xplat/features/src/lib/${options.name.toLowerCase()}`;
+            moveTo = `libs/xplat/features/src/lib/${options.directory ? options.directory + '/' : ''}${options.name.toLowerCase()}`;
         }
         if (!extra) {
             // make sure no `null` or `undefined` values get in the string path
@@ -750,9 +762,9 @@ var XplatFeatureHelpers;
         // console.log('target:', target);
         // console.log('addFiles moveTo:', moveTo);
         // console.log('add files from:', `${workingDirectory}/${extra}_files`);
-        return schematics_1.branchAndMerge(schematics_1.mergeWith(schematics_1.apply(schematics_1.url(`./${extra}_files`), [
-            schematics_1.template(getTemplateOptions(options, target, framework)),
-            schematics_1.move(moveTo),
+        return (0, schematics_1.branchAndMerge)((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(`./${extra}_files`), [
+            (0, schematics_1.template)(getTemplateOptions(options, target, framework)),
+            (0, schematics_1.move)(moveTo),
         ])));
     }
     XplatFeatureHelpers.addFiles = addFiles;
@@ -761,9 +773,9 @@ var XplatFeatureHelpers;
             // console.log('adjustBarrelIndex indexFilePath:', indexFilePath);
             // console.log('tree.exists(indexFilePath):', tree.exists(indexFilePath));
             const indexSource = tree.read(indexFilePath).toString('utf-8');
-            const indexSourceFile = typescript_1.createSourceFile(indexFilePath, indexSource, typescript_1.ScriptTarget.Latest, true);
-            ast_1.insert(tree, indexFilePath, [
-                ...ast_1.addGlobal(indexSourceFile, indexFilePath, `export * from './${options.name.toLowerCase()}';`, true),
+            const indexSourceFile = (0, typescript_1.createSourceFile)(indexFilePath, indexSource, typescript_1.ScriptTarget.Latest, true);
+            (0, ast_1.insert)(tree, indexFilePath, [
+                ...(0, ast_1.addGlobal)(indexSourceFile, indexFilePath, `export * from './${options.directory ? options.directory + '/' : ''}${options.name.toLowerCase()}';`, true),
             ]);
             return tree;
         };
@@ -776,7 +788,15 @@ var XplatFeatureHelpers;
             endingDashName = general_1.stringUtils.capitalize(nameParts[nameParts.length - 1]);
         }
         const xplatFolderName = XplatHelpers.getXplatFoldername(platform, framework);
-        return Object.assign(Object.assign(Object.assign({}, options), general_1.getDefaultTemplateOptions()), { name: options.name.toLowerCase(), endingDashName,
+        let relativeDirectory = '';
+        if (options.directory) {
+            const parts = options.directory.split('/');
+            const relative = [];
+            parts.forEach(() => relative.push('..'));
+            relativeDirectory = relative.join('/') + '/';
+        }
+        return Object.assign(Object.assign(Object.assign({}, options), (0, general_1.getDefaultTemplateOptions)()), { name: options.name.toLowerCase(), relativeDirectory,
+            endingDashName,
             xplatFolderName });
     }
     XplatFeatureHelpers.getTemplateOptions = getTemplateOptions;
@@ -785,12 +805,12 @@ var XplatFeatureHelpers;
         const xplatFolderName = XplatHelpers.getXplatFoldername(platform, framework);
         // console.log('getMoveTo xplatFolderName:', xplatFolderName);
         const featureName = options.name.toLowerCase();
-        let moveTo = `libs/xplat/${xplatFolderName}/features/src/lib/${featureName}`;
+        let moveTo = `libs/xplat/${xplatFolderName}/features/src/lib/${options.directory ? options.directory + '/' : ''}${featureName}`;
         if (projectName) {
             let appDir = ['web', 'web-angular'].includes(xplatFolderName)
                 ? '/app'
                 : '';
-            moveTo = `apps/${projectName}/src${appDir}/features/${featureName}`;
+            moveTo = `apps/${projectName}/src${appDir}/features/${options.directory ? options.directory + '/' : ''}${featureName}`;
             // console.log('moveTo:', moveTo);
         }
         return moveTo;