chore(): beginning progress

nx-dotnet · AgentEnder · Apr 15, 2021 · Apr 15, 2021 · Apr 15, 2021 · Apr 15, 2021
commit 413cc0ecf3bb7c9c6bbbcfd51d19e1c49dc55439
diff --git a/jest.config.js b/jest.config.js
@@ -4,5 +4,9 @@ module.exports = {
     '<rootDir>/e2e\\core-e2e',
     '<rootDir>/packages/typescript',
     '<rootDir>/e2e\\typescript-e2e',
+    '<rootDir>/packages/dotnet',
+    '<rootDir>/packages/utils',
+    '<rootDir>/packages/utils',
+    '<rootDir>/packages/dotnet',
   ],
 };
diff --git a/nx.json b/nx.json
@@ -1,9 +1,14 @@
 {
   "npmScope": "nx-dotnet",
-  "affected": { "defaultBase": "master" },
+  "affected": {
+    "defaultBase": "master"
+  },
   "implicitDependencies": {
     "workspace.json": "*",
-    "package.json": { "dependencies": "*", "devDependencies": "*" },
+    "package.json": {
+      "dependencies": "*",
+      "devDependencies": "*"
+    },
     "tsconfig.base.json": "*",
     "tslint.json": "*",
     ".eslintrc.json": "*",
@@ -12,14 +17,35 @@
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/workspace/tasks-runners/default",
-      "options": { "cacheableOperations": ["build", "lint", "test", "e2e"] }
+      "options": {
+        "cacheableOperations": ["build", "lint", "test", "e2e"]
+      }
     }
   },
   "projects": {
-    "core": { "tags": [] },
-    "core-e2e": { "tags": [], "implicitDependencies": ["core"] },
-    "typescript": { "tags": [] },
-    "typescript-e2e": { "tags": [], "implicitDependencies": ["typescript"] }
+    "core": {
+      "tags": []
+    },
+    "core-e2e": {
+      "tags": [],
+      "implicitDependencies": ["core"]
+    },
+    "typescript": {
+      "tags": []
+    },
+    "typescript-e2e": {
+      "tags": [],
+      "implicitDependencies": ["typescript"]
+    },
+    "utils": {
+      "tags": []
+    },
+    "dotnet": {
+      "tags": []
+    }
   },
-  "workspaceLayout": { "appsDir": "e2e", "libsDir": "packages" }
+  "workspaceLayout": {
+    "appsDir": "e2e",
+    "libsDir": "packages"
+  }
 }
diff --git a/packages/core/src/executors/build/executor.spec.ts b/packages/core/src/executors/build/executor.spec.ts
@@ -1,7 +1,7 @@
 import { ExecutorContext } from '@nrwl/devkit';
 import { promises as fs } from 'fs';
-import { DotNetClient, mockDotnetFactory } from '../../core';
-import { rimraf } from '../../utils';
+import { DotNetClient, mockDotnetFactory } from '@nx-dotnet/dotnet';
+import { rimraf } from '@nx-dotnet/utils';
 
 import executor from './executor';
 import { BuildExecutorSchema } from './schema';

diff --git a/packages/core/src/executors/build/executor.ts b/packages/core/src/executors/build/executor.ts
@@ -1,34 +1,48 @@
 import { ExecutorContext } from '@nrwl/devkit';
 import { BuildExecutorSchema } from './schema';
