@mnci/cli 4.25.0 → 4.27.0

package/README.md

@@ -1336,7 +1336,7 @@ already use:
 - **`node-function-app` overlay**: `@azure/functions` is installed for real
   (a plain `@nx/node:application` app has no Azure dependency by default,
   unlike a plugin-generated one), an HTTP-triggered `app.http(...)` sample
-  (v4 programming model) is written as a `src/hello/` slice (`hello.handler.ts` plus a pure `greeting.algorithm.ts` and its spec, behind an `index.ts`), `host.json` is
+  (v4 programming model) is written as a `src/hello/` slice (`hello.handler.ts` adapting the transport, `greet.use-case.ts` and its spec, `greeting.contract.ts`, behind an `index.ts`; `--empty` skips the slice), `host.json` is
   added, and the manifest is repaired — `main: 'main.js'` (the dist shim) and
   `@azure/functions` added to `dependencies` for Azure's deploy-time install
   to find.

package/dist/cli.js

@@ -3970,6 +3970,105 @@ function addGoInternalLib(workspaceRoot, name) {
 
 // src/project-scaffolding/node.use-case.ts
 var import_node_path12 = require("path");
+
+// src/project-scaffolding/node-app-example.algorithm.ts
+var GREET_USE_CASE = `import type { Greeting } from './greeting.contract'
+
+export function greet (name: string): Greeting {
+  return { message: 'Hello, ' + name + '!' }
+}
+`;
+var GREETING_CONTRACT = `/** What greeting someone returns. */
+export interface Greeting {
+  readonly message: string
+}
+`;
+var GREET_SPEC = `import { greet } from './greet.use-case'
+
+describe('greet', () => {
+  it('greets a name', () => {
+    expect(greet('world')).toEqual({ message: 'Hello, world!' })
+  })
+})
+`;
+var SLICE = {
+  "hello/greet.use-case.ts": GREET_USE_CASE,
+  "hello/greeting.contract.ts": GREETING_CONTRACT,
+  "hello/greet.use-case.spec.ts": GREET_SPEC
+};
+function nodeAppExampleFiles(framework) {
+  switch (framework) {
+    case "none": {
+      return {
+        ...SLICE,
+        "hello/index.ts": "export * from './greeting.contract'\nexport * from './greet.use-case'\n",
+        "main.ts": "import { greet } from './hello'\n\nconsole.log(greet('world').message)\n"
+      };
+    }
+    case "express": {
+      return {
+        ...SLICE,
+        "hello/hello.handler.ts": `import type { Request, Response } from 'express'
+import { greet } from './greet.use-case'
+
+export function helloHandler (request: Request, response: Response): void {
+  const name = typeof request.query.name === 'string' ? request.query.name : 'world'
+  response.send(greet(name))
+}
+`,
+        "hello/index.ts": "export * from './greeting.contract'\nexport * from './greet.use-case'\nexport * from './hello.handler'\n",
+        "main.ts": `import express from 'express'
+import { helloHandler } from './hello'
+
+const host = process.env.HOST ?? 'localhost'
+const port = process.env.PORT ? Number(process.env.PORT) : 3000
+
+const app = express()
+
+app.get('/', helloHandler)
+
+app.listen(port, host, () => {
+  console.log('[ ready ] http://' + host + ':' + String(port))
+})
+`
+      };
+    }
+    case "koa": {
+      return {
+        ...SLICE,
+        "hello/hello.handler.ts": `import type { Context } from 'koa'
+import { greet } from './greet.use-case'
+
+export function helloHandler (context: Context): void {
+  const name = typeof context.query.name === 'string' ? context.query.name : 'world'
+  context.body = greet(name)
+}
+`,
+        "hello/index.ts": "export * from './greeting.contract'\nexport * from './greet.use-case'\nexport * from './hello.handler'\n",
+        "main.ts": `import Koa from 'koa'
+import { helloHandler } from './hello'
+
+const host = process.env.HOST ?? 'localhost'
+const port = process.env.PORT ? Number(process.env.PORT) : 3000
+
+const app = new Koa()
+
+app.use(helloHandler)
+
+app.listen(port, host, () => {
+  console.log('[ ready ] http://' + host + ':' + String(port))
+})
+`
+      };
+    }
+    case "fastify":
+    case "nest": {
+      return null;
+    }
+  }
+}
+
+// src/project-scaffolding/node.use-case.ts
 function ensurePlugin2(workspaceRoot, packageName) {
   if (hasPlugin(workspaceRoot, packageName)) {
     return;
@@ -4046,6 +4145,12 @@ function nodeAppPackageTarget(name) {
 }
 function addNodeApp(workspaceRoot, name, stack, framework = "none") {
   runNodeApp(workspaceRoot, name, stack, framework);
+  const example = nodeAppExampleFiles(framework);
+  if (example !== null) {
+    for (const [relative, contents] of Object.entries(example)) {
+      writeFileEnsured((0, import_node_path12.join)(workspaceRoot, "apps", name, "src", relative), contents);
+    }
+  }
   ensureAdmZip(workspaceRoot);
   addNxTargets((0, import_node_path12.join)(workspaceRoot, "apps", name, "package.json"), {
     package: nodeAppPackageTarget(name)
@@ -4066,6 +4171,10 @@ var NODE_FUNCTION_APP_MAIN = `// esbuild only includes what is reachable from he
 // function slice you create under src/ (through its index).
 import './hello'
 `;
+var NODE_FUNCTION_APP_MAIN_EMPTY = `// esbuild only includes what is reachable from here, so import each function slice
+// you create under src/ (through its index).
+export {}
+`;
 var NODE_FUNCTION_APP_HOST_JSON = `{
   "version": "2.0",
   "extensionBundle": {
@@ -4076,11 +4185,11 @@ var NODE_FUNCTION_APP_HOST_JSON = `{
 `;
 var NODE_FUNCTION_APP_HELLO = `import { app } from '@azure/functions'
 import type { HttpRequest, HttpResponseInit } from '@azure/functions'
-import { buildGreeting } from './greeting.algorithm'
+import { greet } from './greet.use-case'
 
 async function hello(request: HttpRequest): Promise<HttpResponseInit> {
   const name = request.query.get('name') ?? 'world'
-  return { body: buildGreeting(name) }
+  return { body: greet(name).message }
 }
 
 app.http('hello', {
@@ -4092,15 +4201,22 @@ app.http('hello', {
 `;
 var NODE_FUNCTION_APP_HELLO_BARREL = `export * from './hello.handler'
 `;
-var NODE_FUNCTION_APP_GREETING = `export function buildGreeting (name: string): string {
-  return 'Hello, ' + name + '!'
+var NODE_FUNCTION_APP_GREETING_CONTRACT = `/** What greeting someone returns. */
+export interface Greeting {
+  readonly message: string
+}
+`;
+var NODE_FUNCTION_APP_GREET_USE_CASE = `import type { Greeting } from './greeting.contract'
+
+export function greet (name: string): Greeting {
+  return { message: 'Hello, ' + name + '!' }
 }
 `;
-var NODE_FUNCTION_APP_GREETING_SPEC = `import { buildGreeting } from './greeting.algorithm'
+var NODE_FUNCTION_APP_GREET_SPEC = `import { greet } from './greet.use-case'
 
-describe('buildGreeting', () => {
+describe('greet', () => {
   it('greets a name', () => {
-    expect(buildGreeting('world')).toBe('Hello, world!')
+    expect(greet('world')).toEqual({ message: 'Hello, world!' })
   })
 })
 `;
@@ -4148,22 +4264,28 @@ function nodeFunctionAppStartTarget(name) {
     options: { command: "func start", cwd: `apps/${name}` }
   };
 }
-function addNodeFunctionApp(workspaceRoot, name, stack) {
+function addNodeFunctionApp(workspaceRoot, name, stack, empty = false) {
   runNodeApp(workspaceRoot, name, stack, "none");
   ensureAzureFunctionsPackage(workspaceRoot);
   const nodeFunctionAppRoot = (0, import_node_path12.join)(workspaceRoot, "apps", name);
-  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/main.ts"), NODE_FUNCTION_APP_MAIN);
-  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/hello.handler.ts"), NODE_FUNCTION_APP_HELLO);
-  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/greeting.algorithm.ts"), NODE_FUNCTION_APP_GREETING);
-  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/greeting.algorithm.spec.ts"), NODE_FUNCTION_APP_GREETING_SPEC);
-  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello/index.ts"), NODE_FUNCTION_APP_HELLO_BARREL);
+  writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "src/main.ts"), empty ? NODE_FUNCTION_APP_MAIN_EMPTY : NODE_FUNCTION_APP_MAIN);
+  if (!empty) {
+    const slice = (0, import_node_path12.join)(nodeFunctionAppRoot, "src/hello");
+    writeFileEnsured((0, import_node_path12.join)(slice, "hello.handler.ts"), NODE_FUNCTION_APP_HELLO);
+    writeFileEnsured((0, import_node_path12.join)(slice, "greet.use-case.ts"), NODE_FUNCTION_APP_GREET_USE_CASE);
+    writeFileEnsured((0, import_node_path12.join)(slice, "greet.use-case.spec.ts"), NODE_FUNCTION_APP_GREET_SPEC);
+    writeFileEnsured((0, import_node_path12.join)(slice, "greeting.contract.ts"), NODE_FUNCTION_APP_GREETING_CONTRACT);
+    writeFileEnsured((0, import_node_path12.join)(slice, "index.ts"), NODE_FUNCTION_APP_HELLO_BARREL);
+  }
   writeFileEnsured((0, import_node_path12.join)(nodeFunctionAppRoot, "host.json"), NODE_FUNCTION_APP_HOST_JSON);
   repairNodeFunctionAppManifest(nodeFunctionAppRoot, workspaceRoot);
   ensureAdmZip(workspaceRoot);
   addNxTargets((0, import_node_path12.join)(nodeFunctionAppRoot, "package.json"), {
     package: nodeFunctionAppPackageTarget(name),
     prune: nodeFunctionAppPruneTarget(name),
-    start: nodeFunctionAppStartTarget(name)
+    start: nodeFunctionAppStartTarget(name),
+    // With no spec the runner exits non-zero; an empty scaffold must still pass `nx test`.
+    ...empty && { test: { options: { passWithNoTests: true } } }
   });
   removeGeneratedEslintConfig(workspaceRoot, `apps/${name}`);
   registerProjectCommands(workspaceRoot, name, { build: true, start: `nx run ${name}:start` });
@@ -6542,7 +6664,7 @@ var PROJECT_KINDS = [
   "csharp-internal-lib",
   "vscode-extension"
 ];
-var EMPTY_KINDS = /* @__PURE__ */ new Set(["npm-lib", "internal-lib", "react-lib", "react-internal-lib"]);
+var EMPTY_KINDS = /* @__PURE__ */ new Set(["npm-lib", "internal-lib", "react-lib", "react-internal-lib", "node-function-app"]);
 async function runAdd(kind, name, options) {
   const workspaceRoot = process.cwd();
   if (!fileExists((0, import_node_path25.join)(workspaceRoot, "nx.json"))) {
@@ -6588,7 +6710,7 @@ async function runAdd(kind, name, options) {
       break;
     }
     case "node-function-app": {
-      addNodeFunctionApp(workspaceRoot, resolvedName, stack);
+      addNodeFunctionApp(workspaceRoot, resolvedName, stack, options.empty === true);
       break;
     }
     case "npm-lib": {
@@ -7706,7 +7828,7 @@ function buildProgram(cliVersion) {
     "node-app only: express | fastify | koa | nest | none (default: none)"
   ).option(
     "--empty",
-    "npm-lib, internal-lib, react-lib, react-internal-lib: scaffold the slice skeleton only, with no sample code or spec"
+    "npm-lib, internal-lib, react-lib, react-internal-lib, node-function-app: scaffold the slice skeleton only, with no sample code or spec"
   ).option(
     "--lib <name>",
     "python-vendor only: the internal Python library (libs/<name>) to vendor into <name>"