@aws/nx-plugin 0.1.6 → 0.2.1

package/src/trpc/react/generator.js

@@ -10,8 +10,11 @@ const devkit_1 = require("@nx/devkit");
 const typescript_1 = require("typescript");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const generator_1 = require("../../cloudscape-website/runtime-config/generator");
+const shared_constructs_1 = require("../../utils/shared-constructs");
 const npm_scope_1 = require("../../utils/npm-scope");
 const versions_1 = require("../../utils/versions");
+const ast_1 = require("../../utils/ast");
+const names_1 = require("../../utils/names");
 const format_1 = require("../../utils/format");
 function reactGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -20,45 +23,141 @@ function reactGenerator(tree, options) {
         const backendProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.backendProjectName);
         /* eslint-disable @typescript-eslint/no-explicit-any */
         const apiName = (_a = backendProjectConfig.metadata) === null || _a === void 0 ? void 0 : _a.apiName;
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), frontendProjectConfig.root, Object.assign(Object.assign({ apiName }, options), { backendProjectAlias: (0, npm_scope_1.toScopeAlias)(options.backendProjectName) }));
+        const apiNameClassName = (0, names_1.toClassName)(apiName);
+        const backendProjectAlias = (0, npm_scope_1.toScopeAlias)(options.backendProjectName);
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), frontendProjectConfig.root, Object.assign(Object.assign({ apiName, apiNameClassName: (0, names_1.toClassName)(apiName) }, options), { backendProjectAlias: (0, npm_scope_1.toScopeAlias)(options.backendProjectName) }), {
+            overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+        });
+        if (options.auth !== 'IAM') {
+            tree.delete(`${frontendProjectConfig.root}/src/hooks/useSigV4.tsx`);
+        }
         yield (0, generator_1.runtimeConfigGenerator)(tree, {
             project: options.frontendProjectName,
         });
+        // Update runtime-config.ts with ApiUrl type and trpcApis property
+        const runtimeConfigPath = (0, devkit_1.joinPathFragments)(shared_constructs_1.PACKAGES_DIR, shared_constructs_1.TYPE_DEFINITIONS_DIR, 'src', 'runtime-config.ts');
+        const runtimeConfigContent = tree.read(runtimeConfigPath).toString();
+        const sourceFile = (0, tsquery_1.ast)(runtimeConfigContent);
+        // Check if ApiUrl type exists
+        const existingApiUrl = tsquery_1.tsquery.query(sourceFile, 'TypeAliasDeclaration[name.text="ApiUrl"]');
+        // Check if trpcApis property exists in IRuntimeConfig
+        const existingTrpcApis = tsquery_1.tsquery.query(sourceFile, 'InterfaceDeclaration[name.text="IRuntimeConfig"] PropertySignature[name.text="trpcApis"]');
+        let updatedContent = sourceFile;
+        // Add ApiUrl type if it doesn't exist
+        if (existingApiUrl.length === 0) {
+            const apiUrlType = typescript_1.factory.createTypeAliasDeclaration([typescript_1.factory.createModifier(typescript_1.SyntaxKind.ExportKeyword)], typescript_1.factory.createIdentifier('ApiUrl'), undefined, typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.StringKeyword));
+            updatedContent = tsquery_1.tsquery.map(updatedContent, 'SourceFile', (node) => {
+                return typescript_1.factory.updateSourceFile(node, [apiUrlType, ...node.statements]);
+            });
+        }
+        // Add empty trpcApis to IRuntimeConfig if it doesn't exist
+        if (existingTrpcApis.length === 0) {
+            updatedContent = tsquery_1.tsquery.map(updatedContent, 'InterfaceDeclaration[name.text="IRuntimeConfig"]', (node) => {
+                const trpcApisProperty = typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier('trpcApis'), undefined, typescript_1.factory.createTypeLiteralNode([]));
+                return typescript_1.factory.updateInterfaceDeclaration(node, node.modifiers, node.name, node.typeParameters, node.heritageClauses, [...node.members, trpcApisProperty]);
+            });
+        }
+        // Check if apiNameClassName property exists in trpcApis
+        const existingApiNameProperty = tsquery_1.tsquery.query(updatedContent, `InterfaceDeclaration[name.text="IRuntimeConfig"] PropertySignature[name.text="trpcApis"] TypeLiteral PropertySignature[name.text="${apiNameClassName}"]`);
+        // Add apiNameClassName property to trpcApis if it doesn't exist
+        if (existingApiNameProperty.length === 0) {
+            updatedContent = tsquery_1.tsquery.map(updatedContent, 'InterfaceDeclaration[name.text="IRuntimeConfig"] PropertySignature[name.text="trpcApis"] TypeLiteral', (node) => {
+                return typescript_1.factory.createTypeLiteralNode([
+                    ...node.members,
+                    typescript_1.factory.createPropertySignature(undefined, typescript_1.factory.createIdentifier(apiNameClassName), undefined, typescript_1.factory.createTypeReferenceNode('ApiUrl', undefined)),
+                ]);
+            });
+        }
+        // Only write if changes were made
+        if (updatedContent !== sourceFile) {
+            tree.write(runtimeConfigPath, updatedContent.getFullText());
+        }
+        // update main.tsx
         const mainTsxPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'main.tsx');