-import { DotNetClient, dotnetFactory } from '../../core';
-import { glob } from '../../utils';
-import { dotnetBuildFlags } from '../../models';
-
+import { glob } from '@nx-dotnet/utils';
+import {
+  dotnetBuildFlags,
+  DotNetClient,
+  dotnetFactory,
+} from '@nx-dotnet/dotnet';
 
 export default async function runExecutor(
   options: BuildExecutorSchema,
   context: ExecutorContext,
   dotnetClient: DotNetClient = new DotNetClient(dotnetFactory())
 ) {
-  const nxProjectConfiguration = context.workspace.projects[context.projectName];
-  const projectFilePath = await glob(`${nxProjectConfiguration.root}/**/*.*proj`);
+  const nxProjectConfiguration =
+    context.workspace.projects[context.projectName];
+  const projectFilePath = await glob(
+    `${nxProjectConfiguration.root}/**/*.*proj`
+  );
+
+  console.log(
+    `Looking for project files at '${nxProjectConfiguration.root}/**/*.*proj'`
+  );
 
-  console.log(`Looking for project files at '${nxProjectConfiguration.root}/**/*.*proj'`)
-
   if (!projectFilePath || projectFilePath.length === 0) {
-    throw new Error('Unable to find a build-able project within project\'s source directory!');
+    throw new Error(
+      "Unable to find a build-able project within project's source directory!"
+    );
   }
 
   if (projectFilePath.length > 1) {
-    throw new Error(`More than one build-able projects are contained within the project's source directory! \r\n ${projectFilePath}`)
+    throw new Error(
+      `More than one build-able projects are contained within the project's source directory! \r\n ${projectFilePath}`
+    );
   }
 
-  dotnetClient.build(projectFilePath[0], Object.keys(options).map((x: dotnetBuildFlags) => ({
-    flag: x,
-    value: options[x]
-  })));
+  dotnetClient.build(
+    projectFilePath[0],
+    Object.keys(options).map((x: dotnetBuildFlags) => ({
+      flag: x,
+      value: options[x],
+    }))
+  );
 
   return {
-    success: true
+    success: true,
   };
 }
