build: add option to createNodes function (#863)

* build: add option to createNodes function * build: work in progress --------- Co-authored-by: khalilou88 <[email protected]>
khalilou88 · Feb 9, 2024 · 2bddd03 · 2bddd03
1 parent acb554c
commit 2bddd03
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 15 deletions.
diff --git a/packages/common/src/lib/types/index.ts b/packages/common/src/lib/types/index.ts
@@ -20,3 +20,8 @@ export interface TemplateOptionsType {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [k: string]: any;
 }
+export type NxMavenPluginOptions = {
+  mavenRootDirectory: string;
+  localRepoRelativePath: string;
+};
+export type NxGradlePluginOptions = { gradleRootDirectory: string };
diff --git a/packages/nx-gradle/src/graph/create-nodes.ts b/packages/nx-gradle/src/graph/create-nodes.ts
@@ -1,15 +1,18 @@
+import { NxGradlePluginOptions } from '@jnxplus/common';
 import { CreateNodes, ProjectConfiguration, workspaceRoot } from '@nx/devkit';
 import { execSync } from 'child_process';
 import * as path from 'path';
-import { getExecutable, getGradleRootDirectory } from '../utils';
+import { getExecutable } from '../utils';
 import { getGradleProjects, getProjectRoot, outputFile } from './graph-utils';
 
-export const createNodes: CreateNodes = [
+export const createNodes: CreateNodes<NxGradlePluginOptions> = [
   'nx.json',
-  () => {
+  (_, opts) => {
     const command = `${getExecutable()} :projectDependencyTask --outputFile=${outputFile}`;
 
-    const gradleRootDirectory = getGradleRootDirectory();
+    const gradleRootDirectory = opts?.gradleRootDirectory
+      ? opts.gradleRootDirectory
+      : '';
 
     execSync(command, {
       cwd: path.join(workspaceRoot, gradleRootDirectory),

diff --git a/packages/nx-maven/src/graph/create-nodes.ts b/packages/nx-maven/src/graph/create-nodes.ts
@@ -1,4 +1,4 @@
-import { TargetsType } from '@jnxplus/common';
+import { NxMavenPluginOptions, TargetsType } from '@jnxplus/common';
 import { CreateNodes, ProjectConfiguration, readJsonFile } from '@nx/devkit';
 import { existsSync } from 'fs';
 import * as path from 'path';
@@ -9,10 +9,10 @@ import {
   getWorkspaceData,
 } from './graph-utils';
 
-export const createNodes: CreateNodes = [
+export const createNodes: CreateNodes<NxMavenPluginOptions> = [
   'nx.json',
-  () => {
-    const workspaceData: WorkspaceDataType = getWorkspaceData();
+  (_, opts) => {
+    const workspaceData: WorkspaceDataType = getWorkspaceData(opts);
     const mavenProjects: MavenProjectType[] = workspaceData.projects;
 
     const projects: Record<string, ProjectConfiguration> = {};

diff --git a/packages/nx-maven/src/graph/graph-utils.ts b/packages/nx-maven/src/graph/graph-utils.ts
@@ -1,3 +1,4 @@
+import { NxMavenPluginOptions } from '@jnxplus/common';
 import { readXml } from '@jnxplus/xml';
 import {
   NxJsonConfiguration,
@@ -13,7 +14,6 @@ import {
   getArtifactId,
   getGroupId,
   getLocalRepositoryPath,
-  getMavenRootDirectory,
   getVersion,
 } from '../utils';
 
@@ -49,16 +49,21 @@ const cache = flatCache.load(
 );
 const key = 'workspace-data';
 
-export function getWorkspaceData() {
-  const mavenRootDirectory = getMavenRootDirectory();
+export function getWorkspaceData(opts: NxMavenPluginOptions | undefined) {
+  const mavenRootDirectory = opts?.mavenRootDirectory
+    ? opts.mavenRootDirectory
+    : '';
   const mavenRootDirAbsolutePath = path.join(workspaceRoot, mavenRootDirectory);
 
   const projects: MavenProjectType[] = [];
   addProjects(mavenRootDirAbsolutePath, projects, '');
 
   //TODO calculate versions here
 
-  const localRepositoryPath = getLocalRepositoryPath(mavenRootDirAbsolutePath);
+  const localRepositoryPath = getLocalRepositoryPath(
+    opts,
+    mavenRootDirAbsolutePath,
+  );
 
   const data: WorkspaceDataType = {
     mavenRootDirAbsolutePath: mavenRootDirAbsolutePath,

diff --git a/packages/nx-maven/src/utils/index.ts b/packages/nx-maven/src/utils/index.ts
@@ -2,6 +2,7 @@ import {
   DependencyManagementType,
   FrameworkType,
   LanguageType,
+  NxMavenPluginOptions,
 } from '@jnxplus/common';
 import { readXmlTree, xmlToString } from '@jnxplus/xml';
 import {
@@ -386,11 +387,18 @@ function getLocalRepoRelativePath(): string {
   return '';
 }
 
-export function getLocalRepositoryPath(mavenRootDirAbsolutePath: string) {
+export function getLocalRepositoryPath(
+  opts: NxMavenPluginOptions | undefined,
+  mavenRootDirAbsolutePath: string,
+) {
   let localRepositoryPath;
-  const localRepoRelativePath = getLocalRepoRelativePath();
+  const localRepoRelativePath = opts?.localRepoRelativePath
+    ? opts.localRepoRelativePath
+    : '';
   if (localRepoRelativePath) {
-    const mavenRootDirectory = getMavenRootDirectory();
+    const mavenRootDirectory = opts?.mavenRootDirectory
+      ? opts.mavenRootDirectory
+      : '';
     localRepositoryPath = joinPathFragments(
       mavenRootDirectory,
       localRepoRelativePath,