@frontmcp/nx 1.8.7 → 1.9.0

package/generators/app/files/project.json__tmpl__

@@ -31,6 +31,15 @@
       "cache": true,
       "options": {}
     },
+    "typecheck": {
+      "executor": "nx:run-commands",
+      "cache": true,
+      "options": {
+        "commands": ["tsc --noEmit -p tsconfig.lib.json", "tsc --noEmit -p tsconfig.spec.json"],
+        "parallel": false,
+        "cwd": "{projectRoot}"
+      }
+    },
     "inspector": {
       "executor": "@frontmcp/nx:inspector",
       "options": {}

package/generators/app/files/src/tools/hello.tool.spec.ts__tmpl__

@@ -0,0 +1,10 @@
+import HelloTool from './hello.tool';
+
+describe('HelloTool', () => {
+  it('greets the caller by name', async () => {
+    // execute() holds the tool's logic; build the tool without the request context the server injects.
+    const tool: HelloTool = Object.create(HelloTool.prototype);
+
+    await expect(tool.execute({ name: 'Ada' })).resolves.toEqual({ message: 'Hello, Ada!' });
+  });
+});

package/generators/app/files/tsconfig.json__tmpl__

@@ -2,13 +2,18 @@
   "extends": "<%= offset %>tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
-    "moduleResolution": "node10",<% if (ignoreDeprecations) { %>
-    "ignoreDeprecations": "<%= ignoreDeprecations %>",<% } %>
+    "moduleResolution": "<%= moduleResolution %>",<% if (resetCustomConditions) { %>
+    "customConditions": null,<% } %>
+    "rootDir": "<%= offset %>",
+    "composite": false,
+    "declarationMap": false,
+    "emitDeclarationOnly": false,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],
+  "nx": { "addTypecheckTarget": false }
 }

package/generators/app/lib/normalize-options.d.ts

@@ -1,5 +1,6 @@
 import { type Tree } from '@nx/devkit';
 import type { AppGeneratorSchema } from '../schema.js';