-        if (!tree.exists(mainTsxPath)) {
-            throw new Error(`Could not find main.tsx in ${frontendProjectConfig.sourceRoot}`);
+        (0, ast_1.singleImport)(tree, mainTsxPath, 'TrpcClientProviders', './components/TrpcClients');
+        // Check if TrpcClientProviders already exists
+        const mainTsxSource = tree.read(mainTsxPath).toString();
+        const mainTsxAst = (0, tsquery_1.ast)(mainTsxSource);
+        const hasProvider = tsquery_1.tsquery.query(mainTsxAst, 'JsxOpeningElement[tagName.name="TrpcClientProviders"]').length > 0;
+        if (!hasProvider) {
+            (0, ast_1.replace)(tree, mainTsxPath, 'JsxSelfClosingElement[tagName.name="App"]', (node) => (0, ast_1.createJsxElementFromIdentifier)('TrpcClientProviders', [node]));
         }
-        const mainTsxContents = tree.read(mainTsxPath).toString();
-        const trpcProviderImport = typescript_1.factory.createImportDeclaration(undefined, typescript_1.factory.createImportClause(false, typescript_1.factory.createIdentifier('TRPCClientProvider'), undefined), typescript_1.factory.createStringLiteral('./components/TRPCClientProvider'));
-        const updatedImports = tsquery_1.tsquery
-            .map((0, tsquery_1.ast)(mainTsxContents), 'SourceFile', (node) => {
-            return Object.assign(Object.assign({}, node), { statements: [trpcProviderImport, ...node.statements] });
-        })
-            .getFullText();
-        let locatedNode = false;
-        const mainTsxUpdatedContents = tsquery_1.tsquery
-            .map((0, tsquery_1.ast)(updatedImports), 'JsxSelfClosingElement', (node) => {
-            if (node.tagName.getText() !== 'App') {
+        // update TrpcApis.tsx
+        const trpcApisPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'components/TrpcClients/TrpcApis.tsx');
+        // Add imports if they don't exist
+        (0, ast_1.destructuredImport)(tree, trpcApisPath, ['createIsolatedTrpcClientProvider'], './IsolatedTrpcProvider');
+        (0, ast_1.destructuredImport)(tree, trpcApisPath, [
+            `AppRouter as ${apiNameClassName}AppRouter`,
+            `Context as ${apiNameClassName}Context`,
+        ], backendProjectAlias);
+        // Update the export object only if API doesn't exist
+        (0, ast_1.replace)(tree, trpcApisPath, 'ExportAssignment > ObjectLiteralExpression', (node) => {
+            const existingProperties = node.properties;
+            if (existingProperties.find((p) => { var _a; return ((_a = p.name) === null || _a === void 0 ? void 0 : _a.getText()) === apiNameClassName; })) {
                 return node;
             }
-            else {
-                locatedNode = true;
-            }
-            return typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('TRPCClientProvider'), undefined, typescript_1.factory.createJsxAttributes([])), [node], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('TRPCClientProvider')));
-        })
-            .getFullText();
-        if (!locatedNode) {
-            throw new Error('Could not locate App component in main.tsx');
+            const newProperty = typescript_1.factory.createPropertyAssignment(typescript_1.factory.createIdentifier(apiNameClassName), typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('createIsolatedTrpcClientProvider'), [
+                typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier(`${apiNameClassName}AppRouter`)),
+                typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier(`${apiNameClassName}Context`)),
+            ], []));
+            return typescript_1.factory.createObjectLiteralExpression([...existingProperties, newProperty], true);
+        });
+        // update TrpcClientProviders.tsx
+        const trpcClientProvidersPath = (0, devkit_1.joinPathFragments)(frontendProjectConfig.sourceRoot, 'components/TrpcClients/TrpcClientProviders.tsx');
+        // Add imports
+        (0, ast_1.destructuredImport)(tree, trpcClientProvidersPath, ['useRuntimeConfig'], '../../hooks/useRuntimeConfig');
+        (0, ast_1.singleImport)(tree, trpcClientProvidersPath, 'TrpcApis', './TrpcApis');
+        // Check if useContext hook exists and add if it doesn't add it
+        const providersSource = tree.read(trpcClientProvidersPath).toString();
+        const providersAst = (0, tsquery_1.ast)(providersSource);
+        const hasRuntimeConfig = tsquery_1.tsquery.query(providersAst, 'VariableDeclaration[name.name="runtimeConfig"] CallExpression[expression.name="useRuntimeConfig"]').length > 0;
+        if (!hasRuntimeConfig) {
+            (0, ast_1.replace)(tree, trpcClientProvidersPath, 'ArrowFunction > Block', (node) => {
+                const existingStatements = [...node.statements];
+                const runtimeContextVar = typescript_1.factory.createVariableStatement(undefined, typescript_1.factory.createVariableDeclarationList([
+                    typescript_1.factory.createVariableDeclaration('runtimeConfig', undefined, undefined, typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('useRuntimeConfig'), undefined, [])),
+                ], typescript_1.NodeFlags.Const));
+                // Insert the runtimeContext declaration before the return statement
+                existingStatements.splice(existingStatements.length - 1, 0, runtimeContextVar);
+                return typescript_1.factory.createBlock(existingStatements, true);
+            });
         }
