@nx/expo 16.8.0-beta.3 → 16.8.0-beta.5

package/src/executors/run/run.impl.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
@@ -10,35 +9,33 @@ const prebuild_impl_1 = require("../prebuild/prebuild.impl");
 const pod_install_task_1 = require("../../utils/pod-install-task");
 const install_impl_1 = require("../install/install.impl");
 let childProcess;
-function runExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* runExecutor_1() {
-        if ((0, os_1.platform)() !== 'darwin' && options.platform === 'ios') {
-            throw new Error(`The run-ios build requires Mac to run`);
-        }
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        if (!(0, fs_extra_1.existsSync)((0, path_1.join)(context.root, projectRoot, options.platform))) {
-            yield tslib_1.__await((0, prebuild_impl_1.prebuildAsync)(context.root, projectRoot, {
-                install: options.install,
-                platform: options.platform,
-                clean: options.clean,
-            }));
-        }
-        if (options.install) {
-            yield tslib_1.__await((0, install_impl_1.installAsync)(context.root, {}));
-            if (options.platform === 'ios') {
-                (0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios'));
-            }
-        }
-        try {
-            yield tslib_1.__await(runCliRun(context.root, projectRoot, options));
-            yield yield tslib_1.__await({ success: true });
+async function* runExecutor(options, context) {
+    if ((0, os_1.platform)() !== 'darwin' && options.platform === 'ios') {
+        throw new Error(`The run-ios build requires Mac to run`);
+    }
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    if (!(0, fs_extra_1.existsSync)((0, path_1.join)(context.root, projectRoot, options.platform))) {
+        await (0, prebuild_impl_1.prebuildAsync)(context.root, projectRoot, {
+            install: options.install,
+            platform: options.platform,
+            clean: options.clean,
+        });
+    }
+    if (options.install) {
+        await (0, install_impl_1.installAsync)(context.root, {});
+        if (options.platform === 'ios') {
+            (0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios'));
         }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
+    }
+    try {
+        await runCliRun(context.root, projectRoot, options);
+        yield { success: true };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-    });
+    }
 }
 exports.default = runExecutor;
 function runCliRun(workspaceRoot, projectRoot, options) {

package/src/executors/start/start.impl.js

@@ -1,29 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 let childProcess;
-function startExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* startExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        try {
-            const baseUrl = `http://localhost:${options.port}`;
-            devkit_1.logger.info(chalk.cyan(`Packager is ready at ${baseUrl}`));
-            yield tslib_1.__await(startAsync(context.root, projectRoot, options));
-            yield yield tslib_1.__await({
-                baseUrl,
-                success: true,
-            });
+async function* startExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    try {
+        const baseUrl = `http://localhost:${options.port}`;
+        devkit_1.logger.info(chalk.cyan(`Packager is ready at ${baseUrl}`));
+        await startAsync(context.root, projectRoot, options);
+        yield {
+            baseUrl,
+            success: true,
+        };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
-        }
-    });
+    }
 }
 exports.default = startExecutor;
 function startAsync(workspaceRoot, projectRoot, options) {

package/src/executors/submit/submit.impl.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 let childProcess;
-function submitExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* submitExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        try {
-            yield tslib_1.__await(runCliSubmit(context.root, projectRoot, options));
-            yield yield tslib_1.__await({ success: true });
+async function* submitExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    try {
+        await runCliSubmit(context.root, projectRoot, options);
+        yield { success: true };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
-        }
-    });
+    }
 }
 exports.default = submitExecutor;
 function runCliSubmit(workspaceRoot, projectRoot, options) {

package/src/executors/sync-deps/sync-deps.impl.js

@@ -1,52 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.displayNewlyAddedDepsMessage = exports.syncDeps = void 0;
-const tslib_1 = require("tslib");
 const path_1 = require("path");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
 const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
-function syncDepsExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* syncDepsExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        displayNewlyAddedDepsMessage(context.projectName, yield tslib_1.__await(syncDeps(context.projectName, projectRoot, context.root, context.projectGraph, typeof options.include === 'string'
-            ? options.include.split(',')
-            : options.include, typeof options.exclude === 'string'
-            ? options.exclude.split(',')
-            : options.exclude)));
-        yield yield tslib_1.__await({ success: true });
-    });
+async function* syncDepsExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectRoot, context.root, context.projectGraph, typeof options.include === 'string'
+        ? options.include.split(',')
+        : options.include, typeof options.exclude === 'string'
+        ? options.exclude.split(',')
+        : options.exclude));
+    yield { success: true };
 }
 exports.default = syncDepsExecutor;
-function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, include = [], exclude = []) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
-        const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
-        const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-        const newDeps = [];
-        let updated = false;
-        if (!packageJson.dependencies) {
-            packageJson.dependencies = {};
+async function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, include = [], exclude = []) {
+    let npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
+    const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
+    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+    const newDeps = [];
+    let updated = false;
+    if (!packageJson.dependencies) {
+        packageJson.dependencies = {};
+        updated = true;
+    }
+    if (include && include.length) {
+        npmDeps.push(...include);
+    }
+    if (exclude && exclude.length) {
+        npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
+    }
+    npmDeps.forEach((dep) => {
+        if (!packageJson.dependencies[dep]) {
+            packageJson.dependencies[dep] = '*';
+            newDeps.push(dep);
             updated = true;
         }
-        if (include && include.length) {
-            npmDeps.push(...include);
-        }
-        if (exclude && exclude.length) {
-            npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
-        }
-        npmDeps.forEach((dep) => {
-            if (!packageJson.dependencies[dep]) {
-                packageJson.dependencies[dep] = '*';
-                newDeps.push(dep);
-                updated = true;
-            }
-        });
-        if (updated) {
-            (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
-        }
-        return newDeps;
     });
+    if (updated) {
+        (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
+    }
+    return newDeps;
 }
 exports.syncDeps = syncDeps;
 function displayNewlyAddedDepsMessage(projectName, deps) {

package/src/executors/update/update.impl.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
@@ -8,22 +7,20 @@ const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-s
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 const install_impl_1 = require("../install/install.impl");
 let childProcess;
-function buildExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* buildExecutor_1() {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        yield tslib_1.__await((0, install_impl_1.installAsync)(context.root, { packages: ['expo-updates'] }));
-        (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph, ['expo-updates'])));
-        (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
-        try {
-            yield tslib_1.__await(runCliUpdate(context.root, projectRoot, options));
-            yield yield tslib_1.__await({ success: true });
+async function* buildExecutor(options, context) {
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    await (0, install_impl_1.installAsync)(context.root, { packages: ['expo-updates'] });
+    (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph, ['expo-updates']));
+    (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
+    try {
+        await runCliUpdate(context.root, projectRoot, options);
+        yield { success: true };
+    }
+    finally {
+        if (childProcess) {
+            childProcess.kill();
         }
-        finally {
-            if (childProcess) {
-                childProcess.kill();
-            }
-        }
-    });
+    }
 }
 exports.default = buildExecutor;
 function runCliUpdate(workspaceRoot, projectRoot, options) {

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoApplicationSchematic = exports.expoApplicationGeneratorInternal = exports.expoApplicationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const symlink_task_1 = require("../../utils/symlink-task");
 const add_linting_1 = require("../../utils/add-linting");
@@ -12,30 +11,33 @@ const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_eas_scripts_1 = require("./lib/add-eas-scripts");
 const add_detox_1 = require("./lib/add-detox");
-function expoApplicationGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return yield expoApplicationGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+async function expoApplicationGenerator(host, schema) {
+    return await expoApplicationGeneratorInternal(host, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
     });
 }
 exports.expoApplicationGenerator = expoApplicationGenerator;
-function expoApplicationGeneratorInternal(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        (0, create_application_files_1.createApplicationFiles)(host, options);
-        (0, add_project_1.addProject)(host, options);
-        const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
-        const lintTask = yield (0, add_linting_1.addLinting)(host, Object.assign(Object.assign({}, options), { projectRoot: options.appProjectRoot, tsConfigPaths: [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
-            ] }));
-        const jestTask = yield (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
-        const detoxTask = yield (0, add_detox_1.addDetox)(host, options);
-        const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
-        (0, add_eas_scripts_1.addEasScripts)(host);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask);
+async function expoApplicationGeneratorInternal(host, schema) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    (0, create_application_files_1.createApplicationFiles)(host, options);
+    (0, add_project_1.addProject)(host, options);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
+    const lintTask = await (0, add_linting_1.addLinting)(host, {
+        ...options,
+        projectRoot: options.appProjectRoot,
+        tsConfigPaths: [
+            (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
+        ],
     });
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
+    const detoxTask = await (0, add_detox_1.addDetox)(host, options);
+    const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
+    (0, add_eas_scripts_1.addEasScripts)(host);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask);
 }
 exports.expoApplicationGeneratorInternal = expoApplicationGeneratorInternal;
 exports.default = expoApplicationGenerator;

package/src/generators/application/lib/add-detox.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDetox = void 0;
-const tslib_1 = require("tslib");
 const detox_1 = require("@nx/detox");
 const linter_1 = require("@nx/linter");
-function addDetox(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if ((options === null || options === void 0 ? void 0 : options.e2eTestRunner) !== 'detox') {
-            return () => { };
-        }
-        return (0, detox_1.detoxApplicationGenerator)(host, Object.assign(Object.assign({}, options), { linter: linter_1.Linter.EsLint, e2eName: `${options.projectName}-e2e`, e2eDirectory: `${options.appProjectRoot}-e2e`, projectNameAndRootFormat: 'as-provided', appProject: options.projectName, appDisplayName: options.displayName, appName: options.name, framework: 'expo', setParserOptionsProject: options.setParserOptionsProject, skipFormat: true }));
+async function addDetox(host, options) {
+    if (options?.e2eTestRunner !== 'detox') {
+        return () => { };
+    }
+    return (0, detox_1.detoxApplicationGenerator)(host, {
+        ...options,
+        linter: linter_1.Linter.EsLint,
+        e2eName: `${options.projectName}-e2e`,
+        e2eDirectory: `${options.appProjectRoot}-e2e`,
+        projectNameAndRootFormat: 'as-provided',
+        appProject: options.projectName,
+        appDisplayName: options.displayName,
+        appName: options.name,
+        framework: 'expo',
+        setParserOptionsProject: options.setParserOptionsProject,
+        skipFormat: true,
     });
 }
 exports.addDetox = addDetox;

package/src/generators/application/lib/add-project.js

@@ -7,7 +7,7 @@ function addProject(host, options) {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,
         projectType: 'application',
-        targets: Object.assign({}, getTargets(options)),
+        targets: { ...getTargets(options) },
         tags: options.parsedTags,
     };
     (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);

package/src/generators/application/lib/create-application-files.js

@@ -12,9 +12,13 @@ function createApplicationFiles(host, options) {
     };
     const packageManager = (0, devkit_1.detectPackageManager)(host.root);
     const packageLockFile = packageManagerLockFile[packageManager];
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files'), options.appProjectRoot, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), packageManager,
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files'), options.appProjectRoot, {
+        ...options,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
+        packageManager,
         packageLockFile,
-        easCliVersion: versions_1.easCliVersion }));
+        easCliVersion: versions_1.easCliVersion,
+    });
     if (options.unitTestRunner === 'none') {
         host.delete((0, path_1.join)(options.appProjectRoot, `App.spec.tsx`));
     }

