@aws/nx-plugin 1.0.0-rc.23 → 1.0.0-rc.25

package/src/py/fast-api/generator.js

@@ -1,129 +1,122 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pyFastApiProjectGenerator = exports.FAST_API_GENERATOR_INFO = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
-const open_api_metadata_1 = require("../../utils/api-constructs/open-api-metadata");
-const bundle_1 = require("../../utils/bundle/bundle");
-const format_1 = require("../../utils/format");
-const fs_1 = require("../../utils/fs");
-const iac_1 = require("../../utils/iac");
-const metrics_1 = require("../../utils/metrics");
-const names_1 = require("../../utils/names");
-const nx_1 = require("../../utils/nx");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const object_1 = require("../../utils/object");
-const port_1 = require("../../utils/port");
-const py_1 = require("../../utils/py");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const generator_1 = tslib_1.__importStar(require("../project/generator"));
-const open_api_1 = require("./react/open-api");
-exports.FAST_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateProjectConfiguration } from "@nx/devkit";
+import { addApiGatewayInfra } from "../../utils/api-constructs/api-constructs.js";
+import { addSharedConstructsOpenApiMetadataGenerateTarget } from "../../utils/api-constructs/open-api-metadata.js";
+import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
+import { formatFilesInSubtree } from "../../utils/format.js";
+import { FsCommands } from "../../utils/fs.js";
+import { resolveIac } from "../../utils/iac.js";
+import { installDependencies } from "../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { toClassName, toKebabCase } from "../../utils/names.js";
+import { addGeneratorMetadata, getGeneratorInfo } from "../../utils/nx.js";
+import { sortObjectKeys } from "../../utils/object.js";
+import { assignPort } from "../../utils/port.js";
+import { addDependenciesToDependencyGroupInPyProjectToml, addDependenciesToPyProjectToml } from "../../utils/py.js";
+import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import pyProjectGenerator, { getPyProjectDetails } from "../project/generator.js";
+import { addOpenApiGeneration } from "./react/open-api.js";
+export const FAST_API_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 /**
  * Generates a Python FastAPI project
- */
-const pyFastApiProjectGenerator = async (tree, schema) => {
+ */ export const pyFastApiProjectGenerator = async (tree, schema)=>{
     const integrationPattern = getIntegrationPattern(schema);
-    const { dir, normalizedModuleName, fullyQualifiedName } = (0, generator_1.getPyProjectDetails)(tree, {
+    const { dir, normalizedModuleName, fullyQualifiedName } = getPyProjectDetails(tree, {
         name: schema.name,
         directory: schema.directory,
         subDirectory: schema.subDirectory,
-        moduleName: schema.moduleName,
+        moduleName: schema.moduleName
     });
-    const apiNameKebabCase = (0, names_1.toKebabCase)(schema.name);
-    const apiNameClassName = (0, names_1.toClassName)(schema.name);
+    const apiNameKebabCase = toKebabCase(schema.name);
+    const apiNameClassName = toClassName(schema.name);
     let projectExists;
     try {
-        (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+        readProjectConfiguration(tree, fullyQualifiedName);
         projectExists = true;
-    }
-    catch {
+    } catch  {
         projectExists = false;
     }
     if (!projectExists) {
-        await (0, generator_1.default)(tree, {
+        await pyProjectGenerator(tree, {
             name: schema.name,
             directory: schema.directory,
             subDirectory: schema.subDirectory,
             moduleName: normalizedModuleName,
             type: 'application',
+            preferInstallDependencies: false
         });
     }
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
-    const port = (0, port_1.assignPort)(tree, projectConfig, 8000);
-    const { bundleOutputDir, bundleTargetName } = (0, bundle_1.addPythonBundleTarget)(projectConfig);
+    const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);
+    const port = assignPort(tree, projectConfig, 8000);
+    const { bundleOutputDir, bundleTargetName } = addPythonBundleTarget(projectConfig);
     // Add a command to copy run.sh to the bundle output for Lambda Web Adapter
-    const fs = new fs_1.FsCommands(tree);
+    const fs = new FsCommands(tree);
     const bundleTarget = projectConfig.targets[bundleTargetName];
     const copyRunShCommand = fs.cp(`{projectRoot}/run.sh`, `dist/{projectRoot}/${bundleTargetName}/run.sh`);
     if (!bundleTarget.options.commands.includes(copyRunShCommand)) {
         bundleTarget.options.commands = [
             ...bundleTarget.options.commands,
-            copyRunShCommand,
+            copyRunShCommand
         ];
     }
     projectConfig.targets.serve = {
         executor: '@nxlv/python:run-commands',
+        continuous: true,
         options: {
             command: `uv run fastapi dev ${normalizedModuleName}/main.py --port ${port}`,
-            cwd: '{projectRoot}',
-        },
-        continuous: true,
+            cwd: '{projectRoot}'
+        }
     };
-    projectConfig.targets['serve-local'] = {
-        ...projectConfig.targets['serve-local'],
+    projectConfig.targets['dev'] = {
+        ...projectConfig.targets['dev'],
         ...projectConfig.targets.serve,
         options: {
             ...projectConfig.targets.serve.options,
             env: {
-                SERVE_LOCAL: 'true',
-            },
-        },
+                LOCAL_DEV: 'true'
+            }
+        }
     };
     projectConfig.metadata = {
         ...projectConfig.metadata,
         apiName: schema.name,
         apiType: 'fast-api',
-        auth: schema.auth,
+        auth: schema.auth
     };
-    projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
-    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfig);
+    projectConfig.targets = sortObjectKeys(projectConfig.targets);
+    updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);
     // Add OpenAPI spec generation to the project, run as part of build
-    const { specPath } = (0, open_api_1.addOpenApiGeneration)(tree, { project: projectConfig });
+    const { specPath } = addOpenApiGeneration(tree, {
+        project: projectConfig
+    });
     [
-        (0, devkit_1.joinPathFragments)(dir, normalizedModuleName, 'hello.py'),
-        (0, devkit_1.joinPathFragments)(dir, 'tests', 'test_hello.py'),
-    ].forEach((f) => tree.delete(f));
+        joinPathFragments(dir, normalizedModuleName, 'hello.py'),
+        joinPathFragments(dir, 'tests', 'test_hello.py')
+    ].forEach((f)=>tree.delete(f));
     // User-owned source files: preserve any existing copies so re-running does
     // not clobber user edits (and does not reformat them nondeterministically).
-    (0, devkit_1.generateFiles)(tree, // the virtual file system
-    (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), // path to the file templates
-    dir, // destination path of the files
-    {
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'app'), dir, {
         name: normalizedModuleName,
         apiNameClassName,
-        infra: schema.infra,
+        infra: schema.infra
     }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
     if (schema.infra !== 'none') {
-        const iac = await (0, iac_1.resolveIac)(tree, schema.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-            iac,
+        const iac = await resolveIac(tree, schema.iac);
+        await sharedConstructsGenerator(tree, {
+            iac
         });
         if (schema.auth === 'custom') {
             const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), (0, devkit_1.joinPathFragments)(dir, normalizedModuleName), {}, {
-                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            generateFiles(tree, joinPathFragments(import.meta.dirname, '..', '..', 'utils', 'api-constructs', 'files', 'py-authorizer', authorizerType), joinPathFragments(dir, normalizedModuleName), {}, {
+                overwriteStrategy: OverwriteStrategy.KeepExisting
             });
         }
         // Add the CDK construct to deploy the FastAPI to shared constructs
-        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+        await addApiGatewayInfra(tree, {
             apiProjectName: projectConfig.name,
             apiNameClassName,
             apiNameKebabCase,
@@ -132,39 +125,43 @@ const pyFastApiProjectGenerator = async (tree, schema) => {
                 type: 'fastapi',
                 moduleName: normalizedModuleName,
                 bundleOutputDir,
-                integrationPattern,
+                integrationPattern
             },
             auth: schema.auth,
-            iac,
+            iac
         });
-        (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
+        addSharedConstructsOpenApiMetadataGenerateTarget(tree, {
             iac,
             apiNameKebabCase,
             specPath,
-            specBuildTargetName: `${projectConfig.name}:openapi`,
+            specBuildTargetName: `${projectConfig.name}:openapi`
         });
     }
-    (0, py_1.addDependenciesToPyProjectToml)(tree, dir, [
+    addDependenciesToPyProjectToml(tree, dir, [
         'fastapi',
         'uvicorn',
         'aws-lambda-powertools',
         'aws-lambda-powertools[tracer]',
-        ...(schema.auth === 'custom'
-            ? ['aws-lambda-powertools[parser]']
-            : []),
+        ...schema.auth === 'custom' ? [
+            'aws-lambda-powertools[parser]'
+        ] : []
     ]);
-    (0, py_1.addDependenciesToDependencyGroupInPyProjectToml)(tree, dir, 'dev', [
-        'fastapi[standard]',
+    addDependenciesToDependencyGroupInPyProjectToml(tree, dir, 'dev', [
+        'fastapi[standard]'
     ]);
-    (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.FAST_API_GENERATOR_INFO);
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.FAST_API_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return async () => {
-        await new nxlv_python_1.UVProvider(tree.root, new nxlv_python_1.Logger(), tree).install();
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    addGeneratorMetadata(tree, fullyQualifiedName, FAST_API_GENERATOR_INFO);
+    await addGeneratorMetricsIfApplicable(tree, [
+        FAST_API_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, schema.preferInstallDependencies, {
+            languages: [
+                'typescript',
+                'python'
+            ]
+        });
 };
-exports.pyFastApiProjectGenerator = pyFastApiProjectGenerator;
-const getIntegrationPattern = (schema) => schema.integrationPattern ?? 'isolated';
-exports.default = exports.pyFastApiProjectGenerator;
+const getIntegrationPattern = (schema)=>schema.integrationPattern ?? 'isolated';
+export default pyFastApiProjectGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/py/fast-api/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/fast-api/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addApiGatewayInfra } from '../../utils/api-constructs/api-constructs';\nimport { addSharedConstructsOpenApiMetadataGenerateTarget } from '../../utils/api-constructs/open-api-metadata';\nimport { addPythonBundleTarget } from '../../utils/bundle/bundle';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { toClassName, toKebabCase } from '../../utils/names';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { assignPort } from '../../utils/port';\nimport {\n  addDependenciesToDependencyGroupInPyProjectToml,\n  addDependenciesToPyProjectToml,\n} from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport pyProjectGenerator, { getPyProjectDetails } from '../project/generator';\nimport { addOpenApiGeneration } from './react/open-api';\nimport type { PyFastApiProjectGeneratorSchema } from './schema';\n\nexport const FAST_API_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Generates a Python FastAPI project\n */\nexport const pyFastApiProjectGenerator = async (\n  tree: Tree,\n  schema: PyFastApiProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const integrationPattern = getIntegrationPattern(schema);\n\n  const { dir, normalizedModuleName, fullyQualifiedName } = getPyProjectDetails(\n    tree,\n    {\n      name: schema.name,\n      directory: schema.directory,\n      subDirectory: schema.subDirectory,\n      moduleName: schema.moduleName,\n    },\n  );\n  const apiNameKebabCase = toKebabCase(schema.name);\n  const apiNameClassName = toClassName(schema.name);\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await pyProjectGenerator(tree, {\n      name: schema.name,\n      directory: schema.directory,\n      subDirectory: schema.subDirectory,\n      moduleName: normalizedModuleName,\n      type: 'application',\n      preferInstallDependencies: false,\n    });\n  }\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const port = assignPort(tree, projectConfig, 8000);\n\n  const { bundleOutputDir, bundleTargetName } =\n    addPythonBundleTarget(projectConfig);\n\n  // Add a command to copy run.sh to the bundle output for Lambda Web Adapter\n  const fs = new FsCommands(tree);\n  const bundleTarget = projectConfig.targets[bundleTargetName];\n  const copyRunShCommand = fs.cp(\n    `{projectRoot}/run.sh`,\n    `dist/{projectRoot}/${bundleTargetName}/run.sh`,\n  );\n  if (!bundleTarget.options.commands.includes(copyRunShCommand)) {\n    bundleTarget.options.commands = [\n      ...bundleTarget.options.commands,\n      copyRunShCommand,\n    ];\n  }\n\n  projectConfig.targets.serve = {\n    executor: '@nxlv/python:run-commands',\n    continuous: true,\n    options: {\n      command: `uv run fastapi dev ${normalizedModuleName}/main.py --port ${port}`,\n      cwd: '{projectRoot}',\n    },\n  };\n\n  projectConfig.targets['dev'] = {\n    ...projectConfig.targets['dev'],\n    ...projectConfig.targets.serve,\n    options: {\n      ...projectConfig.targets.serve.options,\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n\n  projectConfig.metadata = {\n    ...projectConfig.metadata,\n    apiName: schema.name,\n    apiType: 'fast-api',\n    auth: schema.auth,\n  } as any;\n\n  projectConfig.targets = sortObjectKeys(projectConfig.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n\n  // Add OpenAPI spec generation to the project, run as part of build\n  const { specPath } = addOpenApiGeneration(tree, { project: projectConfig });\n\n  [\n    joinPathFragments(dir, normalizedModuleName, 'hello.py'),\n    joinPathFragments(dir, 'tests', 'test_hello.py'),\n  ].forEach((f) => tree.delete(f));\n\n  // User-owned source files: preserve any existing copies so re-running does\n  // not clobber user edits (and does not reformat them nondeterministically).\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, 'files', 'app'), // path to the file templates\n    dir, // destination path of the files\n    {\n      name: normalizedModuleName,\n      apiNameClassName,\n      infra: schema.infra,\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  if (schema.infra !== 'none') {\n    const iac = await resolveIac(tree, schema.iac);\n\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n\n    if (schema.auth === 'custom') {\n      const authorizerType = schema.infra === 'http-lambda' ? 'http' : 'rest';\n      generateFiles(\n        tree,\n        joinPathFragments(\n          import.meta.dirname,\n          '..',\n          '..',\n          'utils',\n          'api-constructs',\n          'files',\n          'py-authorizer',\n          authorizerType,\n        ),\n        joinPathFragments(dir, normalizedModuleName),\n        {},\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n    }\n\n    // Add the CDK construct to deploy the FastAPI to shared constructs\n    await addApiGatewayInfra(tree, {\n      apiProjectName: projectConfig.name,\n      apiNameClassName,\n      apiNameKebabCase,\n      constructType: schema.infra === 'http-lambda' ? 'http' : 'rest',\n      backend: {\n        type: 'fastapi',\n        moduleName: normalizedModuleName,\n        bundleOutputDir,\n        integrationPattern,\n      },\n      auth: schema.auth,\n      iac,\n    });\n\n    addSharedConstructsOpenApiMetadataGenerateTarget(tree, {\n      iac,\n      apiNameKebabCase,\n      specPath,\n      specBuildTargetName: `${projectConfig.name}:openapi`,\n    });\n  }\n\n  addDependenciesToPyProjectToml(tree, dir, [\n    'fastapi',\n    'uvicorn',\n    'aws-lambda-powertools',\n    'aws-lambda-powertools[tracer]',\n    ...(schema.auth === 'custom'\n      ? (['aws-lambda-powertools[parser]'] as const)\n      : []),\n  ]);\n  addDependenciesToDependencyGroupInPyProjectToml(tree, dir, 'dev', [\n    'fastapi[standard]',\n  ]);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, FAST_API_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [FAST_API_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nconst getIntegrationPattern = (\n  schema: PyFastApiProjectGeneratorSchema,\n): 'isolated' | 'shared' => schema.integrationPattern ?? 'isolated';\n\nexport default pyFastApiProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateProjectConfiguration","addApiGatewayInfra","addSharedConstructsOpenApiMetadataGenerateTarget","addPythonBundleTarget","formatFilesInSubtree","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toKebabCase","addGeneratorMetadata","getGeneratorInfo","sortObjectKeys","assignPort","addDependenciesToDependencyGroupInPyProjectToml","addDependenciesToPyProjectToml","sharedConstructsGenerator","pyProjectGenerator","getPyProjectDetails","addOpenApiGeneration","FAST_API_GENERATOR_INFO","filename","pyFastApiProjectGenerator","tree","schema","integrationPattern","getIntegrationPattern","dir","normalizedModuleName","fullyQualifiedName","name","directory","subDirectory","moduleName","apiNameKebabCase","apiNameClassName","projectExists","type","preferInstallDependencies","projectConfig","port","bundleOutputDir","bundleTargetName","fs","bundleTarget","targets","copyRunShCommand","cp","options","commands","includes","serve","executor","continuous","command","cwd","env","LOCAL_DEV","metadata","apiName","apiType","auth","specPath","project","forEach","f","delete","dirname","infra","overwriteStrategy","KeepExisting","iac","authorizerType","apiProjectName","constructType","backend","specBuildTargetName","languages"],"mappings":"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"}

package/src/py/fast-api/react/__snapshots__/generator.spec.ts.snap

@@ -1,11 +1,12 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`fastapi react generator > should generate OpenAPI spec script > generate_open_api.py 1`] = `
-"from src.main import app
-import json
+"import json
 import os
 import sys
 
+from src.main import app
+
 os.makedirs(os.path.dirname(sys.argv[1]), exist_ok=True)
 with open(sys.argv[1], "w") as f:
     json.dump(app.openapi(), f)

package/src/py/fast-api/react/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { type Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../../utils/nx';
 import type { FastApiReactGeneratorSchema } from './schema';
 export declare const FAST_API_REACT_GENERATOR_INFO: NxGeneratorInfo;
-export declare const fastApiReactGenerator: (tree: Tree, options: FastApiReactGeneratorSchema) => Promise<() => void>;
+export declare const fastApiReactGenerator: (tree: Tree, options: FastApiReactGeneratorSchema) => Promise<() => Promise<void>>;
 export default fastApiReactGenerator;

package/src/py/fast-api/react/generator.js

@@ -1,29 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fastApiReactGenerator = exports.FAST_API_REACT_GENERATOR_INFO = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const react_1 = require("../../../utils/connection/open-api/react");
-const format_1 = require("../../../utils/format");
-const metrics_1 = require("../../../utils/metrics");
-const nx_1 = require("../../../utils/nx");
-const open_api_1 = require("./open-api");
-exports.FAST_API_REACT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const fastApiReactGenerator = async (tree, options) => {
-    const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);
-    const fastApiProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.fastApiProjectName);
+ */ import { addOpenApiReactClient } from "../../../utils/connection/open-api/react.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { installDependencies } from "../../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { addOpenApiGeneration } from "./open-api.js";
+export const FAST_API_REACT_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const fastApiReactGenerator = async (tree, options)=>{
+    const frontendProjectConfig = readProjectConfigurationUnqualified(tree, options.frontendProjectName);
+    const fastApiProjectConfig = readProjectConfigurationUnqualified(tree, options.fastApiProjectName);
     // Add OpenAPI spec generation to the project, run as part of build
-    const { specPath } = (0, open_api_1.addOpenApiGeneration)(tree, {
-        project: fastApiProjectConfig,
+    const { specPath } = addOpenApiGeneration(tree, {
+        project: fastApiProjectConfig
     });
     const metadata = fastApiProjectConfig.metadata;
     const apiName = metadata?.apiName;
     const auth = (metadata?.auth ?? 'iam').toLowerCase();
     const port = metadata?.port ?? metadata?.ports?.[0] ?? 8000;
-    await (0, react_1.addOpenApiReactClient)(tree, {
+    await addOpenApiReactClient(tree, {
         apiName,
         frontendProjectConfig,
         backendProjectConfig: fastApiProjectConfig,
@@ -31,14 +27,18 @@ const fastApiReactGenerator = async (tree, options) => {
         specPath,
         specBuildTargetName: `${fastApiProjectConfig.name}:openapi`,
         auth,
-        port,
+        port
     });
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.FAST_API_REACT_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+    await addGeneratorMetricsIfApplicable(tree, [
+        FAST_API_REACT_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.fastApiReactGenerator = fastApiReactGenerator;
-exports.default = exports.fastApiReactGenerator;
+export default fastApiReactGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/py/fast-api/react/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAA4D;AAC5D,oEAAiF;AACjF,kDAA6D;AAC7D,oDAAyE;AACzE,0CAI2B;AAC3B,yCAAkD;AAGrC,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EACV,OAAoC,EACpC,EAAE;IACF,MAAM,qBAAqB,GAAG,IAAA,wCAAmC,EAC/D,IAAI,EACJ,OAAO,CAAC,mBAAmB,CAC5B,CAAC;IACF,MAAM,oBAAoB,GAAG,IAAA,wCAAmC,EAC9D,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IAEF,mEAAmE;IACnE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,+BAAoB,EAAC,IAAI,EAAE;QAC9C,OAAO,EAAE,oBAAoB;KAC9B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAe,CAAC;IACtD,MAAM,OAAO,GAAG,QAAQ,EAAE,OAAO,CAAC;IAClC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,IAAI,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,IAAI,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAE5D,MAAM,IAAA,6BAAqB,EAAC,IAAI,EAAE;QAChC,OAAO;QACP,qBAAqB;QACrB,oBAAoB,EAAE,oBAAoB;QAC1C,gBAAgB,EAAE,oBAAoB;QACtC,QAAQ;QACR,mBAAmB,EAAE,GAAG,oBAAoB,CAAC,IAAI,UAAU;QAC3D,IAAI;QACJ,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,qBAAqB,yBAwChC;AAEF,kBAAe,6BAAqB,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { Tree } from '@nx/devkit';\nimport { addOpenApiReactClient } from '../../../utils/connection/open-api/react';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport {\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addOpenApiGeneration } from './open-api';\nimport type { FastApiReactGeneratorSchema } from './schema';\n\nexport const FAST_API_REACT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const fastApiReactGenerator = async (\n  tree: Tree,\n  options: FastApiReactGeneratorSchema,\n) => {\n  const frontendProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.frontendProjectName,\n  );\n  const fastApiProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    options.fastApiProjectName,\n  );\n\n  // Add OpenAPI spec generation to the project, run as part of build\n  const { specPath } = addOpenApiGeneration(tree, {\n    project: fastApiProjectConfig,\n  });\n\n  const metadata = fastApiProjectConfig.metadata as any;\n  const apiName = metadata?.apiName;\n  const auth = (metadata?.auth ?? 'iam').toLowerCase();\n  const port = metadata?.port ?? metadata?.ports?.[0] ?? 8000;\n\n  await addOpenApiReactClient(tree, {\n    apiName,\n    frontendProjectConfig,\n    backendProjectConfig: fastApiProjectConfig,\n    specBuildProject: fastApiProjectConfig,\n    specPath,\n    specBuildTargetName: `${fastApiProjectConfig.name}:openapi`,\n    auth,\n    port,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [FAST_API_REACT_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default fastApiReactGenerator;\n"],"names":["addOpenApiReactClient","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","getGeneratorInfo","readProjectConfigurationUnqualified","addOpenApiGeneration","FAST_API_REACT_GENERATOR_INFO","filename","fastApiReactGenerator","tree","options","frontendProjectConfig","frontendProjectName","fastApiProjectConfig","fastApiProjectName","specPath","project","metadata","apiName","auth","toLowerCase","port","ports","backendProjectConfig","specBuildProject","specBuildTargetName","name","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GAED,SAASA,qBAAqB,QAAQ,8CAA2C;AACjF,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SACEC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,oBAAoB,QAAQ,gBAAa;AAGlD,OAAO,MAAMC,gCAAiDH,iBAC5D,YAAYI,QAAQ,EACpB;AAEF,OAAO,MAAMC,wBAAwB,OACnCC,MACAC;IAEA,MAAMC,wBAAwBP,oCAC5BK,MACAC,QAAQE,mBAAmB;IAE7B,MAAMC,uBAAuBT,oCAC3BK,MACAC,QAAQI,kBAAkB;IAG5B,mEAAmE;IACnE,MAAM,EAAEC,QAAQ,EAAE,GAAGV,qBAAqBI,MAAM;QAC9CO,SAASH;IACX;IAEA,MAAMI,WAAWJ,qBAAqBI,QAAQ;IAC9C,MAAMC,UAAUD,UAAUC;IAC1B,MAAMC,OAAO,AAACF,CAAAA,UAAUE,QAAQ,KAAI,EAAGC,WAAW;IAClD,MAAMC,OAAOJ,UAAUI,QAAQJ,UAAUK,OAAO,CAAC,EAAE,IAAI;IAEvD,MAAMvB,sBAAsBU,MAAM;QAChCS;QACAP;QACAY,sBAAsBV;QACtBW,kBAAkBX;QAClBE;QACAU,qBAAqB,GAAGZ,qBAAqBa,IAAI,CAAC,QAAQ,CAAC;QAC3DP;QACAE;IACF;IAEA,MAAMnB,gCAAgCO,MAAM;QAACH;KAA8B;IAE3E,MAAMN,qBAAqBS;IAC3B,OAAO,IACLR,oBAAoBQ,MAAMC,QAAQiB,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAepB,sBAAsB"}

package/src/py/fast-api/react/open-api.js

@@ -1,63 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addOpenApiGeneration = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const names_1 = require("../../../utils/names");
-const object_1 = require("../../../utils/object");
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+import { snakeCase } from "../../../utils/names.js";
+import { sortObjectKeys } from "../../../utils/object.js";
 /**
  * Adds FastAPI -> OpenApi spec generation as part of the FastAPI project build
- */
-const addOpenApiGeneration = (tree, { project }) => {
+ */ export const addOpenApiGeneration = (tree, { project })=>{
     const moduleName = getFastApiModuleName(project);
     // Add OpenAPI spec generation script to FastAPI spec, preserving an existing
     // copy so re-running does not reformat it nondeterministically
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files/fast-api'), project.root, {
-        moduleName,
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files/fast-api'), project.root, {
+        moduleName
     }, {
-        overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        overwriteStrategy: OverwriteStrategy.KeepExisting
     });
     // Instrument the script as part of the fastapi project build
-    const fastApiOpenApiDist = (0, devkit_1.joinPathFragments)('dist', project.root, 'openapi');
-    const specPath = (0, devkit_1.joinPathFragments)(fastApiOpenApiDist, 'openapi.json');
-    (0, devkit_1.updateProjectConfiguration)(tree, project.name, {
+    const fastApiOpenApiDist = joinPathFragments('dist', project.root, 'openapi');
+    const specPath = joinPathFragments(fastApiOpenApiDist, 'openapi.json');
+    updateProjectConfiguration(tree, project.name, {
         ...project,
-        targets: (0, object_1.sortObjectKeys)({
+        targets: sortObjectKeys({
             ...project.targets,
             build: {
                 ...project.targets?.build,
                 dependsOn: [
-                    ...(project.targets?.build?.dependsOn ?? []).filter((t) => t !== 'openapi'),
-                    'openapi',
-                ],
+                    ...(project.targets?.build?.dependsOn ?? []).filter((t)=>t !== 'openapi'),
+                    'openapi'
+                ]
             },
             openapi: {
                 cache: true,
                 executor: 'nx:run-commands',
-                outputs: ['{workspaceRoot}/dist/{projectRoot}/openapi'],
+                outputs: [
+                    '{workspaceRoot}/dist/{projectRoot}/openapi'
+                ],
                 options: {
                     commands: [
-                        'uv run python {projectRoot}/scripts/generate_open_api.py "dist/{projectRoot}/openapi/openapi.json"',
-                    ],
-                },
-            },
-        }),
+                        'uv run python {projectRoot}/scripts/generate_open_api.py "dist/{projectRoot}/openapi/openapi.json"'
+                    ]
+                }
+            }
+        })
     });
-    return { specPath };
+    return {
+        specPath
+    };
 };
-exports.addOpenApiGeneration = addOpenApiGeneration;
-const getFastApiModuleName = (projectConfig) => {
+const getFastApiModuleName = (projectConfig)=>{
     if (projectConfig.sourceRoot) {
         const sourceRootParts = projectConfig.sourceRoot.split('/');
         return sourceRootParts[sourceRootParts.length - 1];
     }
     const apiName = projectConfig.metadata?.apiName;
     if (apiName) {
-        return (0, names_1.snakeCase)(apiName);
+        return snakeCase(apiName);
     }
     new Error(`Could not determine sourceRoot for project ${projectConfig.name}`);
 };
+
 //# sourceMappingURL=open-api.js.map

package/src/py/fast-api/react/open-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-api.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,gDAAiD;AACjD,kDAAuD;AAMvD;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAClC,IAAU,EACV,EAAE,OAAO,EAA+B,EAClB,EAAE;IACxB,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEjD,6EAA6E;IAC7E,+DAA+D;IAC/D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gBAAgB,CAAC,EAC9C,OAAO,CAAC,IAAI,EACZ;QACE,UAAU;KACX,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,6DAA6D;IAC7D,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;IACvE,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;QAC7C,GAAG,OAAO;QACV,OAAO,EAAE,IAAA,uBAAc,EAAC;YACtB,GAAG,OAAO,CAAC,OAAO;YAClB,KAAK,EAAE;gBACL,GAAG,OAAO,CAAC,OAAO,EAAE,KAAK;gBACzB,SAAS,EAAE;oBACT,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CACvB;oBACD,SAAS;iBACV;aACF;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,4CAA4C,CAAC;gBACvD,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,oGAAoG;qBACrG;iBACF;aACF;SACF,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B;AAEF,MAAM,oBAAoB,GAAG,CAAC,aAAmC,EAAU,EAAE;IAC3E,IAAI,aAAa,CAAC,UAAU,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5D,OAAO,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,OAAO,GAAI,aAAa,CAAC,QAAgB,EAAE,OAAO,CAAC;IACzD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,IAAA,iBAAS,EAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,IAAI,KAAK,CAAC,8CAA8C,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;AAChF,CAAC,CAAC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/open-api.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { snakeCase } from '../../../utils/names';\nimport { sortObjectKeys } from '../../../utils/object';\n\nexport interface AddOpenApiGenerationOptions {\n  project: ProjectConfiguration;\n}\n\n/**\n * Adds FastAPI -> OpenApi spec generation as part of the FastAPI project build\n */\nexport const addOpenApiGeneration = (\n  tree: Tree,\n  { project }: AddOpenApiGenerationOptions,\n): { specPath: string } => {\n  const moduleName = getFastApiModuleName(project);\n\n  // Add OpenAPI spec generation script to FastAPI spec, preserving an existing\n  // copy so re-running does not reformat it nondeterministically\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files/fast-api'),\n    project.root,\n    {\n      moduleName,\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Instrument the script as part of the fastapi project build\n  const fastApiOpenApiDist = joinPathFragments('dist', project.root, 'openapi');\n  const specPath = joinPathFragments(fastApiOpenApiDist, 'openapi.json');\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    targets: sortObjectKeys({\n      ...project.targets,\n      build: {\n        ...project.targets?.build,\n        dependsOn: [\n          ...(project.targets?.build?.dependsOn ?? []).filter(\n            (t) => t !== 'openapi',\n          ),\n          'openapi',\n        ],\n      },\n      openapi: {\n        cache: true,\n        executor: 'nx:run-commands',\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/openapi'],\n        options: {\n          commands: [\n            'uv run python {projectRoot}/scripts/generate_open_api.py \"dist/{projectRoot}/openapi/openapi.json\"',\n          ],\n        },\n      },\n    }),\n  });\n\n  return { specPath };\n};\n\nconst getFastApiModuleName = (projectConfig: ProjectConfiguration): string => {\n  if (projectConfig.sourceRoot) {\n    const sourceRootParts = projectConfig.sourceRoot.split('/');\n    return sourceRootParts[sourceRootParts.length - 1];\n  }\n  const apiName = (projectConfig.metadata as any)?.apiName;\n  if (apiName) {\n    return snakeCase(apiName);\n  }\n  new Error(`Could not determine sourceRoot for project ${projectConfig.name}`);\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","snakeCase","sortObjectKeys","addOpenApiGeneration","tree","project","moduleName","getFastApiModuleName","dirname","root","overwriteStrategy","KeepExisting","fastApiOpenApiDist","specPath","name","targets","build","dependsOn","filter","t","openapi","cache","executor","outputs","options","commands","projectConfig","sourceRoot","sourceRootParts","split","length","apiName","metadata","Error"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,SAAS,QAAQ,0BAAuB;AACjD,SAASC,cAAc,QAAQ,2BAAwB;AAMvD;;CAEC,GACD,OAAO,MAAMC,uBAAuB,CAClCC,MACA,EAAEC,OAAO,EAA+B;IAExC,MAAMC,aAAaC,qBAAqBF;IAExC,6EAA6E;IAC7E,+DAA+D;IAC/DR,cACEO,MACAN,kBAAkB,YAAYU,OAAO,EAAE,mBACvCH,QAAQI,IAAI,EACZ;QACEH;IACF,GACA;QACEI,mBAAmBX,kBAAkBY,YAAY;IACnD;IAGF,6DAA6D;IAC7D,MAAMC,qBAAqBd,kBAAkB,QAAQO,QAAQI,IAAI,EAAE;IACnE,MAAMI,WAAWf,kBAAkBc,oBAAoB;IACvDZ,2BAA2BI,MAAMC,QAAQS,IAAI,EAAE;QAC7C,GAAGT,OAAO;QACVU,SAASb,eAAe;YACtB,GAAGG,QAAQU,OAAO;YAClBC,OAAO;gBACL,GAAGX,QAAQU,OAAO,EAAEC,KAAK;gBACzBC,WAAW;uBACN,AAACZ,CAAAA,QAAQU,OAAO,EAAEC,OAAOC,aAAa,EAAE,AAAD,EAAGC,MAAM,CACjD,CAACC,IAAMA,MAAM;oBAEf;iBACD;YACH;YACAC,SAAS;gBACPC,OAAO;gBACPC,UAAU;gBACVC,SAAS;oBAAC;iBAA6C;gBACvDC,SAAS;oBACPC,UAAU;wBACR;qBACD;gBACH;YACF;QACF;IACF;IAEA,OAAO;QAAEZ;IAAS;AACpB,EAAE;AAEF,MAAMN,uBAAuB,CAACmB;IAC5B,IAAIA,cAAcC,UAAU,EAAE;QAC5B,MAAMC,kBAAkBF,cAAcC,UAAU,CAACE,KAAK,CAAC;QACvD,OAAOD,eAAe,CAACA,gBAAgBE,MAAM,GAAG,EAAE;IACpD;IACA,MAAMC,UAAWL,cAAcM,QAAQ,EAAUD;IACjD,IAAIA,SAAS;QACX,OAAO9B,UAAU8B;IACnB;IACA,IAAIE,MAAM,CAAC,2CAA2C,EAAEP,cAAcZ,IAAI,EAAE;AAC9E"}

package/src/py/fast-api/react/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/py/fast-api/react/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/fast-api/react/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport interface FastApiReactGeneratorSchema {\n  frontendProjectName: string;\n  fastApiProjectName: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAIC"}

package/src/py/fast-api/react/schema.d.ts

@@ -5,4 +5,5 @@
 export interface FastApiReactGeneratorSchema {
   frontendProjectName: string;
   fastApiProjectName: string;
+  preferInstallDependencies?: boolean;
 }

package/src/py/fast-api/react/schema.json

@@ -20,6 +20,11 @@
       "description": "",
       "x-prompt": "Package containing your FastAPI backend",
       "x-dropdown": "projects"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["frontendProjectName", "fastApiProjectName"]

package/src/py/fast-api/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/py/fast-api/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/fast-api/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { IacOption } from '../../utils/iac';\n\nexport interface PyFastApiProjectGeneratorSchema {\n  readonly name: string;\n  readonly infra: 'rest-lambda' | 'http-lambda' | 'none';\n  readonly integrationPattern?: 'isolated' | 'shared';\n  readonly auth: 'iam' | 'cognito' | 'custom';\n  readonly directory?: string;\n  readonly subDirectory?: string;\n  readonly moduleName?: string;\n  readonly iac: IacOption;\n  readonly preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAID,WAUC"}

package/src/py/fast-api/schema.d.ts

@@ -14,4 +14,5 @@ export interface PyFastApiProjectGeneratorSchema {
   readonly subDirectory?: string;
   readonly moduleName?: string;
   readonly iac: IacOption;
+  readonly preferInstallDependencies?: boolean;
 }

package/src/py/fast-api/schema.json

@@ -76,6 +76,11 @@
       "enum": ["rest-lambda", "http-lambda", "none"],
       "x-prompt": "What infrastructure would you like to deploy your API with?",
       "x-priority": "important"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"]