-        if (mainTsxContents !== mainTsxUpdatedContents) {
-            tree.write(mainTsxPath, mainTsxUpdatedContents);
+        // Check if API provider already exists
+        const trpcProviderSource = tree.read(trpcClientProvidersPath).toString();
+        const trpcProviderAst = (0, tsquery_1.ast)(trpcProviderSource);
+        const hasTrpcProvider = tsquery_1.tsquery.query(trpcProviderAst, `JsxOpeningElement PropertyAccessExpression:has(Identifier[name="Provider"]) PropertyAccessExpression:has(Identifier[name="${apiNameClassName}"]) Identifier[name="TrpcApis"]`).length > 0;
+        if (!hasTrpcProvider) {
+            // Transform the return statement only if provider doesn't exist
+            (0, ast_1.replace)(tree, trpcClientProvidersPath, 'ReturnStatement', (node) => {
+                var _a;
+                const existingExpression = (0, typescript_1.isParenthesizedExpression)(node.expression)
+                    ? (_a = node.expression) === null || _a === void 0 ? void 0 : _a.expression
+                    : node.expression;
+                return typescript_1.factory.createReturnStatement(typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('TrpcApis'), typescript_1.factory.createIdentifier(apiNameClassName)), typescript_1.factory.createIdentifier('Provider')), undefined, typescript_1.factory.createJsxAttributes([
+                    typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('apiUrl'), typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('runtimeConfig'), typescript_1.factory.createIdentifier('trpcApis')), typescript_1.factory.createIdentifier(apiNameClassName)))),
+                ])), [
+                    (0, typescript_1.isJsxChild)(existingExpression) ||
+                        (0, typescript_1.isJsxElement)(existingExpression) ||
+                        (0, typescript_1.isJsxFragment)(existingExpression) ||
+                        (0, typescript_1.isJsxSelfClosingElement)(existingExpression) ||
+                        (0, typescript_1.isJsxExpression)(existingExpression)
+                        ? existingExpression
+                        : typescript_1.factory.createJsxExpression(undefined, existingExpression),
+                ], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('TrpcApis'), typescript_1.factory.createIdentifier(apiNameClassName)), typescript_1.factory.createIdentifier('Provider')))));
+            });
         }
         (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
+            '@aws-sdk/client-cognito-identity',
+            '@aws-sdk/credential-provider-cognito-identity',
             '@trpc/client',
             '@trpc/react-query',
             '@tanstack/react-query',
+            'aws4fetch',
+            ...(options.auth === 'IAM'
+                ? ['oidc-client-ts', 'react-oidc-context']
+                : []),
         ]), {});
