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

package/template/koa-rest-api/src/api/jobs/postJob.test.ts

@@ -1,8 +1,8 @@
-import { agentFromRouter } from 'src/testing/server.js';
-import { mockJobInput } from 'src/testing/types.js';
-
 import { jobRouter } from './index.js';
 
+import { agentFromRouter } from '#src/testing/server.js';
+import { mockJobInput } from '#src/testing/types.js';
+
 const agent = agentFromRouter(jobRouter);
 
 describe('postJobHandler', () => {
@@ -27,7 +27,7 @@ describe('postJobHandler', () => {
       .expect(422)
       .expect(({ text }) =>
         expect(text).toMatchInlineSnapshot(
-          `"{"message":"Input validation failed","invalidFields":{"/hirer":"Required"}}"`,
+          `"{"message":"Input validation failed","invalidFields":{"/hirer":"Invalid input: expected object, received undefined"}}"`,
         ),
       );
   });

package/template/koa-rest-api/src/api/jobs/postJob.ts

@@ -1,9 +1,9 @@
-import { logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
-import { validateRequestBody } from 'src/framework/validation.js';
-import * as storage from 'src/storage/jobs.js';
-import { JobInputSchema } from 'src/types/jobs.js';
-import type { Middleware } from 'src/types/koa.js';
+import { logger } from '#src/framework/logging.js';
+import { metricsClient } from '#src/framework/metrics.js';
+import { validateRequestBody } from '#src/framework/validation.js';
+import * as storage from '#src/storage/jobs.js';
+import { JobInputSchema } from '#src/types/jobs.js';
+import type { Middleware } from '#src/types/koa.js';
 
 export const postJobHandler: Middleware = async (ctx) => {
   const jobInput = validateRequestBody(ctx, JobInputSchema);

package/template/koa-rest-api/src/api/smokeTest.ts

@@ -1,5 +1,5 @@
-import { smokeTestJobStorage } from 'src/storage/jobs.js';
-import type { Middleware } from 'src/types/koa.js';
+import { smokeTestJobStorage } from '#src/storage/jobs.js';
+import type { Middleware } from '#src/types/koa.js';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

package/template/koa-rest-api/src/app.test.ts

@@ -1,7 +1,7 @@
-import { agentFromApp } from 'src/testing/server.js';
-
 import app from './app.js';
 
+import { agentFromApp } from '#src/testing/server.js';
+
 const agent = agentFromApp(app);
 
 describe('app', () => {

package/template/koa-rest-api/src/app.ts

@@ -1,5 +1,3 @@
-import './register.js';
-
 import { router } from './api/index.js';
 import { createApp } from './framework/server.js';
 

package/template/koa-rest-api/src/config.ts

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

package/template/koa-rest-api/src/framework/logging.ts

@@ -1,25 +1,34 @@
-import createLogger from '@seek/logger';
+import createLogger, { createDestination } from '@seek/logger';
 import { RequestLogging } from 'seek-koala';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 const { createContextMiddleware, mixin } =
   RequestLogging.createContextStorage();
 
 export const contextMiddleware = createContextMiddleware();
 
-export const logger = createLogger({
-  base: {
-    environment: config.environment,
-    version: config.version,
-  },
+const { destination, stdoutMock } = createDestination({
+  mock: config.environment === 'test',
+});
 
-  mixin,
+export { stdoutMock };
 
-  level: config.logLevel,
+export const logger = createLogger(
+  {
+    base: {
+      environment: config.environment,
+      version: config.version,
+    },
 
-  name: config.name,
+    mixin,
 
-  transport:
-    config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
-});
+    level: config.logLevel,
+
+    name: config.name,
+
+    transport:
+      config.environment === 'local' ? { target: 'pino-pretty' } : undefined,
+  },
+  destination,
+);

package/template/koa-rest-api/src/framework/metrics.ts

@@ -1,10 +1,10 @@
 import { StatsD } from 'hot-shots';
 import { createStatsDClient } from 'seek-datadog-custom-metrics';
 
-import { config } from 'src/config.js';
-
 import { logger } from './logging.js';
 
+import { config } from '#src/config.js';
+
 /* istanbul ignore next: StatsD client is not our responsibility */
 export const metricsClient = createStatsDClient(StatsD, config, (err) =>
   logger.error({ err }, 'StatsD error'),

package/template/koa-rest-api/src/framework/server.test.ts

@@ -1,10 +1,11 @@
 import Router from '@koa/router';
 
-import { logger } from 'src/testing/logging.js';
-import { metricsClient } from 'src/testing/metrics.js';
-import { agentFromRouter } from 'src/testing/server.js';
-import { chance } from 'src/testing/types.js';
-import type { Middleware } from 'src/types/koa.js';
+import { stdoutMock } from './logging.js';
+
+import { metricsClient } from '#src/testing/metrics.js';
+import { agentFromRouter } from '#src/testing/server.js';
+import { chance } from '#src/testing/types.js';
+import type { Middleware } from '#src/types/koa.js';
 
 const middleware = jest.fn<void, Parameters<Middleware>>();
 
@@ -15,10 +16,10 @@ const router = new Router()
 const agent = agentFromRouter(router);
 
 describe('createApp', () => {
-  beforeAll(logger.spy);
-
-  afterEach(metricsClient.clear);
-  afterEach(logger.clear);
+  afterEach(() => {
+    metricsClient.clear();
+    stdoutMock.clear();
+  });
 
   it('handles root route', async () => {
     middleware.mockImplementation((ctx) => (ctx.body = ''));
@@ -29,9 +30,7 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toHaveLength(0);
 
     metricsClient.expectTagSubset(['env:test', 'version:test']);
     metricsClient.expectTagSubset([
@@ -51,9 +50,7 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toHaveLength(0);
 
     metricsClient.expectTagSubset([
       'http_method:put',
@@ -72,13 +69,15 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.info).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ status: 404 }),
-      'Client error',
-    );
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        level: 30,
+        method: 'GET',
+        msg: 'Client error',
+        status: 404,
+        url: '/unknown',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -102,13 +101,16 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.info).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ status: 400 }),
-      'Client error',
-    );
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        level: 30,
+        method: 'GET',
+        msg: 'Client error',
+        route: '/',
+        status: 400,
+        url: '/',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -129,13 +131,20 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).not.toHaveBeenCalled();
-
-    expect(logger.info).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ err: expect.any(Error), status: 400 }),
-      'Client error',
-    );
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        err: {
+          statusCode: 400,
+          type: 'BadRequestError',
+        },
+        level: 30,
+        method: 'GET',
+        msg: 'Client error',
+        route: '/',
+        status: 400,
+        url: '/',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -156,13 +165,20 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ err: expect.any(Error), status: 500 }),
-      'Server error',
-    );
-
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        err: {
+          statusCode: 500,
+          type: 'InternalServerError',
+        },
+        level: 50,
+        method: 'GET',
+        msg: 'Server error',
+        route: '/',
+        status: 500,
+        url: '/',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -185,13 +201,20 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ err, status: 500 }),
-      'Server error',
-    );
-
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        err: {
+          message: err.message,
+          type: 'Error',
+        },
+        level: 50,
+        method: 'GET',
+        msg: 'Server error',
+        route: '/',
+        status: 500,
+        url: '/',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -212,13 +235,17 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ err: null, status: 500 }),
-      'Server error',
-    );
-
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        err: null,
+        level: 50,
+        method: 'GET',
+        msg: 'Server error',
+        route: '/',
+        status: 500,
+        url: '/',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',
@@ -241,13 +268,17 @@ describe('createApp', () => {
       .expect('server', /.+/)
       .expect('x-api-version', /.+/);
 
-    expect(logger.error).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ err, status: 500 }),
-      'Server error',
-    );
-
-    expect(logger.info).not.toHaveBeenCalled();
+    expect(stdoutMock.calls).toMatchObject([
+      {
+        err,
+        level: 50,
+        method: 'GET',
+        msg: 'Server error',
+        route: '/',
+        status: 500,
+        url: '/',
+      },
+    ]);
 
     metricsClient.expectTagSubset([
       'http_method:get',

package/template/koa-rest-api/src/framework/server.ts

@@ -8,9 +8,9 @@ import {
   VersionMiddleware,
 } from 'seek-koala';
 
-import { config } from 'src/config.js';
-import { contextMiddleware, logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
+import { config } from '#src/config.js';
+import { contextMiddleware, logger } from '#src/framework/logging.js';
+import { metricsClient } from '#src/framework/metrics.js';
 
 const metrics = MetricsMiddleware.create(
   metricsClient,

package/template/koa-rest-api/src/framework/validation.test.ts

@@ -1,12 +1,12 @@
-import { agentFromMiddleware } from 'src/testing/server.js';
+import { jsonBodyParser } from './bodyParser.js';
+import { validate } from './validation.js';
+
+import { agentFromMiddleware } from '#src/testing/server.js';
 import {
   IdDescriptionSchema,
   chance,
   mockIdDescription,
-} from 'src/testing/types.js';
-
-import { jsonBodyParser } from './bodyParser.js';
-import { validate } from './validation.js';
+} from '#src/testing/types.js';
 
 const agent = agentFromMiddleware(jsonBodyParser, (ctx) => {
   const result = validate({
@@ -43,15 +43,15 @@ describe('validate', () => {
       .expect(422)
       .expect(({ body }) =>
         expect(body).toMatchInlineSnapshot(`
-{
-  "invalidFields": {
-    "~union0/id": "Expected string, received null",
-    "~union1/id": "Expected number, received null",
-    "~union1/summary": "Required",
-  },
-  "message": "Input validation failed",
-}
-`),
+          {
+            "invalidFields": {
+              "~union0/id": "Invalid input: expected string, received null",
+              "~union1/id": "Invalid input: expected number, received null",
+              "~union1/summary": "Invalid input: expected string, received undefined",
+            },
+            "message": "Input validation failed",
+          }
+        `),
       );
   });
 
@@ -62,17 +62,17 @@ describe('validate', () => {
       .expect(422)
       .expect(({ body }) =>
         expect(body).toMatchInlineSnapshot(`
-{
-  "invalidFields": {
-    "~union0/description~union0": "Required",
-    "~union0/description~union1": "Required",
-    "~union0/id": "Required",
-    "~union1/id": "Required",
-    "~union1/summary": "Required",
-  },
-  "message": "Input validation failed",
-}
-`),
+          {
+            "invalidFields": {
+              "~union0/description~union0": "Invalid input: expected string, received undefined",
+              "~union0/description~union1": "Invalid input: expected object, received undefined",
+              "~union0/id": "Invalid input: expected string, received undefined",
+              "~union1/id": "Invalid input: expected number, received undefined",
+              "~union1/summary": "Invalid input: expected string, received undefined",
+            },
+            "message": "Input validation failed",
+          }
+        `),
       ));
 
   it('blocks invalid nested union prop', () => {
@@ -89,17 +89,17 @@ describe('validate', () => {
       .expect(422)
       .expect(({ body }) =>
         expect(body).toMatchInlineSnapshot(`
-{
-  "invalidFields": {
-    "~union0/description~union0": "Expected string, received object",
-    "~union0/description~union1/content": "Required",
-    "~union0/id": "Expected string, received null",
-    "~union1/id": "Expected number, received null",
-    "~union1/summary": "Required",
-  },
-  "message": "Input validation failed",
-}
-`),
+          {
+            "invalidFields": {
+              "~union0/description~union0": "Invalid input: expected string, received object",
+              "~union0/description~union1/content": "Invalid input: expected string, received undefined",
+              "~union0/id": "Invalid input: expected string, received null",
+              "~union1/id": "Invalid input: expected number, received null",
+              "~union1/summary": "Invalid input: expected string, received undefined",
+            },
+            "message": "Input validation failed",
+          }
+        `),
       );
   });
 });

package/template/koa-rest-api/src/framework/validation.ts

@@ -1,7 +1,7 @@
 import { ErrorMiddleware } from 'seek-koala';
-import { ZodIssueCode, type z } from 'zod';
+import type { core, z } from 'zod/v4';
 
-import type { Context } from 'src/types/koa.js';
+import type { Context } from '#src/types/koa.js';
 
 type InvalidFields = Record<string, string>;
 
@@ -35,41 +35,38 @@ type InvalidFields = Record<string, string>;
  * @see [union error example](./validation.test.ts)
  */
 const parseInvalidFieldsFromError = (err: z.ZodError): InvalidFields =>
-  Object.fromEntries(parseTuples(err, {}));
+  Object.fromEntries(parseTuples(err.issues));
 
 const parseTuples = (
-  { errors }: z.ZodError,
-  unions: Record<number, number[]>,
+  errors: core.$ZodIssue[],
+  basePath: Array<string | number | symbol> = [],
+  unions: Record<number, number[]> = {},
 ): Array<readonly [string, string]> =>
   errors.flatMap((issue) => {
-    if (issue.code === ZodIssueCode.invalid_union) {
-      return issue.unionErrors.flatMap((err, idx) =>
-        parseTuples(err, {
+    if (issue.code === 'invalid_union') {
+      return issue.errors.flatMap((err, idx) =>
+        parseTuples(err, issue.path, {
           ...unions,
           [issue.path.length]: [...(unions[issue.path.length] ?? []), idx],
         }),
       );
     }
 
-    const path = ['', ...issue.path]
+    const path = ['', ...basePath, ...issue.path]
       .map((prop, idx) => [prop, ...(unions[idx] ?? [])].join('~union'))
       .join('/');
 
     return [[path, issue.message]] as const;
   });
 
-export const validate = <
-  Output,
-  Def extends z.ZodTypeDef = z.ZodTypeDef,
-  Input = Output,
->({
+export const validate = <Output, Input = Output>({
   ctx,
   input,
   schema,
 }: {
   ctx: Context;
   input: unknown;
-  schema: z.ZodSchema<Output, Def, Input>;
+  schema: z.ZodSchema<Output, Input>;
 }): Output => {
   const parseResult = schema.safeParse(input);
   if (parseResult.success === false) {
@@ -85,15 +82,11 @@ export const validate = <
   return parseResult.data;
 };
 
-export const validateRequestBody = <
-  Output,
-  Def extends z.ZodTypeDef = z.ZodTypeDef,
-  Input = Output,
->(
+export const validateRequestBody = <Output, Input = Output>(
   ctx: Context,
-  schema: z.ZodSchema<Output, Def, Input>,
+  schema: z.ZodSchema<Output, Input>,
 ): Output =>
-  validate<Output, Def, Input>({
+  validate<Output, Input>({
     ctx,
     input: ctx.request.body as unknown,
     schema,

package/template/koa-rest-api/src/listen.ts

@@ -1,5 +1,3 @@
-import './register.js';
-
 import app from './app.js';
 import { config } from './config.js';
 import { logger } from './framework/logging.js';

package/template/koa-rest-api/src/register.ts

@@ -1 +0,0 @@
-import 'skuba-dive/register';

package/template/koa-rest-api/src/storage/jobs.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 
-import type { Job, JobInput } from 'src/types/jobs.js';
+import type { Job, JobInput } from '#src/types/jobs.js';
 
 const jobStore: Record<string, Job> = {};
 

package/template/koa-rest-api/src/testing/metrics.ts

@@ -1,4 +1,4 @@
-import * as metrics from 'src/framework/metrics.js';
+import * as metrics from '#src/framework/metrics.js';
 
 function assertDefined<T>(value: T | undefined): asserts value is T {
   expect(value).toBeDefined();

package/template/koa-rest-api/src/testing/server.ts

@@ -2,7 +2,7 @@ import type Router from '@koa/router';
 import type Koa from 'koa';
 import request from 'supertest';
 
-import { createApp } from 'src/framework/server.js';
+import { createApp } from '#src/framework/server.js';
 
 /**
  * Create a new SuperTest agent from a Koa application.

package/template/koa-rest-api/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
-import type { JobInput } from 'src/types/jobs.js';
+import type { JobInput } from '#src/types/jobs.js';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

package/template/koa-rest-api/src/types/jobs.ts

@@ -1,4 +1,4 @@
-import { z } from 'zod';
+import { z } from 'zod/v4';
 
 export interface Job {
   id: string;

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml

@@ -23,7 +23,7 @@ configs:
       concurrency: 1
       plugins:
         - *docker-ecr-cache
-        - docker-compose#v5.9.0:
+        - docker-compose#v5.10.0:
             dependencies: false
             run: app
             environment:
@@ -52,7 +52,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.9.0:
+      - docker-compose#v5.10.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps