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

package/src/generators/component/component.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentSchematic = exports.componentGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const add_styled_dependencies_1 = require("../../rules/add-styled-dependencies");
 const assertion_1 = require("../../utils/assertion");
@@ -11,29 +10,32 @@ const versions_1 = require("../../utils/versions");
 const get_component_tests_1 = require("./get-component-tests");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
-function componentGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield normalizeOptions(host, schema);
-        createComponentFiles(host, options);
-        const tasks = [];
-        const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options);
-        tasks.push(styledTask);
-        addExportsToBarrel(host, options);
-        if (options.routing) {
-            const routingTask = (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {});
-            tasks.push(routingTask);
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
-    });
+async function componentGenerator(host, schema) {
+    const options = await normalizeOptions(host, schema);
+    createComponentFiles(host, options);
+    const tasks = [];
+    const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options);
+    tasks.push(styledTask);
+    addExportsToBarrel(host, options);
+    if (options.routing) {
+        const routingTask = (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, {});
+        tasks.push(routingTask);
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.componentGenerator = componentGenerator;
 function createComponentFiles(host, options) {
     const componentDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
     const componentTests = (0, get_component_tests_1.getComponentTests)(options);
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), componentDir, Object.assign(Object.assign({}, options), { componentTests, inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(componentTests), tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), componentDir, {
+        ...options,
+        componentTests,
+        inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(componentTests),
+        tmpl: '',
+    });
     for (const c of host.listChanges()) {
         let deleteFile = false;
         if ((options.skipTests || options.inSourceTests) &&
@@ -76,52 +78,54 @@ function addExportsToBarrel(host, options) {
         }
     }
 }
-function normalizeOptions(host, options) {
-    var _a, _b, _c, _d, _e;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        assertValidOptions(options);
-        const { className, fileName } = (0, devkit_1.names)(options.name);
-        const componentFileName = (_a = options.fileName) !== null && _a !== void 0 ? _a : (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);
-        const styledModule = /^(css|scss|less|styl|none)$/.test(options.style)
-            ? null
-            : options.style;
-        if (options.export && projectType === 'application') {
-            devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
-        }
-        options.classComponent = (_b = options.classComponent) !== null && _b !== void 0 ? _b : false;
-        options.routing = (_c = options.routing) !== null && _c !== void 0 ? _c : false;
-        options.globalCss = (_d = options.globalCss) !== null && _d !== void 0 ? _d : false;
-        options.inSourceTests = (_e = options.inSourceTests) !== null && _e !== void 0 ? _e : false;
-        return Object.assign(Object.assign({}, options), { directory,
-            styledModule, hasStyles: options.style !== 'none', className, fileName: componentFileName, projectSourceRoot });
-    });
+async function normalizeOptions(host, options) {
+    assertValidOptions(options);
+    const { className, fileName } = (0, devkit_1.names)(options.name);
+    const componentFileName = options.fileName ?? (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);
+    const styledModule = /^(css|scss|less|styl|none)$/.test(options.style)
+        ? null
+        : options.style;
+    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;
+    options.routing = options.routing ?? false;
+    options.globalCss = options.globalCss ?? false;
+    options.inSourceTests = options.inSourceTests ?? false;
+    return {
+        ...options,
+        directory,
+        styledModule,
+        hasStyles: options.style !== 'none',
+        className,
+        fileName: componentFileName,
+        projectSourceRoot,
+    };
 }
-function getDirectory(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const genNames = (0, devkit_1.names)(options.name);
-        const fileName = options.pascalCaseDirectory === true
-            ? genNames.className
-            : genNames.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 genNames = (0, devkit_1.names)(options.name);
+    const fileName = options.pascalCaseDirectory === true
+        ? genNames.className
+        : genNames.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) {
     (0, assertion_1.assertValidStyle)(options.style);

package/src/generators/component-cypress-spec/component-cypress-spec.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentCypressSchematic = exports.createComponentSpecFile = exports.getArgsDefaultValue = exports.componentCypressGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
-function componentCypressGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        createComponentSpecFile(host, schema);
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-    });
+async function componentCypressGenerator(host, schema) {
+    createComponentSpecFile(host, schema);
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.componentCypressGenerator = componentCypressGenerator;
 // TODO: candidate to refactor with the angular component story
@@ -63,7 +60,7 @@ function createComponentSpecFile(tree, { project, componentPath, js, cypressProj
     const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
     if (!cmpDeclaration) {
         const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
-        if (componentNodes === null || componentNodes === void 0 ? void 0 : componentNodes.length) {
+        if (componentNodes?.length) {
             componentNodes.forEach((declaration) => {
                 findPropsAndGenerateFileForCypress(tree, sourceFile, declaration, e2eLibIntegrationFolderPath, componentName, project, js, true);
             });

package/src/generators/component-story/component-story.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentStorySchematic = exports.componentStoryGenerator = exports.findPropsAndGenerateFile = exports.createComponentStoriesFile = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
@@ -30,7 +29,7 @@ function createComponentStoriesFile(host, { project, componentPath, interactionT
     const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
     if (!cmpDeclaration) {
         const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
-        if (componentNodes === null || componentNodes === void 0 ? void 0 : componentNodes.length) {
+        if (componentNodes?.length) {
             componentNodes.forEach((declaration) => {
                 findPropsAndGenerateFile(host, sourceFile, declaration, componentDirectory, name, interactionTests, isPlainJs, componentNodes.length > 1);
             });
@@ -60,14 +59,14 @@ function findPropsAndGenerateFile(host, sourceFile, cmpDeclaration, componentDir
     });
 }
 exports.findPropsAndGenerateFile = findPropsAndGenerateFile;
-function componentStoryGenerator(host, schema) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        createComponentStoriesFile(host, Object.assign(Object.assign({}, schema), { interactionTests: (_a = schema.interactionTests) !== null && _a !== void 0 ? _a : true }));
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
+async function componentStoryGenerator(host, schema) {
+    createComponentStoriesFile(host, {
+        ...schema,
+        interactionTests: schema.interactionTests ?? true,
     });
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
 }
 exports.componentStoryGenerator = componentStoryGenerator;
 exports.default = componentStoryGenerator;

package/src/generators/component-test/component-test.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -9,22 +8,20 @@ const component_props_1 = require("../../utils/component-props");
 const versions_1 = require("../../utils/versions");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
-function componentTestGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-        const { assertMinimumCypressVersion } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/cypress-version'));
-        assertMinimumCypressVersion(10);
-        // normalize any windows paths
-        options.componentPath = options.componentPath.replace(/\\/g, '/');
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const normalizedPath = options.componentPath.startsWith(projectConfig.sourceRoot)
-            ? (0, path_1.relative)(projectConfig.sourceRoot, options.componentPath)
-            : options.componentPath;
-        const componentPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, normalizedPath);
-        if (tree.exists(componentPath)) {
-            generateSpecsForComponents(tree, componentPath);
-        }
-    });
+async function componentTestGenerator(tree, options) {
+    (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/cypress-version'));
+    assertMinimumCypressVersion(10);
+    // normalize any windows paths
+    options.componentPath = options.componentPath.replace(/\\/g, '/');
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const normalizedPath = options.componentPath.startsWith(projectConfig.sourceRoot)
+        ? (0, path_1.relative)(projectConfig.sourceRoot, options.componentPath)
+        : options.componentPath;
+    const componentPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, normalizedPath);
+    if (tree.exists(componentPath)) {
+        generateSpecsForComponents(tree, componentPath);
+    }
 }
 exports.componentTestGenerator = componentTestGenerator;
 function generateSpecsForComponents(tree, filePath) {
@@ -40,7 +37,7 @@ function generateSpecsForComponents(tree, filePath) {
         return;
     }
     const defaultExport = (0, ast_utils_1.getComponentNode)(sourceFile);
-    if (cmpNodes === null || cmpNodes === void 0 ? void 0 : cmpNodes.length) {
+    if (cmpNodes?.length) {
         const components = cmpNodes.map((cmp) => {
             const defaults = (0, component_props_1.getDefaultsForComponent)(sourceFile, cmp);
             const isDefaultExport = defaultExport

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfigGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const add_files_1 = require("./lib/add-files");
@@ -11,32 +10,30 @@ const ct_utils_1 = require("../../utils/ct-utils");
  * storybook components then use componentCypressGenerator instead.
  *
  */
-function cypressComponentConfigGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { componentConfigurationGenerator: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const installTask = yield baseCyCtConfig(tree, {
-            project: options.project,
-            skipFormat: true,
-        });
-        const found = yield (0, ct_utils_1.addCTTargetWithBuildTarget)(tree, {
-            project: options.project,
-            buildTarget: options.buildTarget,
-            validExecutorNames: new Set([
-                '@nx/webpack:webpack',
-                '@nx/vite:build',
-                '@nrwl/webpack:webpack',
-                '@nrwl/vite:build',
-            ]),
-        });
-        yield (0, add_files_1.addFiles)(tree, projectConfig, options, found);
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            installTask();
-        };
+async function cypressComponentConfigGenerator(tree, options) {
+    const { componentConfigurationGenerator: baseCyCtConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const installTask = await baseCyCtConfig(tree, {
+        project: options.project,
+        skipFormat: true,
     });
+    const found = await (0, ct_utils_1.addCTTargetWithBuildTarget)(tree, {
+        project: options.project,
+        buildTarget: options.buildTarget,
+        validExecutorNames: new Set([
+            '@nx/webpack:webpack',
+            '@nx/vite:build',
+            '@nrwl/webpack:webpack',
+            '@nrwl/vite:build',
+        ]),
+    });
+    await (0, add_files_1.addFiles)(tree, projectConfig, options, found);
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        installTask();
+    };
 }
 exports.cypressComponentConfigGenerator = cypressComponentConfigGenerator;
 exports.default = cypressComponentConfigGenerator;

package/src/generators/cypress-component-configuration/lib/add-files.js

@@ -1,54 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFiles = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("nx/src/utils/versions");
 const component_test_1 = require("../../component-test/component-test");
 const ct_utils_1 = require("../../../utils/ct-utils");
-function addFiles(tree, projectConfig, options, found) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // must dyanmicaly import to prevent packages not using cypress from erroring out
-        // when importing react
-        const { addMountDefinition, addDefaultCTConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
-        // Specifically undefined to allow Remix workaround of passing an empty string
-        const actualBundler = options.buildTarget !== undefined && options.bundler
-            ? options.bundler
-            : yield (0, ct_utils_1.getBundlerFromTarget)(found, tree);
-        if (options.bundler && options.bundler !== actualBundler) {
-            devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
+async function addFiles(tree, projectConfig, options, found) {
+    // must dyanmicaly import to prevent packages not using cypress from erroring out
+    // when importing react
+    const { addMountDefinition, addDefaultCTConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    // Specifically undefined to allow Remix workaround of passing an empty string
+    const actualBundler = options.buildTarget !== undefined && options.bundler
+        ? options.bundler
+        : await (0, ct_utils_1.getBundlerFromTarget)(found, tree);
+    if (options.bundler && options.bundler !== actualBundler) {
+        devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
       This may cause errors. If you are seeing errors, try removing the --bundler option.`);
-        }
-        const bundlerToUse = (_a = options.bundler) !== null && _a !== void 0 ? _a : actualBundler;
-        const commandFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-        const updatedCommandFile = yield addMountDefinition(tree.read(commandFile, 'utf-8'));
-        tree.write(commandFile, `import { mount } from 'cypress/react18';\n${updatedCommandFile}`);
-        const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
-        const updatedCyConfig = yield addDefaultCTConfig(tree.read(cyFile, 'utf-8'), { bundler: bundlerToUse });
-        tree.write(cyFile, `import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';\n${updatedCyConfig}`);
-        if (options.bundler === 'webpack' ||
-            (!options.bundler && actualBundler === 'webpack')) {
-            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
-        }
-        if (options.bundler === 'vite' ||
-            (!options.bundler && actualBundler === 'vite')) {
-            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/vite': versions_1.nxVersion });
-        }
-        if (options.generateTests) {
-            const filePaths = [];
-            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
-                if ((0, ct_utils_1.isComponent)(tree, filePath)) {
-                    filePaths.push(filePath);
-                }
-            });
-            for (const filePath of filePaths) {
-                yield (0, component_test_1.componentTestGenerator)(tree, {
-                    project: options.project,
-                    componentPath: filePath,
-                });
+    }
+    const bundlerToUse = options.bundler ?? actualBundler;
+    const commandFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
+    const updatedCommandFile = await addMountDefinition(tree.read(commandFile, 'utf-8'));
+    tree.write(commandFile, `import { mount } from 'cypress/react18';\n${updatedCommandFile}`);
+    const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+    const updatedCyConfig = await addDefaultCTConfig(tree.read(cyFile, 'utf-8'), { bundler: bundlerToUse });
+    tree.write(cyFile, `import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';\n${updatedCyConfig}`);
+    if (options.bundler === 'webpack' ||
+        (!options.bundler && actualBundler === 'webpack')) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
+    }
+    if (options.bundler === 'vite' ||
+        (!options.bundler && actualBundler === 'vite')) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/vite': versions_1.nxVersion });
+    }
+    if (options.generateTests) {
+        const filePaths = [];
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
+            if ((0, ct_utils_1.isComponent)(tree, filePath)) {
+                filePaths.push(filePath);
             }
+        });
+        for (const filePath of filePaths) {
+            await (0, component_test_1.componentTestGenerator)(tree, {
+                project: options.project,
+                componentPath: filePath,
+            });
         }
-    });
+    }
 }
 exports.addFiles = addFiles;

package/src/generators/hook/hook.js

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hookSchematic = exports.hookGenerator = void 0;
-const tslib_1 = require("tslib");
 // TODO(jack): Remove inline renderHook function when RTL releases with its own version
 const devkit_1 = require("@nx/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
-function hookGenerator(host, schema) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = yield normalizeOptions(host, schema);
-        createFiles(host, options);
-        addExportsToBarrel(host, options);
-        return yield (0, devkit_1.formatFiles)(host);
-    });
+async function hookGenerator(host, schema) {
+    const options = await normalizeOptions(host, schema);
+    createFiles(host, options);
+    addExportsToBarrel(host, options);
+    return await (0, devkit_1.formatFiles)(host);
 }
 exports.hookGenerator = hookGenerator;
 function createFiles(host, options) {
     const hookDir = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.directory);
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), hookDir, Object.assign(Object.assign({}, options), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), hookDir, {
+        ...options,
+        tmpl: '',
+    });
     for (const c of host.listChanges()) {
         let deleteFile = false;
         if (options.skipTests && /.*spec.ts/.test(c.path)) {
@@ -49,56 +49,57 @@ function addExportsToBarrel(host, options) {
         }
     }
 }
-function normalizeOptions(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        assertValidOptions(options);
-        let base = options.name;
-        if (base.startsWith('use-')) {
-            base = base.substring(4);
-        }
-        else if (base.startsWith('use')) {
-            base = base.substring(3);
-        }
-        const { className, fileName } = (0, devkit_1.names)(base);
-        const hookFilename = options.pascalCaseFiles
-            ? 'use'.concat(className)
-            : 'use-'.concat(fileName);
-        const hookName = 'use'.concat(className);
-        const hookTypeName = 'Use'.concat(className);
-        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, base);
-        if (options.export && projectType === 'application') {
-            devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
-        }
-        return Object.assign(Object.assign({}, options), { directory,
-            hookName,
-            hookTypeName, fileName: hookFilename, projectSourceRoot });
-    });
+async function normalizeOptions(host, options) {
+    assertValidOptions(options);
+    let base = options.name;
+    if (base.startsWith('use-')) {
+        base = base.substring(4);
+    }
+    else if (base.startsWith('use')) {
+        base = base.substring(3);
+    }
+    const { className, fileName } = (0, devkit_1.names)(base);
+    const hookFilename = options.pascalCaseFiles
+        ? 'use'.concat(className)
+        : 'use-'.concat(fileName);
+    const hookName = 'use'.concat(className);
+    const hookTypeName = 'Use'.concat(className);
+    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, base);
+    if (options.export && projectType === 'application') {
+        devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
+    }
+    return {
+        ...options,
+        directory,
+        hookName,
+        hookTypeName,
+        fileName: hookFilename,
+        projectSourceRoot,
+    };
 }
-function getDirectory(host, options, baseHookName) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { className, fileName } = (0, devkit_1.names)(baseHookName);
-        const hookFileName = options.pascalCaseDirectory === true
-            ? 'use'.concat(className)
-            : 'use-'.concat(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, hookFileName);
-    });
+async function getDirectory(host, options, baseHookName) {
+    const { className, fileName } = (0, devkit_1.names)(baseHookName);
+    const hookFileName = options.pascalCaseDirectory === true
+        ? 'use'.concat(className)
+        : 'use-'.concat(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, hookFileName);
 }
 function assertValidOptions(options) {
     const slashes = ['/', '\\'];