-        yield (0, format_1.formatFilesInSubtree)(tree, frontendProjectConfig.root);
+        yield (0, format_1.formatFilesInSubtree)(tree);
         return () => {
             (0, devkit_1.installPackagesTask)(tree);
         };

package/src/trpc/react/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/react/generator.ts"],"names":[],"mappings":"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"}

package/src/trpc/react/schema.json

@@ -23,10 +23,10 @@
     "auth": {
       "type": "string",
       "description": "",
+      "enum": ["IAM", "NONE"],
       "x-prompt": "Select your API authentication strategy",
-      "x-dropdown": ["IAM", "None"],
       "default": "IAM"
     }
   },
-  "required": ["frontendProjectName", "backendProjectName", "auth"]
+  "required": ["frontendProjectName", "backendProjectName"]
 }

package/src/ts/lib/__snapshots__/generator.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`ts lib generator > should generate library with custom directory > custom-dir-index.ts 1`] = `
 "export function hello() {
-    return "Hello!";
+  return "Hello!";
 }
 "
 `;
@@ -17,23 +17,11 @@ exports[`ts lib generator > should generate library with custom directory > cust
   "targets": {
     "build": {
       "dependsOn": [
-        "compile",
         "lint",
+        "compile",
         "test"
       ]
     },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": [
-        "{options.reportsDirectory}"
-      ],
-      "options": {
-        "reportsDirectory": "../../coverage/libs/test-lib"
-      }
-    },
     "compile": {
       "executor": "@nx/js:tsc",
       "outputs": [
@@ -42,11 +30,23 @@ exports[`ts lib generator > should generate library with custom directory > cust
       "options": {
         "outputPath": "dist/libs/test-lib",
         "main": "libs/test-lib/src/index.ts",
-        "tsConfig": "libs/test-lib/tsconfig.lib.json",
+        "tsConfig": "libs/test-lib/tsconfig.json",
         "assets": [
           "libs/test-lib/*.md"
         ]
       }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/vite:test",
+      "outputs": [
+        "{options.reportsDirectory}"
+      ],
+      "options": {
+        "reportsDirectory": "../../coverage/libs/test-lib"
+      }
     }
   }
 }
