@phila/cli 0.0.11 → 0.0.13

package/dist/commands/validate.js

@@ -57,15 +57,15 @@ function getSynthEnvironment(config, requestedEnv) {
     if (requestedEnv && isValidEnvironment(requestedEnv)) {
         const envConfig = envs[requestedEnv];
         if (envConfig)
-            return { env: requestedEnv, vpc: envConfig.vpc };
+            return { env: requestedEnv, vpc: envConfig.vpc, profile: envConfig.profile };
         return null;
     }
     if (envs.dev)
-        return { env: 'dev', vpc: envs.dev.vpc };
+        return { env: 'dev', vpc: envs.dev.vpc, profile: envs.dev.profile };
     if (envs.test)
-        return { env: 'test', vpc: envs.test.vpc };
+        return { env: 'test', vpc: envs.test.vpc, profile: envs.test.profile };
     if (envs.prod)
-        return { env: 'prod', vpc: envs.prod.vpc };
+        return { env: 'prod', vpc: envs.prod.vpc, profile: envs.prod.profile };
     return null;
 }
 async function validateCommand(environment) {
@@ -94,8 +94,17 @@ async function validateCommand(environment) {
         process.exit(1);
     }
     const projectDir = process.cwd();
-    const pm = (0, package_manager_1.detectPackageManager)(projectDir);
+    const pm = (0, package_manager_1.resolvePackageManager)(config, projectDir);
+    const { profile } = synthContext;
+    const safePattern = /^[a-zA-Z0-9_-]+$/;
+    if (!safePattern.test(profile)) {
+        console.log(chalk_1.default.red(`\nError: Invalid profile name '${profile}'.`));
+        console.log(chalk_1.default.gray('Profile names must contain only letters, numbers, hyphens, and underscores.\n'));
+        process.exit(1);
+    }
     console.log(chalk_1.default.blue('\nValidating project (install, build, cdk synth)...\n'));
+    console.log(chalk_1.default.gray(`Using AWS profile: ${profile}\n`));
+    await (0, deploy_1.ensureSsoLogin)(profile);
     console.log(chalk_1.default.gray('Installing dependencies...\n'));
     const installEnv = await (0, install_env_1.prepareInstallEnv)(projectDir);
     try {
@@ -106,15 +115,16 @@ async function validateCommand(environment) {
         console.log(chalk_1.default.red('\nError: Install failed.\n'));
         process.exit(1);
     }
-    await (0, deploy_1.buildProject)(config);
+    await (0, deploy_1.buildProject)(config, pm);
     const cdkDir = path.resolve(projectDir, config.cdkPath);
     const compliance = config.compliance || [];
     const complianceArg = compliance.length > 0 ? ` -c compliance=${compliance.join(',')}` : '';
-    const contextArgs = ` -c environment=${synthContext.env} -c vpc=${synthContext.vpc}${complianceArg}`;
+    const contextArgs = ` -c environment=${synthContext.env} -c vpc=${synthContext.vpc}${complianceArg} --profile ${profile}`;
     console.log(chalk_1.default.gray('Running cdk synth...\n'));
     try {
         const cdkCmd = (0, package_manager_1.getCdkCommand)(pm);
         const cmd = `${cdkCmd} synth${contextArgs}`;
+        console.log(chalk_1.default.gray(`Running: cd ${cdkDir} && ${cmd}\n`));
         (0, child_process_1.execSync)(cmd, { cwd: cdkDir, stdio: 'inherit' });
         console.log(chalk_1.default.green('\n✓ Validate complete. Project is ready for deployment.\n'));
     }

package/dist/commands/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/commands/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/commands/validate.ts"],"names":[],"mappings":"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"}

package/dist/templates/_shared/city.config.json.tmpl

@@ -7,6 +7,7 @@
   "compliance": {{complianceJson}},
   "confidentiality": "{{confidentiality}}",
   "cdkPath": "./cdk",
+  "packageManager": "{{packageManager}}",
   "environments": {
     "dev": {
       "profile": "{{devProfile}}",

package/dist/templates/_shared/webapp-cdk-package.json.tmpl

@@ -19,8 +19,5 @@
     "aws-cdk": "^2.1103.0",
     "ts-node": "^10.9.0",
     "typescript": "^5.3.0"
-  },
-  "overrides": {
-    "constructs": "^10.4.4"
   }
 }

package/dist/templates/lambda-api-nodejs/README.md.tmpl

@@ -22,10 +22,10 @@ View the [architecture diagram](https://github.com/CityOfPhiladelphia/phila-ctl/
 
 ```bash
 # Install dependencies
-npm install
+{{installCommand}}
 
 # Build all packages
-npm run build
+{{runScriptPrefix}} build
 ```
 
 ### Deployment
@@ -48,13 +48,13 @@ city deploy prod
 
 ```bash
 # Build TypeScript
-npm run build
+{{runScriptPrefix}} build
 
 # View CDK diff before deploying
-npm run diff
+{{runScriptPrefix}} diff
 
 # Synthesize CloudFormation template
-npm run synth
+{{runScriptPrefix}} synth
 ```
 
 ## Project Structure

package/dist/templates/lambda-api-nodejs/apps/__lambdaName__/index.ts

@@ -39,7 +39,7 @@
  * by the CDK construct when a database is attached to the stack.
  */
 
-import type { APIGWV1Payload } from '@phila/philaroute/dist/types';
+import type { APIGWV1Payload } from '@phila/philaroute/dist/aws';
 import type { RestAccumulator } from '@phila/philaroute/dist/types';
 import { Router, http, validate } from '@phila/philaroute';
 

package/dist/templates/lambda-api-nodejs/apps/__lambdaName__/package.json

@@ -4,8 +4,8 @@
   "description": "Lambda function handler",
   "private": true,
   "scripts": {
-    "build": "npx tsc",
-    "watch": "npx tsc -w"
+    "build": "{{execCommand}} tsc",
+    "watch": "{{execCommand}} tsc -w"
   },
   "dependencies": {
     "@phila/philaroute": "^1.0.12",

package/dist/templates/lambda-api-nodejs/cdk/app.ts.tmpl

@@ -37,8 +37,8 @@ const stack = new Stack(app, '{{appName}}-' + environment, {
   stackName: '{{appName}}-' + environment,
 });
 
-// Create the LambdaApi construct
-new LambdaApi(stack, '{{appName}}Api', {
+// Scope as any so linked @phila/constructs resolves to a single Construct type at runtime.
+new LambdaApi(stack as any, '{{appName}}Api', {
   ...context,
   apiId: 'main',
   runtime: 'nodejs20',

package/dist/templates/lambda-api-nodejs/cdk/cdk.json

@@ -1,5 +1,5 @@
 {
-  "app": "npx ts-node --prefer-ts-exts app.ts",
+  "app": "{{execCommand}} ts-node --prefer-ts-exts app.ts",
   "watch": {
     "include": ["**"],
     "exclude": [

package/dist/templates/lambda-api-nodejs/cdk/package.json

@@ -19,8 +19,5 @@
     "aws-cdk": "^2.1103.0",
     "ts-node": "^10.9.0",
     "typescript": "^5.3.0"
-  },
-  "overrides": {
-    "constructs": "^10.4.4"
   }
 }

package/dist/templates/lambda-api-nodejs/package.json.tmpl

@@ -17,5 +17,8 @@
   "devDependencies": {
     "@types/node": "^20.10.0",
     "typescript": "^5.3.0"
+  },
+  "overrides": {
+    "constructs": "10.4.4"
   }
 }

package/dist/templates/lambda-dynamo-api/README.md.tmpl

@@ -22,10 +22,10 @@ View the [architecture diagram](https://github.com/CityOfPhiladelphia/phila-ctl/
 
 ```bash
 # Install dependencies
-npm install
+{{installCommand}}
 
 # Build all packages
-npm run build
+{{runScriptPrefix}} build
 ```
 
 ### Deployment
@@ -48,13 +48,13 @@ city deploy prod
 
 ```bash
 # Build TypeScript
-npm run build
+{{runScriptPrefix}} build
 
 # View CDK diff before deploying
-npm run diff
+{{runScriptPrefix}} diff
 
 # Synthesize CloudFormation template
-npm run synth
+{{runScriptPrefix}} synth
 ```
 
 ## Project Structure

package/dist/templates/lambda-dynamo-api/apps/__lambdaName__/index.ts

@@ -8,7 +8,7 @@
  * DynamoDB integration using AWS SDK v3 DocumentClient
  */
 
-import type { APIGWV1Payload } from '@phila/philaroute/dist/types';
+import type { APIGWV1Payload } from '@phila/philaroute/dist/aws';
 import type { RestAccumulator } from '@phila/philaroute/dist/types';
 import { Router, http, validate } from '@phila/philaroute';
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';

package/dist/templates/lambda-dynamo-api/apps/__lambdaName__/package.json

@@ -4,8 +4,8 @@
   "description": "Lambda function handler with DynamoDB",
   "private": true,
   "scripts": {
-    "build": "npx tsc",
-    "watch": "npx tsc -w"
+    "build": "{{execCommand}} tsc",
+    "watch": "{{execCommand}} tsc -w"
   },
   "dependencies": {
     "@phila/philaroute": "^1.0.12",

package/dist/templates/lambda-dynamo-api/cdk/app.ts.tmpl

@@ -37,8 +37,8 @@ const stack = new Stack(app, '{{appName}}-' + environment, {
   stackName: '{{appName}}-' + environment,
 });
 
-// Create the LambdaDynamoApi construct
-new LambdaDynamoApi(stack, '{{appName}}Api', {
+// Scope as any so linked @phila/constructs resolves to a single Construct type at runtime.
+new LambdaDynamoApi(stack as any, '{{appName}}Api', {
   ...context,
   apiId: 'main',
   runtime: 'nodejs20',

package/dist/templates/lambda-dynamo-api/cdk/cdk.json

@@ -1,9 +1,7 @@
 {
-  "app": "npx ts-node --prefer-ts-exts app.ts",
+  "app": "{{execCommand}} ts-node --prefer-ts-exts app.ts",
   "watch": {
-    "include": [
-      "**"
-    ],
+    "include": ["**"],
     "exclude": [
       "README.md",
       "cdk*.json",
@@ -19,10 +17,7 @@
   "context": {
     "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
     "@aws-cdk/core:checkSecretUsage": true,
-    "@aws-cdk/core:target-partitions": [
-      "aws",
-      "aws-cn"
-    ],
+    "@aws-cdk/core:target-partitions": ["aws", "aws-cn"],
     "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
     "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
     "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,

package/dist/templates/lambda-dynamo-api/cdk/package.json

@@ -19,8 +19,5 @@
     "aws-cdk": "^2.1103.0",
     "ts-node": "^10.9.0",
     "typescript": "^5.3.0"
-  },
-  "overrides": {
-    "constructs": "^10.4.4"
   }
 }

package/dist/templates/lambda-dynamo-api/package.json.tmpl

@@ -17,5 +17,8 @@
   "devDependencies": {
     "@types/node": "^20.10.0",
     "typescript": "^5.3.0"
+  },
+  "overrides": {
+    "constructs": "10.4.4"
   }
 }

package/dist/templates/lambda-postgres-api/README.md.tmpl

@@ -22,10 +22,10 @@ View the [architecture diagram](https://github.com/CityOfPhiladelphia/phila-ctl/
 
 ```bash
 # Install dependencies
-npm install
+{{installCommand}}
 
 # Build all packages
-npm run build
+{{runScriptPrefix}} build
 ```
 
 ### Deployment
@@ -48,13 +48,13 @@ city deploy prod
 
 ```bash
 # Build TypeScript
-npm run build
+{{runScriptPrefix}} build
 
 # View CDK diff before deploying
-npm run diff
+{{runScriptPrefix}} diff
 
 # Synthesize CloudFormation template
-npm run synth
+{{runScriptPrefix}} synth
 ```
 
 ## Project Structure
@@ -205,7 +205,7 @@ This application creates:
 To use Aurora Serverless v2 instead of provisioned RDS, edit `cdk/app.ts`:
 
 ```typescript
-new LambdaPostgresApi(stack, '{{appName}}Api', {
+new LambdaPostgresApi(stack as any, '{{appName}}Api', {
   ...context,
   apiId: 'main',
   runtime: 'nodejs20',

package/dist/templates/lambda-postgres-api/apps/__lambdaName__/index.ts

@@ -12,7 +12,7 @@
  * by the CDK construct.
  */
 
-import type { APIGWV1Payload } from '@phila/philaroute/dist/types';
+import type { APIGWV1Payload } from '@phila/philaroute/dist/aws';
 import type { RestAccumulator } from '@phila/philaroute/dist/types';
 import { Router, http, validate } from '@phila/philaroute';
 import { getPool } from '@phila/db-postgres';

package/dist/templates/lambda-postgres-api/apps/__lambdaName__/package.json

@@ -4,8 +4,8 @@
   "description": "Lambda function handler with PostgreSQL database access",
   "private": true,
   "scripts": {
-    "build": "npx tsc",
-    "watch": "npx tsc -w"
+    "build": "{{execCommand}} tsc",
+    "watch": "{{execCommand}} tsc -w"
   },
   "dependencies": {
     "@phila/philaroute": "^1.0.12",

package/dist/templates/lambda-postgres-api/cdk/app.ts.tmpl

@@ -37,8 +37,8 @@ const stack = new Stack(app, '{{appName}}-' + environment, {
   stackName: '{{appName}}-' + environment,
 });
 
-// Create the LambdaPostgresApi construct
-new LambdaPostgresApi(stack, '{{appName}}Api', {
+// Scope as any so linked @phila/constructs resolves to a single Construct type at runtime.
+new LambdaPostgresApi(stack as any, '{{appName}}Api', {
   ...context,
   apiId: 'main',
   runtime: 'nodejs20',

package/dist/templates/lambda-postgres-api/cdk/cdk.json

@@ -1,4 +1,4 @@
 {
-  "app": "npx ts-node app.ts",
+  "app": "{{execCommand}} ts-node app.ts",
   "requireApproval": "broadening"
 }

package/dist/templates/lambda-postgres-api/cdk/package.json

@@ -19,8 +19,5 @@
     "aws-cdk": "^2.1103.0",
     "ts-node": "^10.9.0",
     "typescript": "^5.3.0"
-  },
-  "overrides": {
-    "constructs": "^10.4.4"
   }
 }

package/dist/templates/lambda-postgres-api/package.json.tmpl

@@ -17,5 +17,8 @@
   "devDependencies": {
     "@types/node": "^20.10.0",
     "typescript": "^5.3.0"
+  },
+  "overrides": {
+    "constructs": "10.4.4"
   }
 }

package/dist/templates/static-site/README.md.tmpl

@@ -20,11 +20,11 @@ View the [architecture diagram](https://github.com/CityOfPhiladelphia/phila-ctl/
 
 ```bash
 # Install dependencies
-npm install
+{{installCommand}}
 
 # Set up frontend (replace placeholder with Nuxt)
 cd frontend
-npx nuxi@latest init .
+{{execCommand}} nuxi@latest init .
 # Configure nuxt.config.ts for SSG
 ```
 

package/dist/templates/static-site/cdk/app.ts.tmpl

@@ -37,8 +37,8 @@ const stack = new Stack(app, '{{appName}}-' + environment, {
   stackName: '{{appName}}-' + environment,
 });
 
-// Create the StaticSite construct
-new StaticSite(stack, '{{appName}}Site', {
+// Scope as any so linked @phila/constructs resolves to a single Construct type at runtime.
+new StaticSite(stack as any, '{{appName}}Site', {
   ...context,
   assetDir: '../frontend/dist',
 });

package/dist/templates/static-site/cdk/cdk.json

@@ -1,5 +1,5 @@
 {
-  "app": "npx ts-node --prefer-ts-exts app.ts",
+  "app": "{{execCommand}} ts-node --prefer-ts-exts app.ts",
   "watch": {
     "include": ["**"],
     "exclude": [

package/dist/templates/static-site/cdk/package.json

@@ -19,8 +19,5 @@
     "aws-cdk": "^2.1103.0",
     "ts-node": "^10.9.0",
     "typescript": "^5.3.0"
-  },
-  "overrides": {
-    "constructs": "^10.4.4"
   }
 }

package/dist/templates/static-site/frontend/README.md

@@ -11,7 +11,7 @@ Replace this placeholder with a Nuxt project:
 rm -rf frontend/*
 
 # Create Nuxt project
-npx nuxi@latest init frontend
+{{execCommand}} nuxi@latest init frontend
 
 # Configure for SSG in nuxt.config.ts:
 # export default defineNuxtConfig({
@@ -26,14 +26,14 @@ npx nuxi@latest init frontend
 
 ```bash
 cd frontend
-npm install
-npm run generate  # Outputs to .output/public/
+{{installCommand}}
+{{runScriptPrefix}} generate  # Outputs to .output/public/
 ```
 
 ## Deploy
 
 The `city ship --web` command will:
-1. Run `pnpm build` in this directory
+1. Run `{{runScriptPrefix}} build` in this directory
 2. Sync `dist/` to the S3 bucket
 3. Invalidate the CloudFront cache
 

package/dist/templates/static-site/frontend/build.js

@@ -0,0 +1,42 @@
+#!/usr/bin/env node
+// ABOUTME: Placeholder build for static-site frontend. Creates dist/ with a minimal index.html.
+// ABOUTME: Replace this frontend with a Nuxt project (see README.md); then use Nuxt's build instead.
+
+const fs = require('fs');
+const path = require('path');
+
+const distDir = path.join(__dirname, 'dist');
+const watch = process.argv.includes('--watch');
+
+const indexHtml = `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Hello Philadelphia!</title>
+</head>
+<body>
+  <h1>Hello Philadelphia!</h1>
+  <p>Replace this placeholder frontend with your own application.</p>
+</body>
+</html>
+`;
+
+function build() {
+  if (!fs.existsSync(distDir)) {
+    fs.mkdirSync(distDir, { recursive: true });
+  }
+  fs.writeFileSync(path.join(distDir, 'index.html'), indexHtml, 'utf8');
+  console.log('Built dist/index.html');
+}
+
+build();
+
+if (watch) {
+  fs.watch(__dirname, { recursive: false }, (eventType, filename) => {
+    if (filename && (filename.endsWith('.html') || filename.endsWith('.js'))) {
+      build();
+    }
+  });
+  console.log('Watching for changes...');
+}

package/dist/templates/static-site/package.json.tmpl

@@ -12,5 +12,8 @@
   "workspaces": [
     "cdk",
     "frontend"
-  ]
+  ],
+  "overrides": {
+    "constructs": "10.4.4"
+  }
 }

package/dist/templates/webapp-ecs-dotnet/README.md.tmpl

@@ -24,7 +24,7 @@ View the [architecture diagram](https://github.com/CityOfPhiladelphia/phila-ctl/
 
 ```bash
 # Install frontend and CDK dependencies
-npm install
+{{installCommand}}
 
 # Restore .NET dependencies
 cd apps/api && dotnet restore && cd ../..
@@ -34,16 +34,16 @@ cd apps/api && dotnet restore && cd ../..
 
 ```bash
 # Run frontend dev server
-npm run dev
+{{runScriptPrefix}} dev
 
 # Run API locally
 cd apps/api && dotnet run
 
 # Build frontend for production
-npm run build:frontend
+{{runScriptPrefix}} build:frontend
 
 # Build API Docker image
-npm run build:api
+{{runScriptPrefix}} build:api
 ```
 
 ### Deployment

package/dist/templates/webapp-ecs-dotnet/cdk/app.ts.tmpl

@@ -39,14 +39,13 @@ const stack = new Stack(app, '{{appName}}-' + environment, {
   stackName: '{{appName}}-' + environment,
 });
 
-// Create the StaticSite construct for the Nuxt frontend
-new StaticSite(stack, '{{appName}}Site', {
+// Scope as any so linked @phila/constructs resolves to a single Construct type at runtime.
+new StaticSite(stack as any, '{{appName}}Site', {
   ...context,
   assetDir: '../frontend/dist',
 });
 
-// Create the EcsApi construct for the containerized .NET API backend
-new EcsApi(stack, '{{appName}}Api', {
+new EcsApi(stack as any, '{{appName}}Api', {
   ...context,
   apiId: 'api',
   image: ecs.ContainerImage.fromAsset(path.join(__dirname, '../apps/api')),

package/dist/templates/webapp-ecs-dotnet/cdk/cdk.json

@@ -1,5 +1,5 @@
 {
-  "app": "npx ts-node --prefer-ts-exts app.ts",
+  "app": "{{execCommand}} ts-node --prefer-ts-exts app.ts",
   "watch": {
     "include": ["**"],
     "exclude": [

package/dist/templates/webapp-ecs-dotnet/package.json.tmpl

@@ -4,10 +4,10 @@
   "description": "Web application with Nuxt frontend and .NET ECS containerized API backend",
   "private": true,
   "scripts": {
-    "build": "npm run build:frontend && npm run build:api",
-    "build:frontend": "cd frontend && npm run build",
+    "build": "{{runScriptPrefix}} build:frontend && {{runScriptPrefix}} build:api",
+    "build:frontend": "cd frontend && {{runScriptPrefix}} build",
     "build:api": "cd apps/api && docker build -t {{appName}}-api .",
-    "dev": "cd frontend && npm run dev",
+    "dev": "cd frontend && {{runScriptPrefix}} dev",
     "test": "{{testCommand}}",
     "synth": "cd cdk && cdk synth",
     "deploy": "cd cdk && cdk deploy",
@@ -20,5 +20,8 @@
   "devDependencies": {
     "@types/node": "^20.10.0",
     "typescript": "^5.3.0"
+  },
+  "overrides": {
+    "constructs": "10.4.4"
   }
 }