skuba 12.0.0-enforce-file-extensions-20250618112549 → 12.0.0-subpath-imports-20250710043319

package/template/lambda-sqs-worker-cdk/package.json

@@ -2,6 +2,13 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "scripts": {
     "deploy": "cdk deploy appStack --require-approval never",
     "deploy:hotswap": "pnpm --silent run deploy --hotswap",
@@ -17,15 +24,15 @@
     "@aws-sdk/client-codedeploy": "^3.363.0",
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
-    "@seek/aws-codedeploy-hooks": "^1.2.0",
+    "@seek/aws-codedeploy-hooks": "^2.0.0",
     "@seek/logger": "^10.0.0",
     "datadog-lambda-js": "^10.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
-    "zod": "^3.19.1"
+    "zod": "^3.25.67"
   },
   "devDependencies": {
-    "@seek/aws-codedeploy-infra": "^2.1.0",
+    "@seek/aws-codedeploy-infra": "^3.0.0",
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
     "@types/node": "^22.13.10",
@@ -37,9 +44,9 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "12.0.0-enforce-file-extensions-20250618112549"
+    "skuba": "12.0.0-subpath-imports-20250710043319"
   },
-  "packageManager": "pnpm@10.12.1",
+  "packageManager": "pnpm@10.12.4",
   "engines": {
     "node": ">=22"
   }

package/template/lambda-sqs-worker-cdk/src/app.test.ts

@@ -1,12 +1,12 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 
-import { metricsClient } from 'src/framework/metrics.js';
-import { createCtx, createSqsEvent } from 'src/testing/handler.js';
-import { logger } from 'src/testing/logging.js';
-import { scoringService, sns } from 'src/testing/services.js';
-import { chance, mockJobPublishedEvent } from 'src/testing/types.js';
-
 import * as app from './app.js';