@@ -56,7 +56,6 @@ exports[`ts lib generator > should generate library with custom directory > cust
 exports[`ts lib generator > should generate library with custom directory > custom-dir-tsconfig.json 1`] = `
 "{
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [
@@ -66,14 +65,22 @@ exports[`ts lib generator > should generate library with custom directory > cust
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {}
 }
 "
 `;
 
-exports[`ts lib generator > should generate library with custom scope > scoped-project.json 1`] = `
+exports[`ts lib generator > should generate library with default options > index.ts 1`] = `
+"export function hello() {
+  return "Hello!";
+}
+"
+`;
+
+exports[`ts lib generator > should generate library with default options > project.json 1`] = `
 "{
-  "name": "@custom/test-lib",
+  "name": "@proj/test-lib",
   "$schema": "../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "test-lib/src",
   "projectType": "library",
@@ -81,23 +88,11 @@ exports[`ts lib generator > should generate library with custom scope > scoped-p
   "targets": {
     "build": {
       "dependsOn": [
-        "compile",
         "lint",
+        "compile",
         "test"
       ]
     },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": [
-        "{options.reportsDirectory}"
-      ],
-      "options": {
-        "reportsDirectory": "../coverage/test-lib"
-      }
-    },
     "compile": {
       "executor": "@nx/js:tsc",
       "outputs": [
@@ -106,38 +101,11 @@ exports[`ts lib generator > should generate library with custom scope > scoped-p
       "options": {
         "outputPath": "dist/test-lib",
         "main": "test-lib/src/index.ts",
-        "tsConfig": "test-lib/tsconfig.lib.json",
+        "tsConfig": "test-lib/tsconfig.json",
         "assets": [
           "test-lib/*.md"
         ]
       }
-    }
-  }
-}
-"
-`;
-
-exports[`ts lib generator > should generate library with default options > index.ts 1`] = `
-"export function hello() {
-    return "Hello!";
-}
-"
-`;
-
-exports[`ts lib generator > should generate library with default options > project.json 1`] = `
-"{
-  "name": "@proj/test-lib",
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "test-lib/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "dependsOn": [
-        "compile",
-        "lint",
-        "test"
-      ]
     },
     "lint": {
       "executor": "@nx/eslint:lint"
@@ -150,20 +118,6 @@ exports[`ts lib generator > should generate library with default options > proje
       "options": {
         "reportsDirectory": "../coverage/test-lib"
       }
-    },
-    "compile": {
-      "executor": "@nx/js:tsc",
-      "outputs": [
-        "{options.outputPath}"
-      ],
-      "options": {
-        "outputPath": "dist/test-lib",
-        "main": "test-lib/src/index.ts",
-        "tsConfig": "test-lib/tsconfig.lib.json",
-        "assets": [
-          "test-lib/*.md"
-        ]
-      }
     }
   }
 }
@@ -173,7 +127,6 @@ exports[`ts lib generator > should generate library with default options > proje
 exports[`ts lib generator > should generate library with default options > tsconfig.json 1`] = `
 "{
   "extends": "../tsconfig.base.json",
-  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [
@@ -183,14 +136,15 @@ exports[`ts lib generator > should generate library with default options > tscon
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {}
 }
 "
 `;
 
 exports[`ts lib generator > should generate library with subdirectory > subdir-index.ts 1`] = `
 "export function hello() {
-    return "Hello!";
+  return "Hello!";
 }
 "
 `;
@@ -205,23 +159,11 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
   "targets": {
     "build": {
       "dependsOn": [
-        "compile",
         "lint",
+        "compile",
         "test"
       ]
     },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": [
-        "{options.reportsDirectory}"
-      ],
-      "options": {
-        "reportsDirectory": "../../coverage/feature/test-lib"
-      }
-    },
     "compile": {
       "executor": "@nx/js:tsc",
       "outputs": [
@@ -230,11 +172,23 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
       "options": {
         "outputPath": "dist/feature/test-lib",
         "main": "feature/test-lib/src/index.ts",
-        "tsConfig": "feature/test-lib/tsconfig.lib.json",
+        "tsConfig": "feature/test-lib/tsconfig.json",
         "assets": [
           "feature/test-lib/*.md"
         ]
       }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/vite:test",
+      "outputs": [
+        "{options.reportsDirectory}"
+      ],
+      "options": {
+        "reportsDirectory": "../../coverage/feature/test-lib"
+      }
     }
   }
 }
@@ -244,7 +198,6 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
 exports[`ts lib generator > should generate library with subdirectory > subdir-tsconfig.json 1`] = `
 "{
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [
@@ -254,7 +207,8 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-t
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {}
 }
 "
 `;

package/src/ts/lib/eslint.d.ts

@@ -3,5 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tree } from '@nx/devkit';
-import { ConfigureProjectOptions } from './types';
-export declare const configureEslint: (tree: Tree, options: ConfigureProjectOptions) => void;
+export declare const configureEslint: (tree: Tree) => Promise<void>;

package/src/ts/lib/eslint.js

@@ -1,33 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureEslint = 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 configureEslint = (tree, options) => {
-    var _a;
+const versions_1 = require("../../utils/versions");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const typescript_1 = require("typescript");
+const ast_1 = require("../../utils/ast");
+const configureEslint = (tree) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     // Configure the lint task
-    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.fullyQualifiedName);
-    if (!projectConfiguration.targets.lint) {
-        projectConfiguration.targets.lint = {
-            executor: '@nx/eslint:lint',
-            options: {
-                fix: true,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.fullyQualifiedName, projectConfiguration);
+    let nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!((_a = nxJson.plugins) === null || _a === void 0 ? void 0 : _a.filter((e) => typeof e !== 'string').some((e) => e.plugin === '@nx/eslint/plugin'))) {
+        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { plugins: [
+                ...((_b = nxJson.plugins) !== null && _b !== void 0 ? _b : []),
+                {
+                    plugin: '@nx/eslint/plugin',
+                    options: {
+                        targetName: 'lint',
+                    },
+                },
+            ] }));
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { targetDefaults: Object.assign(Object.assign({}, ((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {})), { lint: {
-                cache: true,
-                inputs: [
-                    'default',
-                    '{workspaceRoot}/eslint.config.js',
-                    '{projectRoot}/eslint.config.js',
-                ],
-            } }) }));
-};
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['prettier', 'eslint-plugin-prettier']));
+    // Update or create eslint.config.mjs
+    const eslintConfigPath = 'eslint.config.mjs';
+    if (tree.exists(eslintConfigPath)) {
+        const eslintConfigContent = tree.read(eslintConfigPath).toString();
+        const sourceFile = (0, tsquery_1.ast)(eslintConfigContent);
+        // Check if import exists
+        const existingImport = tsquery_1.tsquery.query(sourceFile, 'VariableDeclaration[name.text="eslintPluginPrettierRecommended"]');
+        let updatedContent = sourceFile;
+        // Add import if it doesn't exist
+        if (existingImport.length === 0) {
+            updatedContent = (0, tsquery_1.ast)((0, ast_1.singleImport)(tree, eslintConfigPath, 'eslintPluginPrettierRecommended', 'eslint-plugin-prettier/recommended'));
+        }
+        // Check if eslintPluginPrettierRecommended exists in exports array
+        const existingPlugin = tsquery_1.tsquery.query(updatedContent, 'ExportAssignment > ArrayLiteralExpression Identifier[name="eslintPluginPrettierRecommended"]');
+        // Add eslintPluginPrettierRecommended to array if it doesn't exist
+        if (existingPlugin.length === 0) {
+            updatedContent = tsquery_1.tsquery.map(updatedContent, 'ExportAssignment > ArrayLiteralExpression', (node) => {
+                return typescript_1.factory.createArrayLiteralExpression([
+                    typescript_1.factory.createIdentifier('eslintPluginPrettierRecommended'),
+                    ...node.elements,
+                ], true);
+            });
+        }
+        // Only write if changes were made
+        if (updatedContent !== sourceFile) {
+            tree.write(eslintConfigPath, updatedContent.getFullText());
+        }
+        nxJson = (0, devkit_1.readNxJson)(tree);
+        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { targetDefaults: Object.assign(Object.assign({}, ((_c = nxJson.targetDefaults) !== null && _c !== void 0 ? _c : {})), { lint: {
+                    cache: true,
+                    configurations: {
+                        fix: {
+                            fix: true,
+                        },
+                    },
+                    inputs: [
+                        'default',
+                        '{workspaceRoot}/eslint.config.mjs',
+                        '{projectRoot}/eslint.config.mjs',
+                    ],
+                } }) }));
+    }
+});
 exports.configureEslint = configureEslint;
 //# sourceMappingURL=eslint.js.map

package/src/ts/lib/eslint.js.map

@@ -1 +1 @@
-{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAMoB;AAGb,MAAM,eAAe,GAAG,CAC7B,IAAU,EACV,OAAgC,EAChC,EAAE;;IACF,0BAA0B;IAC1B,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IACF,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACvC,oBAAoB,CAAC,OAAO,CAAC,IAAI,GAAG;YAClC,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,GAAG,EAAE,IAAI;aACV;SACF,CAAC;QAEF,IAAA,mCAA0B,EACxB,IAAI,EACJ,OAAO,CAAC,kBAAkB,EAC1B,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IAAA,qBAAY,EAAC,IAAI,kCACZ,MAAM,KACT,cAAc,kCACT,CAAC,MAAA,MAAM,CAAC,cAAc,mCAAI,EAAE,CAAC,KAChC,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE;oBACN,SAAS;oBACT,kCAAkC;oBAClC,gCAAgC;iBACjC;aACF,OAEH,CAAC;AACL,CAAC,CAAC;AAvCW,QAAA,eAAe,mBAuC1B"}
+{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":"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"}