+import { type ProjectModuleResolution } from '../../../utils/project-paths.js';
 export interface NormalizedAppOptions {
     name: string;
     projectName: string;
@@ -9,7 +10,8 @@ export interface NormalizedAppOptions {
     outputRoot: string;
     /** Path from the project back to the workspace root, e.g. `../../`. */
     offset: string;
-    ignoreDeprecations: string;
+    moduleResolution: ProjectModuleResolution;
+    resetCustomConditions: boolean;
     className: string;
     fileName: string;
     propertyName: string;

package/generators/app/lib/normalize-options.js

@@ -14,7 +14,7 @@ function normalizeOptions(tree, schema) {
         projectRoot,
         outputRoot,
         offset,
-        ignoreDeprecations: (0, project_paths_js_1.getIgnoreDeprecations)(tree, schema.workspaceRoot),
+        ...(0, project_paths_js_1.getProjectTsOptions)(tree, schema.workspaceRoot),
         className,
         fileName,
         propertyName,

package/generators/app/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/app/lib/normalize-options.ts"],"names":[],"mappings":";;AAqBA,4CAmBC;AAxCD,uCAAiE;AAEjE,sEAA6F;AAmB7F,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA0B;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACtF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAE9F,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,QAAQ;QACrB,WAAW;QACX,UAAU;QACV,MAAM;QACN,kBAAkB,EAAE,IAAA,wCAAqB,EAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC;QACrE,SAAS;QACT,QAAQ;QACR,YAAY;QACZ,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, names, joinPathFragments } from '@nx/devkit';\nimport type { AppGeneratorSchema } from '../schema.js';\nimport { getIgnoreDeprecations, resolveProjectPaths } from '../../../utils/project-paths.js';\n\nexport interface NormalizedAppOptions {\n  name: string;\n  projectName: string;\n  /** Project root relative to the Nx workspace root. */\n  projectRoot: string;\n  /** Where the files are written, relative to the tree root. */\n  outputRoot: string;\n  /** Path from the project back to the workspace root, e.g. `../../`. */\n  offset: string;\n  ignoreDeprecations: string;\n  className: string;\n  fileName: string;\n  propertyName: string;\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: AppGeneratorSchema): NormalizedAppOptions {\n  const { className, fileName, propertyName } = names(schema.name);\n  const outputRoot = schema.directory ?? joinPathFragments(schema.workspaceRoot ?? '', 'apps', fileName);\n  const { projectRoot, offset } = resolveProjectPaths(outputRoot, schema.workspaceRoot);\n  const parsedTags = schema.tags ? schema.tags.split(',').map((t) => t.trim()) : ['scope:apps'];\n\n  return {\n    name: schema.name,\n    projectName: fileName,\n    projectRoot,\n    outputRoot,\n    offset,\n    ignoreDeprecations: getIgnoreDeprecations(tree, schema.workspaceRoot),\n    className,\n    fileName,\n    propertyName,\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/app/lib/normalize-options.ts"],"names":[],"mappings":";;AAsBA,4CAmBC;AAzCD,uCAAiE;AAEjE,sEAAyH;AAoBzH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA0B;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvG,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACtF,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAE9F,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,QAAQ;QACrB,WAAW;QACX,UAAU;QACV,MAAM;QACN,GAAG,IAAA,sCAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,aAAa,CAAC;QAClD,SAAS;QACT,QAAQ;QACR,YAAY;QACZ,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, names, joinPathFragments } from '@nx/devkit';\nimport type { AppGeneratorSchema } from '../schema.js';\nimport { getProjectTsOptions, resolveProjectPaths, type ProjectModuleResolution } from '../../../utils/project-paths.js';\n\nexport interface NormalizedAppOptions {\n  name: string;\n  projectName: string;\n  /** Project root relative to the Nx workspace root. */\n  projectRoot: string;\n  /** Where the files are written, relative to the tree root. */\n  outputRoot: string;\n  /** Path from the project back to the workspace root, e.g. `../../`. */\n  offset: string;\n  moduleResolution: ProjectModuleResolution;\n  resetCustomConditions: boolean;\n  className: string;\n  fileName: string;\n  propertyName: string;\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: AppGeneratorSchema): NormalizedAppOptions {\n  const { className, fileName, propertyName } = names(schema.name);\n  const outputRoot = schema.directory ?? joinPathFragments(schema.workspaceRoot ?? '', 'apps', fileName);\n  const { projectRoot, offset } = resolveProjectPaths(outputRoot, schema.workspaceRoot);\n  const parsedTags = schema.tags ? schema.tags.split(',').map((t) => t.trim()) : ['scope:apps'];\n\n  return {\n    name: schema.name,\n    projectName: fileName,\n    projectRoot,\n    outputRoot,\n    offset,\n    ...getProjectTsOptions(tree, schema.workspaceRoot),\n    className,\n    fileName,\n    propertyName,\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}

package/generators/lib/files/adapter/src/__fileName__.adapter.spec.ts__tmpl__

@@ -0,0 +1,9 @@
+import { <%= className %>Adapter } from './<%= fileName %>.adapter';
+
+describe('<%= className %>Adapter', () => {
+  it('returns no tools, resources or prompts yet', async () => {
+    const adapter = new <%= className %>Adapter({ name: '<%= fileName %>' });
+
+    await expect(adapter.fetch()).resolves.toEqual({ tools: [], resources: [], prompts: [] });
+  });
+});

package/generators/lib/files/generic/src/__fileName__.spec.ts__tmpl__

@@ -0,0 +1,7 @@
+import { <%= className %> } from './<%= fileName %>';
+
+describe('<%= className %>', () => {
+  it('greets by name', () => {
+    expect(new <%= className %>().greet('Ada')).toBe('Hello from <%= className %>, Ada!');
+  });
+});

package/generators/lib/files/plugin/src/__fileName__.plugin.spec.ts__tmpl__

@@ -0,0 +1,11 @@
+import { <%= className %>Plugin } from './<%= fileName %>.plugin';
+
+describe('<%= className %>Plugin', () => {
+  it('keeps the options it is created with', () => {
+    expect(new <%= className %>Plugin({}).options).toEqual({});
+  });
+
+  it('contributes no providers yet', () => {
+    expect(<%= className %>Plugin.dynamicProviders({})).toEqual([]);
+  });
+});

package/generators/lib/files/tool-register/src/__fileName__.tools.spec.ts__tmpl__

@@ -0,0 +1,14 @@
+import { ExampleTool, <%= className %>Tools } from './<%= fileName %>.tools';
+
+describe('<%= className %>Tools', () => {
+  it('registers the example tool', () => {
+    expect(<%= className %>Tools).toContain(ExampleTool);
+  });
+
+  it('echoes the value', async () => {
+    // execute() holds the tool's logic; build the tool without the request context the server injects.
+    const tool: ExampleTool = Object.create(ExampleTool.prototype);
+
+    await expect(tool.execute({ value: 'ping' })).resolves.toEqual({ result: 'ping' });
+  });
+});

package/generators/lib/lib/normalize-options.d.ts

@@ -1,11 +1,13 @@
 import { type Tree } from '@nx/devkit';
 import type { LibGeneratorSchema } from '../schema.js';
+import { type ProjectModuleResolution } from '../../../utils/project-paths.js';
 export interface NormalizedLibOptions {
     name: string;
     projectName: string;
     projectRoot: string;
     offset: string;
-    ignoreDeprecations: string;
+    moduleResolution: ProjectModuleResolution;
+    resetCustomConditions: boolean;
     className: string;
     fileName: string;
     propertyName: string;

package/generators/lib/lib/normalize-options.js

@@ -20,7 +20,7 @@ function normalizeOptions(tree, schema) {
         projectName: fileName,
         projectRoot,
         offset,
-        ignoreDeprecations: (0, project_paths_js_1.getIgnoreDeprecations)(tree),
+        ...(0, project_paths_js_1.getProjectTsOptions)(tree),
         className,
         fileName,
         propertyName,

package/generators/lib/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/lib/lib/normalize-options.ts"],"names":[],"mappings":";;AAoBA,4CA6BC;AAjDD,uCAAiE;AAEjE,sEAA6F;AAkB7F,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA0B;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC7G,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,SAAS,CAAC;IAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC;IAChD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,aAAa,QAAQ,EAAE,CAAC;IAChE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI;QAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAEnB,IAAI,WAAW,EAAE,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,QAAQ;QACrB,WAAW;QACX,MAAM;QACN,kBAAkB,EAAE,IAAA,wCAAqB,EAAC,IAAI,CAAC;QAC/C,SAAS;QACT,QAAQ;QACR,YAAY;QACZ,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, names, joinPathFragments } from '@nx/devkit';\nimport type { LibGeneratorSchema } from '../schema.js';\nimport { getIgnoreDeprecations, resolveProjectPaths } from '../../../utils/project-paths.js';\n\nexport interface NormalizedLibOptions {\n  name: string;\n  projectName: string;\n  projectRoot: string;\n  offset: string;\n  ignoreDeprecations: string;\n  className: string;\n  fileName: string;\n  propertyName: string;\n  libType: 'generic' | 'plugin' | 'adapter' | 'tool-register';\n  publishable: boolean;\n  importPath: string;\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: LibGeneratorSchema): NormalizedLibOptions {\n  const { className, fileName, propertyName } = names(schema.name);\n  const { projectRoot, offset } = resolveProjectPaths(schema.directory ?? joinPathFragments('libs', fileName));\n  const libType = schema.libType ?? 'generic';\n  const publishable = schema.publishable ?? false;\n  const importPath = schema.importPath ?? `@frontmcp/${fileName}`;\n  const parsedTags = schema.tags\n    ? schema.tags.split(',').map((t) => t.trim())\n    : ['scope:libs'];\n\n  if (publishable) {\n    parsedTags.push('scope:publishable');\n  }\n\n  return {\n    name: schema.name,\n    projectName: fileName,\n    projectRoot,\n    offset,\n    ignoreDeprecations: getIgnoreDeprecations(tree),\n    className,\n    fileName,\n    propertyName,\n    libType,\n    publishable,\n    importPath,\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/lib/lib/normalize-options.ts"],"names":[],"mappings":";;AAqBA,4CA6BC;AAlDD,uCAAiE;AAEjE,sEAAyH;AAmBzH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA0B;IACrE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC7G,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,SAAS,CAAC;IAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC;IAChD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,aAAa,QAAQ,EAAE,CAAC;IAChE,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI;QAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAEnB,IAAI,WAAW,EAAE,CAAC;QAChB,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,QAAQ;QACrB,WAAW;QACX,MAAM;QACN,GAAG,IAAA,sCAAmB,EAAC,IAAI,CAAC;QAC5B,SAAS;QACT,QAAQ;QACR,YAAY;QACZ,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, names, joinPathFragments } from '@nx/devkit';\nimport type { LibGeneratorSchema } from '../schema.js';\nimport { getProjectTsOptions, resolveProjectPaths, type ProjectModuleResolution } from '../../../utils/project-paths.js';\n\nexport interface NormalizedLibOptions {\n  name: string;\n  projectName: string;\n  projectRoot: string;\n  offset: string;\n  moduleResolution: ProjectModuleResolution;\n  resetCustomConditions: boolean;\n  className: string;\n  fileName: string;\n  propertyName: string;\n  libType: 'generic' | 'plugin' | 'adapter' | 'tool-register';\n  publishable: boolean;\n  importPath: string;\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: LibGeneratorSchema): NormalizedLibOptions {\n  const { className, fileName, propertyName } = names(schema.name);\n  const { projectRoot, offset } = resolveProjectPaths(schema.directory ?? joinPathFragments('libs', fileName));\n  const libType = schema.libType ?? 'generic';\n  const publishable = schema.publishable ?? false;\n  const importPath = schema.importPath ?? `@frontmcp/${fileName}`;\n  const parsedTags = schema.tags\n    ? schema.tags.split(',').map((t) => t.trim())\n    : ['scope:libs'];\n\n  if (publishable) {\n    parsedTags.push('scope:publishable');\n  }\n\n  return {\n    name: schema.name,\n    projectName: fileName,\n    projectRoot,\n    offset,\n    ...getProjectTsOptions(tree),\n    className,\n    fileName,\n    propertyName,\n    libType,\n    publishable,\n    importPath,\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}

package/generators/lib/lib-project-files/project.json__tmpl__

@@ -4,12 +4,28 @@
   "sourceRoot": "<%= projectRoot %>/src",
   "projectType": "library",
   "tags": [<%- parsedTags.map(t => `"${t}"`).join(', ') %>],
-  "targets": {
+  "targets": {<% if (publishable) { %>
+    "build": {
+      "executor": "nx:run-commands",
+      "cache": true,
+      "outputs": ["{projectRoot}/dist"],
+      "options": {
+        "command": "tsc -p tsconfig.lib.json",
+        "cwd": "{projectRoot}"
+      }
+    },<% } %>
     "test": {
-      "executor": "@nx/jest:jest",
-      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "executor": "@frontmcp/nx:test",
+      "cache": true,
+      "options": {}
+    },
+    "typecheck": {
+      "executor": "nx:run-commands",
+      "cache": true,
       "options": {
-        "jestConfig": "<%= projectRoot %>/jest.config.cjs"
+        "commands": ["tsc --noEmit -p tsconfig.lib.json", "tsc --noEmit -p tsconfig.spec.json"],
+        "parallel": false,
+        "cwd": "{projectRoot}"
       }
     }
   }

package/generators/lib/lib-project-files/tsconfig.json__tmpl__

@@ -1,6 +1,12 @@
 {
   "extends": "<%= offset %>tsconfig.base.json",
   "compilerOptions": {
+    "module": "commonjs",
+    "moduleResolution": "<%= moduleResolution %>",<% if (resetCustomConditions) { %>
+    "customConditions": null,<% } %>
+    "composite": false,
+    "declarationMap": false,
+    "emitDeclarationOnly": false,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "emitDecoratorMetadata": true,
@@ -11,5 +17,6 @@
   "references": [
     { "path": "./tsconfig.lib.json" },
     { "path": "./tsconfig.spec.json" }
-  ]
+  ],
+  "nx": { "addTypecheckTarget": false }
 }

package/generators/lib/lib-project-files/tsconfig.spec.json__tmpl__

@@ -2,9 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "<%= offset %>dist/out-tsc",
-    "module": "commonjs",
-    "moduleResolution": "node10",<% if (ignoreDeprecations) { %>
-    "ignoreDeprecations": "<%= ignoreDeprecations %>",<% } %>
     "types": ["jest", "node"]
   },
   "include": ["src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]

package/generators/lib/lib.d.ts

@@ -1,4 +1,4 @@
-import { type Tree, type GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { LibGeneratorSchema } from './schema.js';
 export declare function libGenerator(tree: Tree, schema: LibGeneratorSchema): Promise<GeneratorCallback | void>;
 export default libGenerator;

package/generators/lib/lib.js

@@ -1,34 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libGenerator = libGenerator;
-const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const devkit_1 = require("@nx/devkit");
+const project_paths_js_1 = require("../../utils/project-paths.js");
+const versions_js_1 = require("../../utils/versions.js");
 const index_js_1 = require("./lib/index.js");
+/**
+ * Plugin and adapter libraries start from the class the `plugin` / `adapter` generators write,
+ * so there is one template per class instead of two that drift apart.
+ */
+const CLASS_GENERATOR = {
+    plugin: 'plugin',
+    adapter: 'adapter',
+};
+/**
+ * A publishable library is published from its own folder after its `build` target compiles
+ * `tsconfig.lib.json` into `dist/`, so the manifest points there and lists what the emitted JavaScript
+ * requires: tslib (the base config sets `importHelpers`) and, for the FrontMCP library types, the SDK.
+ * Both use the workspace's range when it declares one.
+ */
+function writePublishablePackageJson(tree, options) {
+    const workspace = tree.exists('package.json') ? (0, devkit_1.readJson)(tree, 'package.json') : {};
+    const workspaceRange = (name) => workspace.dependencies?.[name] ?? workspace.devDependencies?.[name];
+    (0, devkit_1.writeJson)(tree, `${options.projectRoot}/package.json`, {
+        name: options.importPath,
+        version: '0.0.1',
+        type: 'commonjs',
+        main: './dist/index.js',
+        types: './dist/index.d.ts',
+        files: ['dist'],
+        dependencies: {
+            ...(options.libType !== 'generic' && {
+                '@frontmcp/sdk': workspaceRange('@frontmcp/sdk') ?? `~${(0, versions_js_1.getFrontmcpVersion)()}`,
+            }),
+            tslib: workspaceRange('tslib') ?? '^2.3.0',
+        },
+    });
+}
 async function libGenerator(tree, schema) {
     return libGeneratorInternal(tree, schema);
 }
 async function libGeneratorInternal(tree, schema) {
     const options = (0, index_js_1.normalizeOptions)(tree, schema);
+    const substitutions = { ...options, tmpl: '' };
     // Generate project config files (project.json, tsconfig, jest)
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'lib-project-files'), options.projectRoot, {
-        ...options,
-        tmpl: '',
-    });
-    // Generate type-specific source files
-    const templateDir = (0, path_1.join)(__dirname, 'files', options.libType);
-    (0, devkit_1.generateFiles)(tree, templateDir, options.projectRoot, {
-        ...options,
-        tmpl: '',
-    });
-    // Add path mapping to tsconfig.base.json if it exists
-    if (tree.exists('tsconfig.base.json')) {
-        (0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (json) => {
-            json.compilerOptions = json.compilerOptions ?? {};
-            json.compilerOptions.paths = json.compilerOptions.paths ?? {};
-            json.compilerOptions.paths[options.importPath] = [`${options.projectRoot}/src/index.ts`];
-            return json;
-        });
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'lib-project-files'), options.projectRoot, substitutions);
+    // Generate type-specific source files (barrel and starter spec)
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', options.libType), options.projectRoot, substitutions);
+    const classGenerator = CLASS_GENERATOR[options.libType];
+    if (classGenerator) {
+        const srcDir = (0, path_1.join)(options.projectRoot, 'src');
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '..', classGenerator, 'files'), srcDir, substitutions);
+        // The plugin generator's opt-in context extension is not part of a new library.
+        const contextExtension = (0, path_1.join)(srcDir, `${options.fileName}.context-extension.ts`);
+        if (tree.exists(contextExtension))
+            tree.delete(contextExtension);
+    }
+    if (options.publishable) {
+        writePublishablePackageJson(tree, options);
     }
+    (0, project_paths_js_1.addTsPathAlias)(tree, options.importPath, `${options.projectRoot}/src/index.ts`);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/generators/lib/lib.js.map

@@ -1 +1 @@
-{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/generators/lib/lib.ts"],"names":[],"mappings":";;AAWA,oCAEC;AAbD,uCAMoB;AACpB,+BAA4B;AAE5B,6CAAkD;AAE3C,KAAK,UAAU,YAAY,CAAC,IAAU,EAAE,MAA0B;IACvE,OAAO,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,IAAU,EACV,MAA0B;IAE1B,MAAM,OAAO,GAAG,IAAA,2BAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,+DAA+D;IAC/D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,OAAO,CAAC,WAAW,EAAE;QAC7E,GAAG,OAAO;QACV,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,sCAAsC;IACtC,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE;QACpD,GAAG,OAAO;QACV,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,sDAAsD;IACtD,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACtC,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC;YAC9D,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;YACzF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,kBAAe,YAAY,CAAC","sourcesContent":["import {\n  type Tree,\n  formatFiles,\n  generateFiles,\n  updateJson,\n  type GeneratorCallback,\n} from '@nx/devkit';\nimport { join } from 'path';\nimport type { LibGeneratorSchema } from './schema.js';\nimport { normalizeOptions } from './lib/index.js';\n\nexport async function libGenerator(tree: Tree, schema: LibGeneratorSchema): Promise<GeneratorCallback | void> {\n  return libGeneratorInternal(tree, schema);\n}\n\nasync function libGeneratorInternal(\n  tree: Tree,\n  schema: LibGeneratorSchema,\n): Promise<GeneratorCallback | void> {\n  const options = normalizeOptions(tree, schema);\n\n  // Generate project config files (project.json, tsconfig, jest)\n  generateFiles(tree, join(__dirname, 'lib-project-files'), options.projectRoot, {\n    ...options,\n    tmpl: '',\n  });\n\n  // Generate type-specific source files\n  const templateDir = join(__dirname, 'files', options.libType);\n  generateFiles(tree, templateDir, options.projectRoot, {\n    ...options,\n    tmpl: '',\n  });\n\n  // Add path mapping to tsconfig.base.json if it exists\n  if (tree.exists('tsconfig.base.json')) {\n    updateJson(tree, 'tsconfig.base.json', (json) => {\n      json.compilerOptions = json.compilerOptions ?? {};\n      json.compilerOptions.paths = json.compilerOptions.paths ?? {};\n      json.compilerOptions.paths[options.importPath] = [`${options.projectRoot}/src/index.ts`];\n      return json;\n    });\n  }\n\n  if (!options.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default libGenerator;\n"]}
+{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/generators/lib/lib.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'path';\n\nimport { formatFiles, generateFiles, readJson, writeJson, type GeneratorCallback, type Tree } from '@nx/devkit';\n\nimport { addTsPathAlias } from '../../utils/project-paths.js';\nimport { getFrontmcpVersion } from '../../utils/versions.js';\nimport { normalizeOptions, type NormalizedLibOptions } from './lib/index.js';\nimport type { LibGeneratorSchema } from './schema.js';\n\n/**\n * Plugin and adapter libraries start from the class the `plugin` / `adapter` generators write,\n * so there is one template per class instead of two that drift apart.\n */\nconst CLASS_GENERATOR: Partial<Record<NormalizedLibOptions['libType'], string>> = {\n  plugin: 'plugin',\n  adapter: 'adapter',\n};\n\ninterface WorkspacePackageJson {\n  dependencies?: Record<string, string>;\n  devDependencies?: Record<string, string>;\n}\n\n/**\n * A publishable library is published from its own folder after its `build` target compiles\n * `tsconfig.lib.json` into `dist/`, so the manifest points there and lists what the emitted JavaScript\n * requires: tslib (the base config sets `importHelpers`) and, for the FrontMCP library types, the SDK.\n * Both use the workspace's range when it declares one.\n */\nfunction writePublishablePackageJson(tree: Tree, options: NormalizedLibOptions): void {\n  const workspace = tree.exists('package.json') ? readJson<WorkspacePackageJson>(tree, 'package.json') : {};\n  const workspaceRange = (name: string): string | undefined =>\n    workspace.dependencies?.[name] ?? workspace.devDependencies?.[name];\n\n  writeJson(tree, `${options.projectRoot}/package.json`, {\n    name: options.importPath,\n    version: '0.0.1',\n    type: 'commonjs',\n    main: './dist/index.js',\n    types: './dist/index.d.ts',\n    files: ['dist'],\n    dependencies: {\n      ...(options.libType !== 'generic' && {\n        '@frontmcp/sdk': workspaceRange('@frontmcp/sdk') ?? `~${getFrontmcpVersion()}`,\n      }),\n      tslib: workspaceRange('tslib') ?? '^2.3.0',\n    },\n  });\n}\n\nexport async function libGenerator(tree: Tree, schema: LibGeneratorSchema): Promise<GeneratorCallback | void> {\n  return libGeneratorInternal(tree, schema);\n}\n\nasync function libGeneratorInternal(tree: Tree, schema: LibGeneratorSchema): Promise<GeneratorCallback | void> {\n  const options = normalizeOptions(tree, schema);\n  const substitutions = { ...options, tmpl: '' };\n\n  // Generate project config files (project.json, tsconfig, jest)\n  generateFiles(tree, join(__dirname, 'lib-project-files'), options.projectRoot, substitutions);\n\n  // Generate type-specific source files (barrel and starter spec)\n  generateFiles(tree, join(__dirname, 'files', options.libType), options.projectRoot, substitutions);\n\n  const classGenerator = CLASS_GENERATOR[options.libType];\n  if (classGenerator) {\n    const srcDir = join(options.projectRoot, 'src');\n    generateFiles(tree, join(__dirname, '..', classGenerator, 'files'), srcDir, substitutions);\n    // The plugin generator's opt-in context extension is not part of a new library.\n    const contextExtension = join(srcDir, `${options.fileName}.context-extension.ts`);\n    if (tree.exists(contextExtension)) tree.delete(contextExtension);\n  }\n\n  if (options.publishable) {\n    writePublishablePackageJson(tree, options);\n  }\n\n  addTsPathAlias(tree, options.importPath, `${options.projectRoot}/src/index.ts`);\n\n  if (!options.skipFormat) {\n    await formatFiles(tree);\n  }\n}\n\nexport default libGenerator;\n"]}

package/generators/server/files/common/project.json__tmpl__

@@ -8,13 +8,27 @@
     "build": {
       "executor": "@frontmcp/nx:build",
       "cache": true,
-      "outputs": ["{projectRoot}/dist"],
+      "outputs": [<%- buildOutputs.map(o => `"${o}"`).join(', ') %>],
       "options": {
         "entry": "{projectRoot}/src/main.ts",
         "outputPath": "{projectRoot}/dist",
         "target": "<%= deploymentTarget %>"
       }
     },
+    "dev": {
+      "executor": "@frontmcp/nx:dev",
+      "options": {
+        "entry": "{projectRoot}/src/main.ts"
+      }
+    },
+    "typecheck": {
+      "executor": "nx:run-commands",
+      "cache": true,
+      "options": {
+        "command": "tsc --noEmit -p tsconfig.lib.json",
+        "cwd": "{projectRoot}"
+      }
+    },
     "deploy": {
       "executor": "@frontmcp/nx:deploy",
       "dependsOn": ["build"],

package/generators/server/files/common/tsconfig.json__tmpl__

@@ -2,11 +2,16 @@
   "extends": "<%= offset %>tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
-    "moduleResolution": "node10",<% if (ignoreDeprecations) { %>
-    "ignoreDeprecations": "<%= ignoreDeprecations %>",<% } %>
+    "moduleResolution": "<%= moduleResolution %>",<% if (resetCustomConditions) { %>
+    "customConditions": null,<% } %>
+    "rootDir": "<%= offset %>",
+    "composite": false,
+    "declarationMap": false,
+    "emitDeclarationOnly": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"]
+  "exclude": ["src/**/*.spec.ts", "src/**/*.test.ts"],
+  "nx": { "addTypecheckTarget": false }
 }

package/generators/server/files/lambda/template.yaml__tmpl__

@@ -12,8 +12,10 @@ Resources:
   McpFunction:
     Type: AWS::Serverless::Function
     Properties:
-      CodeUri: dist/
-      Handler: main.handler
+      # `nx build <%= projectName %>` (target lambda) writes dist/lambda/handler.cjs, which exports `handler`.
+      # The bundle requires @codegenie/serverless-express at runtime without bundling it: add a Lambda layer that provides it.
+      CodeUri: dist/lambda/
+      Handler: handler.handler
       Events:
         Api:
           Type: HttpApi

package/generators/server/files/node/Dockerfile.dockerignore__tmpl__

@@ -0,0 +1,10 @@
+# Docker reads this file for the Dockerfile next to it: the build context is the workspace root.
+**/node_modules
+**/dist
+**/.vercel
+.nx
+tmp
+coverage
+.git
+**/.env
+**/.env.*

package/generators/server/files/node/Dockerfile__tmpl__

@@ -1,3 +1,4 @@
+# Build from the workspace root: docker build -f <%= projectRoot %>/Dockerfile .
 FROM node:24-slim AS builder
 WORKDIR /app
 COPY package*.json ./
@@ -8,10 +9,14 @@ RUN npx nx build <%= projectName %>
 FROM node:24-slim AS runner
 WORKDIR /app
 ENV NODE_ENV=production
+# A production server needs MCP_SESSION_SECRET at runtime: docker run -e MCP_SESSION_SECRET=$(openssl rand -hex 32) ...
+# The server binds 127.0.0.1 by default, which a published port cannot reach.
+ENV FRONTMCP_BIND_ADDRESS=all
 RUN addgroup --system appgroup && adduser --system --ingroup appgroup appuser
 COPY --from=builder /app/<%= projectRoot %>/dist ./dist
 COPY --from=builder /app/package.json /app/package-lock.json* ./
 RUN npm ci --omit=dev --ignore-scripts
 USER appuser
 EXPOSE 3000
-CMD ["node", "dist/main.js"]
+# `nx build <%= projectName %>` (target node) writes dist/node/<%= projectName %>.bundle.js
+CMD ["node", "dist/node/<%= projectName %>.bundle.js"]

package/generators/server/files/node/docker-compose.yml__tmpl__

@@ -1,7 +1,7 @@
 services:
   app:
     build:
-      context: ../..
+      context: <%= offset %>
       dockerfile: <%= projectRoot %>/Dockerfile
     ports:
       - '${PORT:-3000}:3000'

package/generators/server/files/vercel/vercel.json__tmpl__

@@ -1,15 +1,6 @@
 {
+  "$schema": "https://openapi.vercel.sh/vercel.json",
   "version": 2,
-  "builds": [
-    {
-      "src": "<%= projectRoot %>/dist/main.js",
-      "use": "@vercel/node"
-    }
-  ],
-  "routes": [
-    {
-      "src": "/(.*)",
-      "dest": "<%= projectRoot %>/dist/main.js"
-    }
-  ]
+  "installCommand": "cd <%= offset %> && <%= packageManager.install %>",
+  "buildCommand": "cd <%= offset %> && <%= packageManager.exec %> nx build <%= projectName %>"
 }

package/generators/server/lib/normalize-options.d.ts

@@ -1,11 +1,14 @@
 import { type Tree } from '@nx/devkit';
 import type { ServerGeneratorSchema } from '../schema.js';
+import { type PackageManagerCommands } from '../../../utils/package-manager.js';
+import { type ProjectModuleResolution } from '../../../utils/project-paths.js';
 export interface NormalizedServerOptions {
     name: string;
     projectName: string;
     projectRoot: string;
     offset: string;
-    ignoreDeprecations: string;
+    moduleResolution: ProjectModuleResolution;
+    resetCustomConditions: boolean;
     className: string;
     fileName: string;
     deploymentTarget: 'node' | 'vercel' | 'lambda' | 'cloudflare';
@@ -16,6 +19,10 @@ export interface NormalizedServerOptions {
         importPath: string;
     }>;
     redis: 'docker' | 'existing' | 'none';
+    /** What the build target writes and Nx caches: `dist/`, plus the Build Output API tree for vercel. */
+    buildOutputs: string[];
+    /** Commands of the workspace's package manager, for the deployment config files. */
+    packageManager: PackageManagerCommands;
     parsedTags: string[];
     skipFormat: boolean;
 }

package/generators/server/lib/normalize-options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const package_manager_js_1 = require("../../../utils/package-manager.js");
 const project_paths_js_1 = require("../../../utils/project-paths.js");
 function normalizeOptions(tree, schema) {
     const { className, fileName } = (0, devkit_1.names)(schema.name);
@@ -19,18 +20,23 @@ function normalizeOptions(tree, schema) {
         const importPath = path_1.posix.relative((0, devkit_1.joinPathFragments)(projectRoot, 'src'), (0, devkit_1.joinPathFragments)(appSourceRoot, `${appFile}.app`));
         return { className: `${appClass}App`, importPath: importPath.startsWith('.') ? importPath : `./${importPath}` };
     });
+    const deploymentTarget = schema.deploymentTarget ?? 'node';
+    // `frontmcp build --target vercel` writes `.vercel/output` (Build Output API) in the project folder.
+    const buildOutputs = deploymentTarget === 'vercel' ? ['{projectRoot}/dist', '{projectRoot}/.vercel/output'] : ['{projectRoot}/dist'];
     return {
         name: schema.name,
         projectName: `server-${fileName}`,
         projectRoot,
         offset,
-        ignoreDeprecations: (0, project_paths_js_1.getIgnoreDeprecations)(tree),
+        ...(0, project_paths_js_1.getProjectTsOptions)(tree),
         className,
         fileName,
-        deploymentTarget: schema.deploymentTarget ?? 'node',
+        deploymentTarget,
         appNames,
         appImports,
         redis: schema.redis ?? 'none',
+        buildOutputs,
+        packageManager: (0, package_manager_js_1.getPackageManagerCommands)(tree),
         parsedTags,
         skipFormat: schema.skipFormat ?? false,
     };

package/generators/server/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/server/lib/normalize-options.ts"],"names":[],"mappings":";;AAsBA,4CAiCC;AAvDD,uCAA8E;AAC9E,+BAA6B;AAE7B,sEAA6F;AAmB7F,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA6B;IACxE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI;QAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IAEtB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,UAAU,EAAE,UAAU,IAAI,IAAA,0BAAiB,EAAC,UAAU,EAAE,IAAI,IAAI,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACjI,MAAM,UAAU,GAAG,YAAK,CAAC,QAAQ,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,CAAC,EAAE,IAAA,0BAAiB,EAAC,aAAa,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC;QAC7H,OAAO,EAAE,SAAS,EAAE,GAAG,QAAQ,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,EAAE,CAAC;IAClH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,UAAU,QAAQ,EAAE;QACjC,WAAW;QACX,MAAM;QACN,kBAAkB,EAAE,IAAA,wCAAqB,EAAC,IAAI,CAAC;QAC/C,SAAS;QACT,QAAQ;QACR,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,MAAM;QACnD,QAAQ;QACR,UAAU;QACV,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM;QAC7B,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, getProjects, joinPathFragments, names } from '@nx/devkit';\nimport { posix } from 'path';\nimport type { ServerGeneratorSchema } from '../schema.js';\nimport { getIgnoreDeprecations, resolveProjectPaths } from '../../../utils/project-paths.js';\n\nexport interface NormalizedServerOptions {\n  name: string;\n  projectName: string;\n  projectRoot: string;\n  offset: string;\n  ignoreDeprecations: string;\n  className: string;\n  fileName: string;\n  deploymentTarget: 'node' | 'vercel' | 'lambda' | 'cloudflare';\n  appNames: string[];\n  /** Each composed app with the import specifier `main.ts` uses, relative to the server's `src/`. */\n  appImports: Array<{ className: string; importPath: string }>;\n  redis: 'docker' | 'existing' | 'none';\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: ServerGeneratorSchema): NormalizedServerOptions {\n  const { className, fileName } = names(schema.name);\n  const { projectRoot, offset } = resolveProjectPaths(schema.directory ?? joinPathFragments('servers', fileName));\n  const parsedTags = schema.tags\n    ? schema.tags.split(',').map((t) => t.trim())\n    : ['scope:servers'];\n\n  const appNames = schema.apps.split(',').map((a) => a.trim()).filter(Boolean);\n\n  const projects = getProjects(tree);\n  const appImports = appNames.map((appName) => {\n    const { className: appClass, fileName: appFile } = names(appName);\n    const appProject = projects.get(appName) ?? projects.get(appFile);\n    const appSourceRoot = appProject?.sourceRoot ?? joinPathFragments(appProject?.root ?? joinPathFragments('apps', appFile), 'src');\n    const importPath = posix.relative(joinPathFragments(projectRoot, 'src'), joinPathFragments(appSourceRoot, `${appFile}.app`));\n    return { className: `${appClass}App`, importPath: importPath.startsWith('.') ? importPath : `./${importPath}` };\n  });\n\n  return {\n    name: schema.name,\n    projectName: `server-${fileName}`,\n    projectRoot,\n    offset,\n    ignoreDeprecations: getIgnoreDeprecations(tree),\n    className,\n    fileName,\n    deploymentTarget: schema.deploymentTarget ?? 'node',\n    appNames,\n    appImports,\n    redis: schema.redis ?? 'none',\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../src/generators/server/lib/normalize-options.ts"],"names":[],"mappings":";;AA4BA,4CAwCC;AApED,uCAA8E;AAC9E,+BAA6B;AAE7B,0EAA2G;AAC3G,sEAAyH;AAwBzH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAA6B;IACxE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAA,sCAAmB,EAAC,MAAM,CAAC,SAAS,IAAI,IAAA,0BAAiB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI;QAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;IAEtB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,aAAa,GAAG,UAAU,EAAE,UAAU,IAAI,IAAA,0BAAiB,EAAC,UAAU,EAAE,IAAI,IAAI,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACjI,MAAM,UAAU,GAAG,YAAK,CAAC,QAAQ,CAAC,IAAA,0BAAiB,EAAC,WAAW,EAAE,KAAK,CAAC,EAAE,IAAA,0BAAiB,EAAC,aAAa,EAAE,GAAG,OAAO,MAAM,CAAC,CAAC,CAAC;QAC7H,OAAO,EAAE,SAAS,EAAE,GAAG,QAAQ,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE,EAAE,CAAC;IAClH,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC;IAC3D,qGAAqG;IACrG,MAAM,YAAY,GAChB,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,oBAAoB,EAAE,8BAA8B,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAElH,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,UAAU,QAAQ,EAAE;QACjC,WAAW;QACX,MAAM;QACN,GAAG,IAAA,sCAAmB,EAAC,IAAI,CAAC;QAC5B,SAAS;QACT,QAAQ;QACR,gBAAgB;QAChB,QAAQ;QACR,UAAU;QACV,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM;QAC7B,YAAY;QACZ,cAAc,EAAE,IAAA,8CAAyB,EAAC,IAAI,CAAC;QAC/C,UAAU;QACV,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK;KACvC,CAAC;AACJ,CAAC","sourcesContent":["import { type Tree, getProjects, joinPathFragments, names } from '@nx/devkit';\nimport { posix } from 'path';\nimport type { ServerGeneratorSchema } from '../schema.js';\nimport { getPackageManagerCommands, type PackageManagerCommands } from '../../../utils/package-manager.js';\nimport { getProjectTsOptions, resolveProjectPaths, type ProjectModuleResolution } from '../../../utils/project-paths.js';\n\nexport interface NormalizedServerOptions {\n  name: string;\n  projectName: string;\n  projectRoot: string;\n  offset: string;\n  moduleResolution: ProjectModuleResolution;\n  resetCustomConditions: boolean;\n  className: string;\n  fileName: string;\n  deploymentTarget: 'node' | 'vercel' | 'lambda' | 'cloudflare';\n  appNames: string[];\n  /** Each composed app with the import specifier `main.ts` uses, relative to the server's `src/`. */\n  appImports: Array<{ className: string; importPath: string }>;\n  redis: 'docker' | 'existing' | 'none';\n  /** What the build target writes and Nx caches: `dist/`, plus the Build Output API tree for vercel. */\n  buildOutputs: string[];\n  /** Commands of the workspace's package manager, for the deployment config files. */\n  packageManager: PackageManagerCommands;\n  parsedTags: string[];\n  skipFormat: boolean;\n}\n\nexport function normalizeOptions(tree: Tree, schema: ServerGeneratorSchema): NormalizedServerOptions {\n  const { className, fileName } = names(schema.name);\n  const { projectRoot, offset } = resolveProjectPaths(schema.directory ?? joinPathFragments('servers', fileName));\n  const parsedTags = schema.tags\n    ? schema.tags.split(',').map((t) => t.trim())\n    : ['scope:servers'];\n\n  const appNames = schema.apps.split(',').map((a) => a.trim()).filter(Boolean);\n\n  const projects = getProjects(tree);\n  const appImports = appNames.map((appName) => {\n    const { className: appClass, fileName: appFile } = names(appName);\n    const appProject = projects.get(appName) ?? projects.get(appFile);\n    const appSourceRoot = appProject?.sourceRoot ?? joinPathFragments(appProject?.root ?? joinPathFragments('apps', appFile), 'src');\n    const importPath = posix.relative(joinPathFragments(projectRoot, 'src'), joinPathFragments(appSourceRoot, `${appFile}.app`));\n    return { className: `${appClass}App`, importPath: importPath.startsWith('.') ? importPath : `./${importPath}` };\n  });\n\n  const deploymentTarget = schema.deploymentTarget ?? 'node';\n  // `frontmcp build --target vercel` writes `.vercel/output` (Build Output API) in the project folder.\n  const buildOutputs =\n    deploymentTarget === 'vercel' ? ['{projectRoot}/dist', '{projectRoot}/.vercel/output'] : ['{projectRoot}/dist'];\n\n  return {\n    name: schema.name,\n    projectName: `server-${fileName}`,\n    projectRoot,\n    offset,\n    ...getProjectTsOptions(tree),\n    className,\n    fileName,\n    deploymentTarget,\n    appNames,\n    appImports,\n    redis: schema.redis ?? 'none',\n    buildOutputs,\n    packageManager: getPackageManagerCommands(tree),\n    parsedTags,\n    skipFormat: schema.skipFormat ?? false,\n  };\n}\n"]}

package/generators/server/server.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
+const add_dependencies_js_1 = require("../../utils/add-dependencies.js");
+const versions_js_1 = require("../../utils/versions.js");
 const index_js_1 = require("./lib/index.js");
 async function serverGenerator(tree, schema) {
     return serverGeneratorInternal(tree, schema);
@@ -27,9 +29,14 @@ async function serverGeneratorInternal(tree, schema) {
     if (bundle !== 'none') {
         scaffoldCatalogSkills(tree, options.projectRoot, options.deploymentTarget, bundle);
     }
+    // The lambda build wraps the server with @codegenie/serverless-express and fails without it.
+    const installTask = options.deploymentTarget === 'lambda'
+        ? (0, add_dependencies_js_1.addFrontmcpDependencies)(tree, (0, versions_js_1.getLambdaDependencies)(), {}, { keepExistingVersions: true })
+        : undefined;
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    return installTask;
 }
 function scaffoldCatalogSkills(tree, projectRoot, target, bundle) {
     // Load skills catalog via @frontmcp/skills package at runtime