+import { stdoutMock } from './framework/logging.js';
+
+import { metricsClient } from '#src/framework/metrics.js';
+import { createCtx, createSqsEvent } from '#src/testing/handler.js';
+import { scoringService, sns } from '#src/testing/services.js';
+import { chance, mockJobPublishedEvent } from '#src/testing/types.js';
 
 describe('app', () => {
   it('exports a handler', () => expect(app).toHaveProperty('handler'));
@@ -23,7 +23,6 @@ describe('handler', () => {
     .spyOn(metricsClient, 'distribution')
     .mockReturnValue();
 
-  beforeAll(logger.spy);
   beforeAll(scoringService.spy);
 
   beforeEach(() => {
@@ -32,7 +31,7 @@ describe('handler', () => {
   });
 
   afterEach(() => {
-    logger.clear();
+    stdoutMock.clear();
     distribution.mockClear();
     scoringService.clear();
     sns.clear();
@@ -45,12 +44,24 @@ describe('handler', () => {
 
     expect(scoringService.request).toHaveBeenCalledTimes(1);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.debug.mock.calls).toEqual([
-      [{ count: 1 }, 'Received jobs'],
-      [{ snsMessageId: expect.any(String) }, 'Scored job'],
-      ['Function succeeded'],
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        count: 1,
+        level: 20,
+        msg: 'Received jobs',
+      },
+      {
+        awsRequestId: '-',
+        level: 20,
+        msg: 'Scored job',
+        snsMessageId: expect.any(String),
+      },
+      {
+        awsRequestId: '-',
+        level: 20,
+        msg: 'Function succeeded',
+      },
     ]);
 
     expect(distribution.mock.calls).toEqual([
@@ -76,7 +87,23 @@ describe('handler', () => {
 
     await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        count: 1,
+        level: 20,
+        msg: 'Received jobs',
+      },
+      {
+        awsRequestId: '-',
+        err: {
+          message: err.message,
+          type: 'Error',
+        },
+        level: 50,
+        msg: 'Function failed',
+      },
+    ]);
   });
 
   it('bubbles up SNS error', async () => {
@@ -88,22 +115,44 @@ describe('handler', () => {
 
     await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        count: 1,
+        level: 20,
+        msg: 'Received jobs',
+      },
+      {
+        awsRequestId: '-',
+        err: {
+          message: err.message,
+          type: 'Error',
+        },
+        level: 50,
+        msg: 'Function failed',
+      },
+    ]);
   });
 
   it('throws on zero records', async () => {
-    const err = new Error('Received 0 records');
-
     const event = createSqsEvent([]);
 
     await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        err: {
+          message: 'Received 0 records',
+          type: 'Error',
+        },
+        level: 50,
+        msg: 'Function failed',
+      },
+    ]);
   });
 
   it('throws on multiple records', async () => {
-    const err = new Error('Received 2 records');
-
     const event = createSqsEvent([
       JSON.stringify(jobPublished),
       JSON.stringify(jobPublished),
@@ -111,6 +160,16 @@ describe('handler', () => {
 
     await expect(app.handler(event, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        err: {
+          message: 'Received 2 records',
+          type: 'Error',
+        },
+        level: 50,
+        msg: 'Function failed',
+      },
+    ]);
   });
 });

package/template/lambda-sqs-worker-cdk/src/app.ts

@@ -1,18 +1,16 @@
-import 'skuba-dive/register';
-
 import { isLambdaHook } from '@seek/aws-codedeploy-hooks';
 import type { SQSEvent } from 'aws-lambda';
 
-import { createHandler } from 'src/framework/handler.js';
-import { logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
-import { validateJson } from 'src/framework/validation.js';
+import { createHandler } from '#src/framework/handler.js';
+import { logger } from '#src/framework/logging.js';
+import { metricsClient } from '#src/framework/metrics.js';
+import { validateJson } from '#src/framework/validation.js';
 import {
   scoreJobPublishedEvent,
   scoringService,
-} from 'src/services/jobScorer.js';
-import { sendPipelineEvent } from 'src/services/pipelineEventSender.js';
-import { JobPublishedEventSchema } from 'src/types/pipelineEvents.js';
+} from '#src/services/jobScorer.js';
+import { sendPipelineEvent } from '#src/services/pipelineEventSender.js';
+import { JobPublishedEventSchema } from '#src/types/pipelineEvents.js';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

package/template/lambda-sqs-worker-cdk/src/config.ts

@@ -29,7 +29,7 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
   }),
 
   test: () => ({
-    logLevel: Env.string('LOG_LEVEL', { default: 'silent' }),
+    logLevel: Env.string('LOG_LEVEL', { default: 'debug' }),
     metrics: false,
     name: '<%- serviceName %>',
     version: 'test',

package/template/lambda-sqs-worker-cdk/src/framework/handler.test.ts

@@ -1,16 +1,14 @@
-import { createCtx } from 'src/testing/handler.js';
-import { logger } from 'src/testing/logging.js';
-import { chance } from 'src/testing/types.js';
-
 import { createHandler } from './handler.js';
+import { logger, stdoutMock } from './logging.js';
+
+import { createCtx } from '#src/testing/handler.js';
+import { chance } from '#src/testing/types.js';
 
 describe('createHandler', () => {
   const ctx = createCtx();
   const input = chance.paragraph();
 
-  beforeAll(logger.spy);
-
-  afterEach(logger.clear);
+  afterEach(stdoutMock.clear);
 
   it('handles happy path', async () => {
     const output = chance.paragraph();
@@ -25,11 +23,17 @@ describe('createHandler', () => {
 
     await expect(handler(input, ctx)).resolves.toBe(output);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.debug.mock.calls).toEqual([
-      ['Handler invoked'],
-      ['Function succeeded'],
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        level: 20,
+        msg: 'Handler invoked',
+      },
+      {
+        awsRequestId: '-',
+        level: 20,
+        msg: 'Function succeeded',
+      },
     ]);
   });
 
@@ -40,9 +44,17 @@ describe('createHandler', () => {
 
     await expect(handler(input, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
-
-    expect(logger.debug).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        err: {
+          message: err.message,
+          type: 'Error',
+        },
+        level: 50,
+        msg: 'Function failed',
+      },
+    ]);
   });
 
   it('handles sync error', async () => {
@@ -54,8 +66,16 @@ describe('createHandler', () => {
 
     await expect(handler(input, ctx)).rejects.toThrow('Function failed');
 
-    expect(logger.error).toHaveBeenCalledWith({ err }, 'Function failed');
-
-    expect(logger.debug).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        awsRequestId: '-',
+        err: {
+          message: err.message,
+          type: 'Error',
+        },
+        level: 50,
+        msg: 'Function failed',
+      },
+    ]);
   });
 });

package/template/lambda-sqs-worker-cdk/src/framework/handler.ts

@@ -1,8 +1,8 @@
 import type { Context as LambdaContext } from 'aws-lambda';
 import { datadog } from 'datadog-lambda-js';
 
-import { config } from 'src/config.js';
-import { logger, loggerContext } from 'src/framework/logging.js';
+import { config } from '#src/config.js';
+import { logger, loggerContext } from '#src/framework/logging.js';
 
 type Handler<Event, Output> = (
   event: Event,

package/template/lambda-sqs-worker-cdk/src/framework/logging.ts

@@ -1,8 +1,8 @@
 import { AsyncLocalStorage } from 'async_hooks';
 
-import createLogger from '@seek/logger';
+import createLogger, { createDestination } from '@seek/logger';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 interface LoggerContext {
   awsRequestId: string;
@@ -10,18 +10,29 @@ interface LoggerContext {
 
 export const loggerContext = new AsyncLocalStorage<LoggerContext>();
 
-export const logger = createLogger({
-  base: {
-    environment: config.environment,
-    version: config.version,
+const { destination, stdoutMock } = createDestination({
+  mock: config.environment === 'test' && {
+    redact: ['awsRequestId'],
   },
+});
 
-  level: config.logLevel,
+export { stdoutMock };
 
-  mixin: () => ({ ...loggerContext.getStore() }),
+export const logger = createLogger(
+  {
+    base: {
+      environment: config.environment,
+      version: config.version,
+    },
 
-  name: config.name,
+    level: config.logLevel,
 
-  transport:
-    config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
-});
+    mixin: () => ({ ...loggerContext.getStore() }),
+
+    name: config.name,
+
+    transport:
+      config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
+  },
+  destination,
+);

package/template/lambda-sqs-worker-cdk/src/framework/metrics.ts

@@ -1,6 +1,6 @@
 import { sendDistributionMetric } from 'datadog-lambda-js';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 const prefix = `${config.name}.`;
 

package/template/lambda-sqs-worker-cdk/src/framework/validation.test.ts

@@ -1,10 +1,10 @@
+import { validateJson } from './validation.js';
+
 import {
   IdDescriptionSchema,
   chance,
   mockIdDescription,
-} from 'src/testing/types.js';
-
-import { validateJson } from './validation.js';
+} from '#src/testing/types.js';
 
 describe('validateJson', () => {
   const idDescription = mockIdDescription();
@@ -32,13 +32,12 @@ describe('validateJson', () => {
       .toThrowErrorMatchingInlineSnapshot(`
       "[
         {
-          "code": "invalid_type",
           "expected": "string",
-          "received": "null",
+          "code": "invalid_type",
           "path": [
             "id"
           ],
-          "message": "Expected string, received null"
+          "message": "Invalid input: expected string, received null"
         }
       ]"
     `);
@@ -51,22 +50,20 @@ describe('validateJson', () => {
       .toThrowErrorMatchingInlineSnapshot(`
       "[
         {
-          "code": "invalid_type",
           "expected": "string",
-          "received": "undefined",
+          "code": "invalid_type",
           "path": [
             "id"
           ],
-          "message": "Required"
+          "message": "Invalid input: expected string, received undefined"
         },
         {
-          "code": "invalid_type",
           "expected": "string",
-          "received": "undefined",
+          "code": "invalid_type",
           "path": [
             "description"
           ],
-          "message": "Required"
+          "message": "Invalid input: expected string, received undefined"
         }
       ]"
     `);

package/template/lambda-sqs-worker-cdk/src/framework/validation.ts

@@ -1,10 +1,6 @@
-import type { z } from 'zod';
+import type { z } from 'zod/v4';
 
-export const validateJson = <
-  Output,
-  Def extends z.ZodTypeDef = z.ZodTypeDef,
-  Input = Output,
->(
+export const validateJson = <Output, Input>(
   input: string,
-  schema: z.ZodSchema<Output, Def, Input>,
+  schema: z.ZodSchema<Output, Input>,
 ): Output => schema.parse(JSON.parse(input));

package/template/lambda-sqs-worker-cdk/src/services/jobScorer.test.ts

@@ -1,8 +1,8 @@
-import { scoringService } from 'src/testing/services.js';
-import { chance, mockJobPublishedEvent } from 'src/testing/types.js';
-
 import * as jobScorer from './jobScorer.js';
 
+import { scoringService } from '#src/testing/services.js';
+import { chance, mockJobPublishedEvent } from '#src/testing/types.js';
+
 describe('scoreJobPublishedEvent', () => {
   beforeAll(scoringService.spy);
 

package/template/lambda-sqs-worker-cdk/src/services/jobScorer.ts

@@ -1,16 +1,17 @@
+import type {
+  JobPublishedEvent,
+  JobScoredEvent,
+} from 'src/types/pipelineEvents.js';
+
 import {
   jobPublishedEventToScorerInput,
   jobScorerOutputToScoredEvent,
-} from 'src/mapping/jobScorer.js';
+} from '#src/mapping/jobScorer.js';
 import {
   type JobScorerInput,
   type JobScorerOutput,
   JobScorerOutputSchema,
-} from 'src/types/jobScorer.js';
-import type {
-  JobPublishedEvent,
-  JobScoredEvent,
-} from 'src/types/pipelineEvents.js';
+} from '#src/types/jobScorer.js';
 
 /* istanbul ignore next: simulation of an external service */
 export const scoringService = {

package/template/lambda-sqs-worker-cdk/src/services/pipelineEventSender.test.ts

@@ -1,10 +1,10 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 
-import { sns } from 'src/testing/services.js';
-import { chance } from 'src/testing/types.js';
-
 import { sendPipelineEvent } from './pipelineEventSender.js';
 
+import { sns } from '#src/testing/services.js';
+import { chance } from '#src/testing/types.js';
+
 describe('sendPipelineEvent', () => {
   afterEach(() => {
     jest.clearAllMocks();

package/template/lambda-sqs-worker-cdk/src/services/pipelineEventSender.ts

@@ -1,9 +1,9 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 
-import { config } from 'src/config.js';
-
 import { sns } from './aws.js';
 
+import { config } from '#src/config.js';
+
 export const sendPipelineEvent = async (
   event: unknown,
   smokeTest: boolean = false,

package/template/lambda-sqs-worker-cdk/src/testing/services.ts

@@ -3,8 +3,8 @@ import 'aws-sdk-client-mock-jest';
 import { PublishCommand } from '@aws-sdk/client-sns';
 import { mockClient } from 'aws-sdk-client-mock';
 
-import { sns as snsClient } from 'src/services/aws.js';
-import * as jobScorer from 'src/services/jobScorer.js';
+import { sns as snsClient } from '#src/services/aws.js';
+import * as jobScorer from '#src/services/jobScorer.js';
 
 export const scoringService = {
   request: jest.fn(),

package/template/lambda-sqs-worker-cdk/src/testing/types.ts

@@ -1,5 +1,5 @@
 import { Chance } from 'chance';
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
 import type { JobPublishedEvent } from 'src/types/pipelineEvents.js';
 

package/template/lambda-sqs-worker-cdk/src/types/jobScorer.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
 export type JobScorerInput = z.infer<typeof JobScorerInputSchema>;
 

package/template/lambda-sqs-worker-cdk/src/types/pipelineEvents.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
 export type JobPublishedEvent = z.infer<typeof JobPublishedEventSchema>;
 

package/template/lambda-sqs-worker-cdk/tsconfig.json

@@ -2,10 +2,10 @@
   "compilerOptions": {
     "baseUrl": ".",
     "lib": ["ES2024"],
+    "moduleResolution": "node16",
+    "module": "node18",
     "outDir": "lib",
-    "paths": {
-      "src": ["src"]
-    },
+    "rootDir": ".",
     "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],

package/template/oss-npm-package/_package.json

@@ -2,6 +2,14 @@
   "name": "<%- moduleName %>",
   "version": "0.0.0-semantically-released",
   "description": "<%- description %>",
+  "type": "module",
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"

package/template/oss-npm-package/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-module.exports = {
+export default {
   entryPoint: 'src/index.ts',
   fields: [
     {

package/template/oss-npm-package/tsconfig.json

@@ -1,8 +1,11 @@
 {
   "compilerOptions": {
     "lib": ["ES2022"],
+    "module": "node18",
+    "moduleResolution": "node16",
     "outDir": "lib",
     "removeComments": false,
+    "rootDir": ".",
     "target": "ES2022"
   },
   "exclude": ["lib*/**/*"],

package/template/private-npm-package/_package.json

@@ -2,6 +2,13 @@
   "name": "<%- moduleName %>",
   "version": "0.0.0-semantically-released",
   "description": "<%- description %>",
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"

package/lib/cli/test/reporters/prettier/index.d.ts

@@ -1,4 +0,0 @@
-import type { Reporter } from '@jest/reporters';
-export default class SnapshotPrettifier implements Pick<Reporter, 'onTestFileResult'> {
-    onTestFileResult(...[test, testResult]: Parameters<NonNullable<Reporter['onTestFileResult']>>): Promise<void>;
-}