diff --git a/packages/core/src/executors/build/schema.d.ts b/packages/core/src/executors/build/schema.d.ts
@@ -1,4 +1,4 @@
-import { dotnetBuildFlags } from '../../models';
+import { dotnetBuildFlags } from '@nx-dotnet/dotnet';
 
 export type BuildExecutorSchema = {
   [key in dotnetBuildFlags]?: string

diff --git a/packages/core/src/generators/app/generator.spec.ts b/packages/core/src/generators/app/generator.spec.ts
@@ -3,7 +3,7 @@ import { Tree, readProjectConfiguration } from '@nrwl/devkit';
 
 import generator from './generator';
 import { NxDotnetGeneratorSchema } from './schema';
-import { rimraf } from '../../utils';
+import { rimraf } from '@nx-dotnet/utils';
 import { promises as fs } from 'fs';
 
 describe('nx-dotnet app generator', () => {

diff --git a/packages/core/src/generators/app/generator.ts b/packages/core/src/generators/app/generator.ts
@@ -6,9 +6,8 @@ import {
   Tree,
 } from '@nrwl/devkit';
 import { NxDotnetGeneratorSchema } from './schema';
-import { DotNetClient, dotnetFactory, LoadedCLI } from '../../core';
-import { dotnetNewOptions } from '../../models';
-import { isDryRun } from '../../utils';
+import { DotNetClient, dotnetFactory, LoadedCLI, dotnetNewOptions } from '@nx-dotnet/dotnet';
+import { isDryRun } from '@nx-dotnet/utils';
 
 interface NormalizedSchema extends NxDotnetGeneratorSchema {
   projectName: string;

diff --git a/packages/core/src/generators/lib/generator.spec.ts b/packages/core/src/generators/lib/generator.spec.ts
@@ -3,7 +3,7 @@ import { Tree, readProjectConfiguration } from '@nrwl/devkit';
 
 import generator from './generator';
 import { NxDotnetGeneratorSchema } from './schema';
-import { rimraf } from '../../utils';
+import { rimraf } from '@nx-dotnet/utils';
 
 describe('nx-dotnet library generator', () => {
   let appTree: Tree;

diff --git a/packages/core/src/generators/lib/generator.ts b/packages/core/src/generators/lib/generator.ts
@@ -6,9 +6,9 @@ import {
   Tree,
 } from '@nrwl/devkit';
 
-import { DotNetClient, dotnetFactory } from '../../core';
-import { dotnetNewOptions } from '../../models';
-import { isDryRun } from '../../utils';
+import { DotNetClient, dotnetFactory } from '@nx-dotnet/dotnet';
+import { dotnetNewOptions } from '@nx-dotnet/dotnet';
+import { isDryRun } from '@nx-dotnet/utils';
 import { NxDotnetGeneratorSchema } from './schema';
 
 interface NormalizedSchema extends NxDotnetGeneratorSchema {

diff --git a/packages/core/src/generators/project-reference/generator.spec.ts b/packages/core/src/generators/project-reference/generator.spec.ts
@@ -7,7 +7,7 @@ import {
 
 import generator from './generator';
 import { NxDotnetGeneratorSchema } from './schema';
-import { DotNetClient } from '../../core';
+import { DotNetClient } from '@nx-dotnet/dotnet';
 
 describe('nx-dotnet project reference', () => {
   let appTree: Tree;

diff --git a/packages/core/src/generators/project-reference/generator.ts b/packages/core/src/generators/project-reference/generator.ts
@@ -5,8 +5,8 @@ import {
   updateProjectConfiguration,
 } from '@nrwl/devkit';
 
-import { DotNetClient, dotnetFactory } from '../../core';
-import { getProjectFileForNxProject } from '../../utils/workspace';
+import { DotNetClient, dotnetFactory } from '@nx-dotnet/dotnet';
+import { getProjectFileForNxProject } from '@nx-dotnet/utils';
 import { NxDotnetGeneratorSchema } from './schema';
 
 export default async function (

diff --git a/packages/core/src/models/dotnet-build/index.ts b/packages/core/src/models/dotnet-build/index.ts
diff --git a/packages/core/src/utils/parameters.ts b/packages/core/src/utils/parameters.ts
diff --git a/packages/dotnet/.babelrc b/packages/dotnet/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+}
diff --git a/packages/dotnet/.eslintrc.json b/packages/dotnet/.eslintrc.json
@@ -0,0 +1,21 @@
+{
+  "extends": "../../.eslintrc.json",
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "parserOptions": {
+        "project": ["packages/dotnet2/tsconfig.*?.json"]
+      },
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/packages/dotnet/README.md b/packages/dotnet/README.md
@@ -0,0 +1,7 @@
+# dotnet2
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test dotnet2` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/packages/dotnet/jest.config.js b/packages/dotnet/jest.config.js
@@ -0,0 +1,14 @@
+module.exports = {
+  displayName: 'dotnet',
+  preset: '../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsConfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  transform: {
+    '^.+\\.[tj]sx?$': 'ts-jest',
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../coverage/packages/dotnet',
+};
diff --git a/packages/dotnet/package.json b/packages/dotnet/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@nx-dotnet/dotnet",
+  "version": "0.0.6-dev.23",
+  "private": false,
+  "peerDependencies": {
+    "glob": "^7.1.6",
+    "rimraf": "^3.0.2"
+  }
+}
diff --git a/packages/dotnet/src/index.ts b/packages/dotnet/src/index.ts
@@ -0,0 +1 @@
+export * from './lib';
diff --git a/packages/core/src/core/dotnet.client.ts → ...ages/dotnet/src/lib/core/dotnet.client.ts b/packages/core/src/core/dotnet.client.ts → ...ages/dotnet/src/lib/core/dotnet.client.ts
@@ -1,10 +1,6 @@
 import { execSync } from 'child_process';
-import {
-  dotnetTemplate,
-  dotnetNewOptions,
-} from '../models';
-import { dotnetBuildOptions } from '../models/dotnet-build/dotnet-build-options';
-import { getParameterString } from '../utils/parameters';
+import { dotnetBuildOptions, dotnetTemplate, dotnetNewOptions } from '../models';
+import { getParameterString } from '@nx-dotnet/utils';
 import { LoadedCLI } from './dotnet.factory';
 
 export class DotNetClient {
@@ -19,7 +15,7 @@ export class DotNetClient {
   build(project, parameters?: dotnetBuildOptions): Buffer {
     const paramString = getParameterString(parameters);
     const cmd = `${this.cliCommand.command} build ${project} ${paramString}`;
-    return this.logAndExecute(cmd)
+    return this.logAndExecute(cmd);
   }
 
   addProjectReference(hostCsProj: string, targetCsProj: string): Buffer {
@@ -30,6 +26,6 @@ export class DotNetClient {
 
   private logAndExecute(cmd): Buffer {
     console.log(`Executing Command: ${cmd}`);
-    return execSync(cmd, {stdio: 'inherit'});
+    return execSync(cmd, { stdio: 'inherit' });
   }
-}
+}
diff --git a/packages/core/src/core/dotnet.factory.ts → ...ges/dotnet/src/lib/core/dotnet.factory.ts b/packages/core/src/core/dotnet.factory.ts → ...ges/dotnet/src/lib/core/dotnet.factory.ts
diff --git a/packages/core/src/core/index.ts → packages/dotnet/src/lib/core/index.ts b/packages/core/src/core/index.ts → packages/dotnet/src/lib/core/index.ts
diff --git a/packages/dotnet/src/lib/index.ts b/packages/dotnet/src/lib/index.ts
@@ -0,0 +1,2 @@
+export * from './core';
+export * from './models';
diff --git a/...models/dotnet-build/dotnet-build-flags.ts → ...models/dotnet-build/dotnet-build-flags.ts b/...models/dotnet-build/dotnet-build-flags.ts → ...models/dotnet-build/dotnet-build-flags.ts
diff --git a/...dels/dotnet-build/dotnet-build-options.ts → ...dels/dotnet-build/dotnet-build-options.ts b/...dels/dotnet-build/dotnet-build-options.ts → ...dels/dotnet-build/dotnet-build-options.ts
diff --git a/packages/dotnet/src/lib/models/dotnet-build/index.ts b/packages/dotnet/src/lib/models/dotnet-build/index.ts
@@ -0,0 +1,2 @@
+export * from './dotnet-build-flags';
+export * from './dotnet-build-options';
diff --git a/...src/models/dotnet-new/dotnet-new-flags.ts → ...lib/models/dotnet-new/dotnet-new-flags.ts b/...src/models/dotnet-new/dotnet-new-flags.ts → ...lib/models/dotnet-new/dotnet-new-flags.ts
diff --git a/...c/models/dotnet-new/dotnet-new-options.ts → ...b/models/dotnet-new/dotnet-new-options.ts b/...c/models/dotnet-new/dotnet-new-options.ts → ...b/models/dotnet-new/dotnet-new-options.ts
diff --git a/.../src/models/dotnet-new/dotnet-template.ts → .../lib/models/dotnet-new/dotnet-template.ts b/.../src/models/dotnet-new/dotnet-template.ts → .../lib/models/dotnet-new/dotnet-template.ts
diff --git a/packages/core/src/models/dotnet-new/index.ts → ...dotnet/src/lib/models/dotnet-new/index.ts b/packages/core/src/models/dotnet-new/index.ts → ...dotnet/src/lib/models/dotnet-new/index.ts
diff --git a/packages/core/src/models/index.ts → packages/dotnet/src/lib/models/index.ts b/packages/core/src/models/index.ts → packages/dotnet/src/lib/models/index.ts
@@ -1,3 +1,2 @@
-export * from './cmd-line-parameter';
 export * from './dotnet-new';
 export * from './dotnet-build';
diff --git a/packages/dotnet/tsconfig.json b/packages/dotnet/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/packages/dotnet/tsconfig.lib.json b/packages/dotnet/tsconfig.lib.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["**/*.spec.ts"]
+}
diff --git a/packages/dotnet/tsconfig.spec.json b/packages/dotnet/tsconfig.spec.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/*.spec.js",
+    "**/*.spec.jsx",
+    "**/*.d.ts"
+  ]
+}
diff --git a/packages/utils/.babelrc b/packages/utils/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './core';
		export * from './models';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './dotnet-build-flags';
		export * from './dotnet-build-options';