package/src/generators/application/lib/normalize-options.js

@@ -1,25 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-function normalizeOptions(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-            name: options.name,
-            projectType: 'application',
-            directory: options.directory,
-            projectNameAndRootFormat: options.projectNameAndRootFormat,
-            callingGenerator: '@nx/expo:application',
-        });
-        options.projectNameAndRootFormat = projectNameAndRootFormat;
-        const { className } = (0, devkit_1.names)(options.name);
-        const parsedTags = options.tags
-            ? options.tags.split(',').map((s) => s.trim())
-            : [];
-        return Object.assign(Object.assign({}, options), { unitTestRunner: options.unitTestRunner || 'jest', e2eTestRunner: options.e2eTestRunner || 'detox', name: projectNames.projectSimpleName, className, lowerCaseName: className.toLowerCase(), displayName: options.displayName || className, projectName: appProjectName, appProjectRoot,
-            parsedTags });
+async function normalizeOptions(host, options) {
+    const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, projectNameAndRootFormat, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+        name: options.name,
+        projectType: 'application',
+        directory: options.directory,
+        projectNameAndRootFormat: options.projectNameAndRootFormat,
+        callingGenerator: '@nx/expo:application',
     });
+    options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const { className } = (0, devkit_1.names)(options.name);
+    const parsedTags = options.tags
+        ? options.tags.split(',').map((s) => s.trim())
+        : [];
+    return {
+        ...options,
+        unitTestRunner: options.unitTestRunner || 'jest',
+        e2eTestRunner: options.e2eTestRunner || 'detox',
+        name: projectNames.projectSimpleName,
+        className,
+        lowerCaseName: className.toLowerCase(),
+        displayName: options.displayName || className,
+        projectName: appProjectName,
+        appProjectRoot,
+        parsedTags,
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/component/component.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoComponentSchematic = exports.expoComponentGenerator = void 0;
-const tslib_1 = require("tslib");
 const ts = require("typescript");
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const path_1 = require("path");
-function expoComponentGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield (0, normalize_options_1.normalizeOptions)(host, schema);
-        createComponentFiles(host, options);
-        addExportsToBarrel(host, options);
-        if (options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-    });
+async function expoComponentGenerator(host, schema) {
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    createComponentFiles(host, options);
+    addExportsToBarrel(host, options);
+    if (options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.expoComponentGenerator = expoComponentGenerator;
 function createComponentFiles(host, options) {
     const componentDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), componentDir, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), componentDir, {
+        ...options,
+        tmpl: '',
+    });
     for (const c of host.listChanges()) {
         let deleteFile = false;
         if (options.skipTests && /.*spec.tsx/.test(c.path)) {

package/src/generators/component/lib/normalize-options.js

@@ -1,46 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-function normalizeOptions(host, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        assertValidOptions(options);
-        const { className, fileName } = (0, devkit_1.names)(options.name);
-        const componentFileName = options.pascalCaseFiles ? className : fileName;
-        const project = (0, devkit_1.getProjects)(host).get(options.project);
-        if (!project) {
-            devkit_1.logger.error(`Cannot find the ${options.project} project. Please double check the project name.`);
-            throw new Error();
-        }
-        const { sourceRoot: projectSourceRoot, projectType } = project;
-        const directory = yield getDirectory(host, options);
-        if (options.export && projectType === 'application') {
-            devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
-        }
-        options.classComponent = (_a = options.classComponent) !== null && _a !== void 0 ? _a : false;
-        return Object.assign(Object.assign({}, options), { directory,
-            className, fileName: componentFileName, projectSourceRoot });
-    });
+async function normalizeOptions(host, options) {
+    assertValidOptions(options);
+    const { className, fileName } = (0, devkit_1.names)(options.name);
+    const componentFileName = options.pascalCaseFiles ? className : fileName;
+    const project = (0, devkit_1.getProjects)(host).get(options.project);
+    if (!project) {
+        devkit_1.logger.error(`Cannot find the ${options.project} project. Please double check the project name.`);
+        throw new Error();
+    }
+    const { sourceRoot: projectSourceRoot, projectType } = project;
+    const directory = await getDirectory(host, options);
+    if (options.export && projectType === 'application') {
+        devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
+    }
+    options.classComponent = options.classComponent ?? false;
+    return {
+        ...options,
+        directory,
+        className,
+        fileName: componentFileName,
+        projectSourceRoot,
+    };
 }
 exports.normalizeOptions = normalizeOptions;
-function getDirectory(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const fileName = (0, devkit_1.names)(options.name).fileName;
-        const workspace = (0, devkit_1.getProjects)(host);
-        let baseDir;
-        if (options.directory) {
-            baseDir = options.directory;
-        }
-        else {
-            baseDir =
-                workspace.get(options.project).projectType === 'application'
-                    ? 'app'
-                    : 'lib';
-        }
-        return options.flat ? baseDir : (0, devkit_1.joinPathFragments)(baseDir, fileName);
-    });
+async function getDirectory(host, options) {
+    const fileName = (0, devkit_1.names)(options.name).fileName;
+    const workspace = (0, devkit_1.getProjects)(host);
+    let baseDir;
+    if (options.directory) {
+        baseDir = options.directory;
+    }
+    else {
+        baseDir =
+            workspace.get(options.project).projectType === 'application'
+                ? 'app'
+                : 'lib';
+    }
+    return options.flat ? baseDir : (0, devkit_1.joinPathFragments)(baseDir, fileName);
 }
 function assertValidOptions(options) {
     const slashes = ['/', '\\'];