skuba 4.3.1 → 4.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. package/jest/moduleNameMapper.test.ts +7 -8
  2. package/lib/api/jest/index.d.ts +4 -5
  3. package/lib/api/jest/index.js.map +1 -1
  4. package/lib/cli/configure/ensureTemplateCompletion.js +2 -2
  5. package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
  6. package/lib/cli/configure/modules/tsconfig.js +3 -2
  7. package/lib/cli/configure/modules/tsconfig.js.map +1 -1
  8. package/lib/cli/configure/processing/package.d.ts +1 -1
  9. package/lib/cli/configure/processing/package.js +8 -10
  10. package/lib/cli/configure/processing/package.js.map +1 -1
  11. package/package.json +14 -12
  12. package/template/base/_.eslintignore +5 -2
  13. package/template/base/_.gitignore +3 -2
  14. package/template/base/_.prettierignore +5 -2
  15. package/template/express-rest-api/package.json +1 -1
  16. package/template/koa-rest-api/package.json +3 -3
  17. package/template/koa-rest-api/src/api/jobs/postJob.test.ts +7 -3
  18. package/template/koa-rest-api/src/framework/server.test.ts +18 -18
  19. package/template/koa-rest-api/src/framework/validation.test.ts +15 -6
  20. package/template/lambda-sqs-worker/package.json +1 -1
  21. package/template/lambda-sqs-worker/src/app.test.ts +7 -7
  22. package/template/lambda-sqs-worker/src/framework/handler.test.ts +3 -3
  23. package/template/lambda-sqs-worker/src/framework/validation.test.ts +17 -10
  24. package/template/lambda-sqs-worker/src/services/jobScorer.test.ts +2 -2
  25. package/template/lambda-sqs-worker/src/services/pipelineEventSender.test.ts +1 -1
  26. package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +220 -220
  27. package/template/oss-npm-package/_package.json +1 -1
  28. package/template/private-npm-package/_package.json +1 -1
package/jest/moduleNameMapper.test.ts CHANGED
@@ -12,7 +12,7 @@ describe('moduleNameMapper', () => {
12
12
  it('expands wildcard paths', () =>
13
13
  expect(act({ 'src/*': ['src/*'], 'lib/wip/*': ['lib/wip/*'] }))
14
14
  .toMatchInlineSnapshot(`
15
- Object {
15
+ {
16
16
  "^lib/wip$": "<rootDir>/lib/wip",
17
17
  "^lib/wip/(.*)$": "<rootDir>/lib/wip/$1",
18
18
  "^src$": "<rootDir>/src",
@@ -22,7 +22,7 @@ describe('moduleNameMapper', () => {
22
22
 
23
23
  it('expands non-wildcard paths', () =>
24
24
  expect(act({ cli: ['cli'], 'src/': ['src/'] })).toMatchInlineSnapshot(`
25
- Object {
25
+ {
26
26
  "^cli$": "<rootDir>/cli",
27
27
  "^cli/(.*)$": "<rootDir>/cli/$1",
28
28
  "^src$": "<rootDir>/src",
@@ -37,7 +37,7 @@ describe('moduleNameMapper', () => {
37
37
  'jquery/*': ['node_modules/jquery/dist/jquery/*'],
38
38
  }),
39
39
  ).toMatchInlineSnapshot(`
40
- Object {
40
+ {
41
41
  "^jquery$": "<rootDir>/node_modules/jquery/dist/jquery",
42
42
  "^jquery/(.*)$": "<rootDir>/node_modules/jquery/dist/jquery/$1",
43
43
  }
@@ -46,7 +46,7 @@ describe('moduleNameMapper', () => {
46
46
  it('respects a base URL', () =>
47
47
  expect(act({ cli: ['../cli'], 'app/*': ['app/*'] }, 'src'))
48
48
  .toMatchInlineSnapshot(`
49
- Object {
49
+ {
50
50
  "^app$": "<rootDir>/src/app",
51
51
  "^app/(.*)$": "<rootDir>/src/app/$1",
52
52
  "^cli$": "<rootDir>/cli",
@@ -54,12 +54,11 @@ describe('moduleNameMapper', () => {
54
54
  }
55
55
  `));
56
56
 
57
- it('respects no paths', () =>
58
- expect(act({})).toMatchInlineSnapshot(`Object {}`));
57
+ it('respects no paths', () => expect(act({})).toMatchInlineSnapshot(`{}`));
59
58
 
60
59
  it('falls back on undefined paths', () =>
61
60
  expect(act(undefined)).toMatchInlineSnapshot(`
62
- Object {
61
+ {
63
62
  "^src$": "<rootDir>/src",
64
63
  "^src/(.*)$": "<rootDir>/src/$1",
65
64
  }
@@ -67,7 +66,7 @@ describe('moduleNameMapper', () => {
67
66
 
68
67
  it('falls back on invalid config', () =>
69
68
  expect(act('INVALID')).toMatchInlineSnapshot(`
70
- Object {
69
+ {
71
70
  "^src$": "<rootDir>/src",
72
71
  "^src/(.*)$": "<rootDir>/src/$1",
73
72
  }
package/lib/api/jest/index.d.ts CHANGED
@@ -5,13 +5,13 @@ import type { Config } from '@jest/types';
5
5
  * While we technically accept anything compatible with `Config.InitialOptions`,
6
6
  * these are tacitly endorsed for our use cases and receive IntelliSense.
7
7
  */
8
- declare type DefaultOptions = 'collectCoverage' | 'collectCoverageFrom' | 'collectCoverageOnlyFrom' | 'coveragePathIgnorePatterns' | 'coverageThreshold' | 'displayName' | 'globals' | 'globalSetup' | 'globalTeardown' | 'projects' | 'setupFiles' | 'setupFilesAfterEnv' | 'snapshotSerializers' | 'testEnvironment' | 'testPathIgnorePatterns' | 'testTimeout' | 'watchPathIgnorePatterns';
8
+ declare type DefaultOptions = 'collectCoverage' | 'collectCoverageFrom' | 'coveragePathIgnorePatterns' | 'coverageThreshold' | 'displayName' | 'globals' | 'globalSetup' | 'globalTeardown' | 'projects' | 'setupFiles' | 'setupFilesAfterEnv' | 'snapshotSerializers' | 'testEnvironment' | 'testPathIgnorePatterns' | 'testTimeout' | 'watchPathIgnorePatterns';
9
9
  /**
10
10
  * Merge additional Jest options into the **skuba** preset.
11
11
  *
12
12
  * This concatenates array options like `testPathIgnorePatterns`.
13
13
  */
14
- export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "cache" | "runtime" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transform" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "collectCoverageFrom" | "collectCoverageOnlyFrom" | "coverageDirectory" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "preset" | "replname" | "runTestsByPath" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watch" | "watchAll" | "watchman" | "watchPlugins">(options: Pick<Partial<{
14
+ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "cache" | "runtime" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transform" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "workerIdleMemoryLimit" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "collectCoverageFrom" | "coverageDirectory" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "preset" | "replname" | "runTestsByPath" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watch" | "watchAll" | "watchman" | "watchPlugins">(options: Pick<Partial<{
15
15
  automock: boolean;
16
16
  bail: number | boolean;
17
17
  cache: boolean;
@@ -22,9 +22,6 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
22
22
  changedSince: string;
23
23
  collectCoverage: boolean;
24
24
  collectCoverageFrom: string[];
25
- collectCoverageOnlyFrom: {
26
- [key: string]: boolean;
27
- };
28
25
  coverageDirectory: string;
29
26
  coveragePathIgnorePatterns: string[];
30
27
  coverageProvider: "v8" | "babel";
@@ -97,6 +94,7 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
97
94
  snapshotSerializers: string[];
98
95
  snapshotFormat: Partial<{
99
96
  readonly callToJSON: boolean;
97
+ readonly compareKeys: null;
100
98
  readonly escapeRegex: boolean;
101
99
  readonly escapeString: boolean;
102
100
  readonly highlight: boolean;
@@ -140,5 +138,6 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
140
138
  watchAll: boolean;
141
139
  watchman: boolean;
142
140
  watchPlugins: (string | [string, Record<string, unknown>])[];
141
+ workerIdleMemoryLimit: string | number;
143
142
  }>, DefaultOptions | AdditionalOptions>) => Config.InitialOptions;
144
143
  export {};
package/lib/api/jest/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/jest/index.ts"],"names":[],"mappings":";;;;;;AAEA,uEAA8C;AAC9C,kEAAiE;AA2BjE;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAGzB,OAAwE,EACjD,EAAE,CAAC,IAAA,iBAAQ,EAAC,qBAAU,EAAE,OAAO,CAAC,CAAC;AAJ7C,QAAA,WAAW,eAIkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/jest/index.ts"],"names":[],"mappings":";;;;;;AAEA,uEAA8C;AAC9C,kEAAiE;AA0BjE;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAGzB,OAAwE,EACjD,EAAE,CAAC,IAAA,iBAAQ,EAAC,qBAAU,EAAE,OAAO,CAAC,CAAC;AAJ7C,QAAA,WAAW,eAIkC"}
package/lib/cli/configure/ensureTemplateCompletion.js CHANGED
@@ -12,7 +12,7 @@ const logging_1 = require("../../utils/logging");
12
12
  const template_1 = require("../../utils/template");
13
13
  const validation_1 = require("../../utils/validation");
14
14
  const getConfig_1 = require("../init/getConfig");
15
- const json_1 = require("./processing/json");
15
+ const package_1 = require("./processing/package");
16
16
  const ensureTemplateCompletion = async ({ destinationRoot, include, manifest, }) => {
17
17
  const templateConfig = (0, getConfig_1.getTemplateConfig)(destinationRoot);
18
18
  if (templateConfig.fields.length === 0) {
@@ -27,7 +27,7 @@ const ensureTemplateCompletion = async ({ destinationRoot, include, manifest, })
27
27
  message: chalk_1.default.bold(`Complete ${chalk_1.default.cyan(templateName)}:`),
28
28
  name: 'customAnswers',
29
29
  });
30
- const updatedPackageJson = (0, json_1.formatObject)(manifest.packageJson);
30
+ const updatedPackageJson = (0, package_1.formatPackage)(manifest.packageJson);
31
31
  const packageJsonFilepath = path_1.default.join(destinationRoot, 'package.json');
32
32
  await fs_extra_1.default.promises.writeFile(packageJsonFilepath, updatedPackageJson);
33
33
  await (0, copy_1.copyFiles)({
package/lib/cli/configure/ensureTemplateCompletion.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ensureTemplateCompletion.js","sourceRoot":"","sources":["../../../src/cli/configure/ensureTemplateCompletion.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAC1B,wDAA0B;AAG1B,2CAAgE;AAChE,iDAA0C;AAE1C,mDAAoE;AACpE,uDAAuD;AACvD,iDAA+D;AAE/D,4CAAiD;AAQ1C,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,eAAe,EACf,OAAO,EACP,QAAQ,GACF,EAA2B,EAAE;IACnC,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,YAAY,GAAG,IAAA,0BAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC;QACxE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ;QACrC,CAAC,CAAC,UAAU,CAAC;IAEf,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAO,EAAC;QACjC,OAAO,EAAE,cAAc,CAAC,MAAM;QAC9B,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,YAAY,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;QAC5D,IAAI,EAAE,eAAe;KACtB,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAA,mBAAY,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IACvE,MAAM,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;IAErE,MAAM,IAAA,gBAAS,EAAC;QACd,UAAU,EAAE,eAAe;QAC3B,eAAe;QACf,OAAO;QACP,UAAU,EAAE,CAAC,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,IAAA,uCAA4B,EAAC,eAAe,CAAC,CAAC;IAEpD,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAE/B,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAvCW,QAAA,wBAAwB,4BAuCnC"}
1
+ {"version":3,"file":"ensureTemplateCompletion.js","sourceRoot":"","sources":["../../../src/cli/configure/ensureTemplateCompletion.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAC1B,wDAA0B;AAG1B,2CAAgE;AAChE,iDAA0C;AAE1C,mDAAoE;AACpE,uDAAuD;AACvD,iDAA+D;AAE/D,kDAAqD;AAQ9C,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,eAAe,EACf,OAAO,EACP,QAAQ,GACF,EAA2B,EAAE;IACnC,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,YAAY,GAAG,IAAA,0BAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC;QACxE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ;QACrC,CAAC,CAAC,UAAU,CAAC;IAEf,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAO,EAAC;QACjC,OAAO,EAAE,cAAc,CAAC,MAAM;QAC9B,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,YAAY,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;QAC5D,IAAI,EAAE,eAAe;KACtB,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IACvE,MAAM,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;IAErE,MAAM,IAAA,gBAAS,EAAC;QACd,UAAU,EAAE,eAAe;QAC3B,eAAe;QACf,OAAO;QACP,UAAU,EAAE,CAAC,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,IAAA,uCAA4B,EAAC,eAAe,CAAC,CAAC;IAEpD,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAE/B,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAvCW,QAAA,wBAAwB,4BAuCnC"}
package/lib/cli/configure/modules/tsconfig.js CHANGED
@@ -40,14 +40,15 @@ const tsconfigModule = async ({ firstRun, type, }) => {
40
40
  }
41
41
  const outputData = (0, record_1.merge)(inputData ?? {}, baseData);
42
42
  // Remove `lib/**/*` and `lib`, which duplicate `lib*/**/*`
43
- if (Array.isArray(outputData.exclude)) {
43
+ if ((0, validation_1.hasProp)(outputData, 'exclude') && Array.isArray(outputData.exclude)) {
44
44
  const { exclude } = outputData;
45
45
  const hasLibStar = exclude.includes('lib*/**/*');
46
46
  outputData.exclude = exclude.filter((pattern) => !(hasLibStar && new Set(['lib', 'lib/**/*']).has(pattern)));
47
47
  }
48
48
  // for optimal ESLinting, base config should compile all files and leave
49
49
  // exclusions to .eslintignore and tsconfig.build.json
50
- if (!initialFiles['tsconfig.json']?.includes('skuba/config/tsconfig.json')) {
50
+ if ((0, validation_1.hasProp)(outputData, 'include') &&
51
+ !initialFiles['tsconfig.json']?.includes('skuba/config/tsconfig.json')) {
51
52
  delete outputData.include;
52
53
  }
53
54
  // Retain comments for package documentation
package/lib/cli/configure/modules/tsconfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tsconfig.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/tsconfig.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,0DAA6E;AAC7E,6CAA+D;AAC/D,uDAAoD;AACpD,iDAA6C;AAGtC,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,QAAQ,EACR,IAAI,GACI,EAAmB,EAAE;IAC7B,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,+BAAoB,EAAC,qBAAqB,CAAC;QAC3C,IAAA,+BAAoB,EAAC,eAAe,CAAC;KACtC,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAA,kBAAW,EAAC,QAAQ,CAAC,CAAC;IAEvC,kEAAkE;IAClE,IACE,IAAA,oBAAO,EAAC,QAAQ,EAAE,iBAAiB,CAAC;QACpC,IAAA,oBAAO,EAAC,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,EAC3C;QACA,OAAO,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC;KACxC;IAED,yCAAyC;IACzC,IACE,IAAI,KAAK,SAAS;QAClB,IAAA,oBAAO,EAAC,QAAQ,EAAE,iBAAiB,CAAC;QACpC,IAAA,qBAAQ,EAAC,QAAQ,CAAC,eAAe,CAAC,EAClC;QACA,OAAO,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC;QACxC,OAAO,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC;KACvC;IAED,OAAO;QACL,GAAG,IAAA,qBAAS,EAAC,YAAY,CAAC;QAE1B,qBAAqB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,IAAI,SAAS;QAE5D,eAAe,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;YAClD,MAAM,SAAS,GAAG,IAAA,kBAAW,EAAC,SAAS,CAAC,CAAC;YAEzC,IAAI,MAA0B,CAAC;YAE/B,IACE,IAAA,oBAAO,EAAC,SAAS,EAAE,iBAAiB,CAAC;gBACrC,IAAA,0BAAa,EAAC,SAAS,CAAC,eAAe,EAAE,QAAQ,CAAC,EAClD;gBACA,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;aAC9D;YAED,4DAA4D;YAC5D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,KAAK,EAAE;gBAC5C,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,OAAO,CAC1C,IAAI,MAAM,CAAC,WAAW,MAAM,UAAU,EAAE,GAAG,CAAC,EAC5C,SAAS,CACV,CAAC;aACH;YAED,MAAM,UAAU,GAAG,IAAA,cAAK,EAAC,SAAS,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;YAEpD,2DAA2D;YAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACrC,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;gBAE/B,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAEjD,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CACjC,CAAC,OAAgB,EAAE,EAAE,CACnB,CAAC,CAAC,UAAU,IAAI,IAAI,GAAG,CAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CACtE,CAAC;aACH;YAED,wEAAwE;YACxE,sDAAsD;YACtD,IACE,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,4BAA4B,CAAC,EACtE;gBACA,OAAO,UAAU,CAAC,OAAO,CAAC;aAC3B;YAED,4CAA4C;YAC5C,IACE,QAAQ;gBACR,IAAI,KAAK,SAAS;gBAClB,IAAA,qBAAQ,EAAC,UAAU,CAAC,eAAe,CAAC;gBACpC,CAAC,UAAU,CAAC,eAAe,CAAC,cAAc,EAC1C;gBACA,UAAU,CAAC,eAAe,CAAC,cAAc,GAAG,KAAK,CAAC;aACnD;YAED,OAAO,IAAA,mBAAY,EAAC,UAAU,CAAC,CAAC;QAClC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAzFW,QAAA,cAAc,kBAyFzB"}
1
+ {"version":3,"file":"tsconfig.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/tsconfig.ts"],"names":[],"mappings":"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"}
package/lib/cli/configure/processing/package.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { PackageJson } from '../types';
2
- export declare const formatPackage: (data: PackageJson) => string;
2
+ export declare const formatPackage: (rawData: PackageJson) => string;
3
3
  export declare const parsePackage: (input: string | undefined) => PackageJson | undefined;
4
4
  export declare const createDependencyFilter: (names: readonly string[], type: 'dependencies' | 'devDependencies') => (data: PackageJson) => {
5
5
  [x: string]: unknown;
package/lib/cli/configure/processing/package.js CHANGED
@@ -5,16 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.withPackage = exports.createDependencyFilter = exports.parsePackage = exports.formatPackage = void 0;
7
7
  const normalize_package_data_1 = __importDefault(require("normalize-package-data"));
8
- const validation_1 = require("../../../utils/validation");
8
+ const sort_package_json_1 = __importDefault(require("sort-package-json"));
9
9
  const json_1 = require("./json");
10
- const sortRecord = (record) => Object.fromEntries(Object.entries(record).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)));
11
- const formatPackage = (data) => {
12
- (0, normalize_package_data_1.default)(data);
13
- for (const [key, value] of Object.entries(data)) {
14
- if (key !== 'scripts' && (0, validation_1.isObject)(value) && !Array.isArray(value)) {
15
- data[key] = sortRecord(value);
16
- }
17
- }
10
+ const prettier_1 = require("./prettier");
11
+ const formatPackage = (rawData) => {
12
+ (0, normalize_package_data_1.default)(rawData);
13
+ const data = (0, sort_package_json_1.default)(rawData);
18
14
  // normalize-package-data fields that aren't useful for applications
19
15
  delete data._id;
20
16
  if (data.name === '') {
@@ -26,7 +22,9 @@ const formatPackage = (data) => {
26
22
  if (data.version === '') {
27
23
  delete data.version;
28
24
  }
29
- return (0, json_1.formatObject)(data, 'package.json');
25
+ return (0, prettier_1.formatPrettier)(JSON.stringify(data), {
26
+ filepath: 'package.json',
27
+ });
30
28
  };
31
29
  exports.formatPackage = formatPackage;
32
30
  const parsePackage = (input) => {
package/lib/cli/configure/processing/package.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/processing/package.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAmD;AAEnD,0DAAqD;AAGrD,iCAAmD;AAEnD,MAAM,UAAU,GAAG,CAAI,MAAyB,EAAqB,EAAE,CACrE,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAC1E,CAAC;AAEG,MAAM,aAAa,GAAG,CAAC,IAAiB,EAAE,EAAE;IACjD,IAAA,gCAAa,EAAC,IAAI,CAAC,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/C,IAAI,GAAG,KAAK,SAAS,IAAI,IAAA,qBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACjE,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;SAC/B;KACF;IAED,oEAAoE;IAEpE,OAAO,IAAI,CAAC,GAAG,CAAC;IAEhB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,8BAA8B,EAAE;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC;KACpB;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,EAAE,EAAE;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC;KACrB;IAED,OAAO,IAAA,mBAAY,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAC5C,CAAC,CAAC;AA1BW,QAAA,aAAa,iBA0BxB;AAEK,MAAM,YAAY,GAAG,CAC1B,KAAyB,EACA,EAAE;IAC3B,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO;KACR;IAED,IAAA,gCAAa,EAAC,IAAI,CAAC,CAAC;IAEpB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAZW,QAAA,YAAY,gBAYvB;AAEK,MAAM,sBAAsB,GAAG,CACpC,KAAwB,EACxB,IAAwC,EACxC,EAAE;IACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAE3B,OAAO,CAAC,IAAiB,EAAE,EAAE,CAAC,CAAC;QAC7B,GAAG,IAAI;QACP,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACpE;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC;AAEK,MAAM,WAAW,GACtB,CAAC,EAAsC,EAAE,EAAE,CAAC,CAAC,KAAyB,EAAE,EAAE;IACxE,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IAExC,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAE3C,OAAO,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAC;AAPS,QAAA,WAAW,eAOpB"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/processing/package.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAmD;AACnD,0EAAgD;AAIhD,iCAAqC;AACrC,yCAA4C;AAErC,MAAM,aAAa,GAAG,CAAC,OAAoB,EAAE,EAAE;IACpD,IAAA,gCAAa,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,OAAO,CAAC,CAAC;IAEtC,oEAAoE;IAEpE,OAAO,IAAI,CAAC,GAAG,CAAC;IAEhB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,8BAA8B,EAAE;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC;KACpB;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,EAAE,EAAE;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC;KACrB;IAED,OAAO,IAAA,yBAAc,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QAC1C,QAAQ,EAAE,cAAc;KACzB,CAAC,CAAC;AACL,CAAC,CAAC;AAxBW,QAAA,aAAa,iBAwBxB;AAEK,MAAM,YAAY,GAAG,CAC1B,KAAyB,EACA,EAAE;IAC3B,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO;KACR;IAED,IAAA,gCAAa,EAAC,IAAI,CAAC,CAAC;IAEpB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAZW,QAAA,YAAY,gBAYvB;AAEK,MAAM,sBAAsB,GAAG,CACpC,KAAwB,EACxB,IAAwC,EACxC,EAAE;IACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAE3B,OAAO,CAAC,IAAiB,EAAE,EAAE,CAAC,CAAC;QAC7B,GAAG,IAAI;QACP,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACpE;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC;AAEK,MAAM,WAAW,GACtB,CAAC,EAAsC,EAAE,EAAE,CAAC,CAAC,KAAyB,EAAE,EAAE;IACxE,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IAExC,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAE3C,OAAO,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAC;AAPS,QAAA,WAAW,eAOpB"}
package/package.json CHANGED
@@ -6,11 +6,12 @@
6
6
  "url": "https://github.com/seek-oss/skuba/issues"
7
7
  },
8
8
  "dependencies": {
9
+ "@jest/types": "^29.0.0",
9
10
  "@octokit/graphql": "^5.0.0",
10
- "@octokit/graphql-schema": "^10.73.0",
11
+ "@octokit/graphql-schema": "^12.0.0",
11
12
  "@octokit/rest": "^19.0.0",
12
- "@octokit/types": "^6.34.0",
13
- "@types/jest": "^28.0.0",
13
+ "@octokit/types": "^7.0.0",
14
+ "@types/jest": "^29.0.0",
14
15
  "@types/node": ">=14.18",
15
16
  "chalk": "^4.1.0",
16
17
  "concurrently": "^7.0.0",
@@ -18,7 +19,7 @@
18
19
  "ejs": "^3.1.6",
19
20
  "enquirer": "^2.3.6",
20
21
  "eslint": "^8.11.0",
21
- "eslint-config-skuba": "1.1.1",
22
+ "eslint-config-skuba": "1.1.4",
22
23
  "execa": "^5.0.0",
23
24
  "fdir": "^5.0.0",
24
25
  "fs-extra": "^10.0.0",
@@ -27,8 +28,8 @@
27
28
  "ignore": "^5.1.8",
28
29
  "is-installed-globally": "^0.4.0",
29
30
  "isomorphic-git": "^1.11.1",
30
- "jest": "^28.1.0",
31
- "jest-watch-typeahead": "^2.0.0",
31
+ "jest": "^29.0.1",
32
+ "jest-watch-typeahead": "^2.1.1",
32
33
  "lodash.mergewith": "^4.6.2",
33
34
  "normalize-package-data": "^4.0.0",
34
35
  "npm-run-path": "^4.0.1",
@@ -41,20 +42,21 @@
41
42
  "semantic-release": "^19.0.0",
42
43
  "serialize-error": "^8.0.1",
43
44
  "simple-git": "^3.5.0",
45
+ "sort-package-json": "^1.57.0",
44
46
  "strip-ansi": "^6.0.1",
45
47
  "ts-dedent": "^2.2.0",
46
- "ts-jest": "^28.0.2",
48
+ "ts-jest": "^29.0.0-next.0",
47
49
  "ts-node": "^10.7.0",
48
50
  "ts-node-dev": "^2.0.0",
49
51
  "tsconfig-paths": "^4.0.0",
50
52
  "tsconfig-seek": "1.0.2",
51
- "typescript": "~4.7.0"
53
+ "typescript": "~4.8.2"
52
54
  },
53
55
  "description": "SEEK development toolkit for backend applications and packages",
54
56
  "devDependencies": {
55
- "@changesets/cli": "2.24.1",
57
+ "@changesets/cli": "2.24.3",
56
58
  "@changesets/get-github-info": "0.5.1",
57
- "@jest/reporters": "28.1.3",
59
+ "@jest/reporters": "29.0.1",
58
60
  "@types/ejs": "3.1.1",
59
61
  "@types/express": "4.17.13",
60
62
  "@types/fs-extra": "9.0.13",
@@ -124,7 +126,7 @@
124
126
  },
125
127
  "repository": {
126
128
  "type": "git",
127
- "url": "git+https://github.com/seek-oss/skuba.git"
129
+ "url": "git+ssh://git@github.com/seek-oss/skuba.git"
128
130
  },
129
131
  "resolutions": {
130
132
  "**/@types/node": ">=14.18"
@@ -152,5 +154,5 @@
152
154
  "version": "4.0.0"
153
155
  },
154
156
  "types": "./lib/index.d.ts",
155
- "version": "4.3.1"
157
+ "version": "4.4.0"
156
158
  }
package/template/base/_.eslintignore CHANGED
@@ -1,7 +1,10 @@
1
1
  # managed by skuba
2
- .idea/
2
+ .idea/*
3
+ .vscode/*
4
+
5
+ .cdk.staging/
3
6
  .serverless/
4
- .vscode/
7
+ cdk.out/
5
8
  node_modules*/
6
9
 
7
10
  /coverage*/
package/template/base/_.gitignore CHANGED
@@ -1,8 +1,9 @@
1
1
  # managed by skuba
2
+ .idea/*
3
+ .vscode/*
4
+
2
5
  .cdk.staging/
3
- .idea/
4
6
  .serverless/
5
- .vscode/
6
7
  cdk.out/
7
8
  node_modules*/
8
9
 
package/template/base/_.prettierignore CHANGED
@@ -1,7 +1,10 @@
1
1
  # managed by skuba
2
- .idea/
2
+ .idea/*
3
+ .vscode/*
4
+
5
+ .cdk.staging/
3
6
  .serverless/
4
- .vscode/
7
+ cdk.out/
5
8
  node_modules*/
6
9
 
7
10
  /coverage*/
package/template/express-rest-api/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "@types/express": "^4.17.13",
9
9
  "@types/node": "^16.0.0",
10
10
  "@types/supertest": "^2.0.11",
11
- "pino-pretty": "^8.0.0",
11
+ "pino-pretty": "^9.0.0",
12
12
  "skuba": "*",
13
13
  "supertest": "^6.1.6"
14
14
  },
package/template/koa-rest-api/package.json CHANGED
@@ -4,8 +4,8 @@
4
4
  "@opentelemetry/api": "^1.1.0",
5
5
  "@opentelemetry/exporter-collector-grpc": "^0.25.0",
6
6
  "@opentelemetry/instrumentation-aws-sdk": "^0.8.0",
7
- "@opentelemetry/instrumentation-http": "^0.31.0",
8
- "@opentelemetry/sdk-node": "^0.31.0",
7
+ "@opentelemetry/instrumentation-http": "^0.32.0",
8
+ "@opentelemetry/sdk-node": "^0.32.0",
9
9
  "@seek/logger": "^5.0.1",
10
10
  "aws-sdk": "^2.1039.0",
11
11
  "hot-shots": "^9.0.0",
@@ -28,7 +28,7 @@
28
28
  "@types/supertest": "^2.0.11",
29
29
  "@types/uuid": "^8.3.1",
30
30
  "chance": "^1.1.8",
31
- "pino-pretty": "^8.0.0",
31
+ "pino-pretty": "^9.0.0",
32
32
  "skuba": "*",
33
33
  "supertest": "^6.1.6"
34
34
  },
package/template/koa-rest-api/src/api/jobs/postJob.test.ts CHANGED
@@ -26,9 +26,13 @@ describe('postJobHandler', () => {
26
26
  .send(jobInput)
27
27
  .expect(422)
28
28
  .expect(({ text }) =>
29
- expect(text).toMatchInlineSnapshot(
30
- `"Expected { hirer: { id: string; }; }, but was incompatible"`,
31
- ),
29
+ expect(text).toMatchInlineSnapshot(`
30
+ "Validation failed:
31
+ {
32
+ "hirer": "Expected { id: string; }, but was missing"
33
+ }.
34
+ Object should match { hirer: { id: string; }; }"
35
+ `),
32
36
  );
33
37
  });
34
38
  });
package/template/koa-rest-api/src/framework/server.test.ts CHANGED
@@ -29,9 +29,9 @@ describe('createApp', () => {
29
29
  .expect('server', /.+/)
30
30
  .expect('x-api-version', /.+/);
31
31
 
32
- expect(logger.error).not.toBeCalled();
32
+ expect(logger.error).not.toHaveBeenCalled();
33
33
 
34
- expect(logger.info).not.toBeCalled();
34
+ expect(logger.info).not.toHaveBeenCalled();
35
35
 
36
36
  metricsClient.expectTagSubset(['env:test', 'version:test']);
37
37
  metricsClient.expectTagSubset([
@@ -51,9 +51,9 @@ describe('createApp', () => {
51
51
  .expect('server', /.+/)
52
52
  .expect('x-api-version', /.+/);
53
53
 
54
- expect(logger.error).not.toBeCalled();
54
+ expect(logger.error).not.toHaveBeenCalled();
55
55
 
56
- expect(logger.info).not.toBeCalled();
56
+ expect(logger.info).not.toHaveBeenCalled();
57
57
 
58
58
  metricsClient.expectTagSubset([
59
59
  'http_method:put',
@@ -72,9 +72,9 @@ describe('createApp', () => {
72
72
  .expect('server', /.+/)
73
73
  .expect('x-api-version', /.+/);
74
74
 
75
- expect(logger.error).not.toBeCalled();
75
+ expect(logger.error).not.toHaveBeenCalled();
76
76
 
77
- expect(logger.info).nthCalledWith(
77
+ expect(logger.info).toHaveBeenNthCalledWith(
78
78
  1,
79
79
  expect.objectContaining({ status: 404 }),
80
80
  'Client error',
@@ -102,9 +102,9 @@ describe('createApp', () => {
102
102
  .expect('server', /.+/)
103
103
  .expect('x-api-version', /.+/);
104
104
 
105
- expect(logger.error).not.toBeCalled();
105
+ expect(logger.error).not.toHaveBeenCalled();
106
106
 
107
- expect(logger.info).nthCalledWith(
107
+ expect(logger.info).toHaveBeenNthCalledWith(
108
108
  1,
109
109
  expect.objectContaining({ status: 400 }),
110
110
  'Client error',
@@ -129,9 +129,9 @@ describe('createApp', () => {
129
129
  .expect('server', /.+/)
130
130
  .expect('x-api-version', /.+/);
131
131
 
132
- expect(logger.error).not.toBeCalled();
132
+ expect(logger.error).not.toHaveBeenCalled();
133
133
 
134
- expect(logger.info).nthCalledWith(
134
+ expect(logger.info).toHaveBeenNthCalledWith(
135
135
  1,
136
136
  expect.objectContaining({ err: expect.any(Error), status: 400 }),
137
137
  'Client error',
@@ -156,13 +156,13 @@ describe('createApp', () => {
156
156
  .expect('server', /.+/)
157
157
  .expect('x-api-version', /.+/);
158
158
 
159
- expect(logger.error).nthCalledWith(
159
+ expect(logger.error).toHaveBeenNthCalledWith(
160
160
  1,
161
161
  expect.objectContaining({ err: expect.any(Error), status: 500 }),
162
162
  'Server error',
163
163
  );
164
164
 
165
- expect(logger.info).not.toBeCalled();
165
+ expect(logger.info).not.toHaveBeenCalled();
166
166
 
167
167
  metricsClient.expectTagSubset([
168
168
  'http_method:get',
@@ -185,13 +185,13 @@ describe('createApp', () => {
185
185
  .expect('server', /.+/)
186
186
  .expect('x-api-version', /.+/);
187
187
 
188
- expect(logger.error).nthCalledWith(
188
+ expect(logger.error).toHaveBeenNthCalledWith(
189
189
  1,
190
190
  expect.objectContaining({ err, status: 500 }),
191
191
  'Server error',
192
192
  );
193
193
 
194
- expect(logger.info).not.toBeCalled();
194
+ expect(logger.info).not.toHaveBeenCalled();
195
195
 
196
196
  metricsClient.expectTagSubset([
197
197
  'http_method:get',
@@ -213,13 +213,13 @@ describe('createApp', () => {
213
213
  .expect('server', /.+/)
214
214
  .expect('x-api-version', /.+/);
215
215
 
216
- expect(logger.error).nthCalledWith(
216
+ expect(logger.error).toHaveBeenNthCalledWith(
217
217
  1,
218
218
  expect.objectContaining({ err: null, status: 500 }),
219
219
  'Server error',
220
220
  );
221
221
 
222
- expect(logger.info).not.toBeCalled();
222
+ expect(logger.info).not.toHaveBeenCalled();
223
223
 
224
224
  metricsClient.expectTagSubset([
225
225
  'http_method:get',
@@ -242,13 +242,13 @@ describe('createApp', () => {
242
242
  .expect('server', /.+/)
243
243
  .expect('x-api-version', /.+/);
244
244
 
245
- expect(logger.error).nthCalledWith(
245
+ expect(logger.error).toHaveBeenNthCalledWith(
246
246
  1,
247
247
  expect.objectContaining({ err, status: 500 }),
248
248
  'Server error',
249
249
  );
250
250
 
251
- expect(logger.info).not.toBeCalled();
251
+ expect(logger.info).not.toHaveBeenCalled();
252
252
 
253
253
  metricsClient.expectTagSubset([
254
254
  'http_method:get',
package/template/koa-rest-api/src/framework/validation.test.ts CHANGED
@@ -42,9 +42,13 @@ describe('validate', () => {
42
42
  .send({ ...idDescription, id: null })
43
43
  .expect(422)
44
44
  .expect(({ text }) =>
45
- expect(text).toMatchInlineSnapshot(
46
- `"Expected { id: string; description: string; }, but was incompatible"`,
47
- ),
45
+ expect(text).toMatchInlineSnapshot(`
46
+ "Validation failed:
47
+ {
48
+ "id": "Expected string, but was null"
49
+ }.
50
+ Object should match { id: string; description: string; }"
51
+ `),
48
52
  );
49
53
  });
50
54
 
@@ -54,8 +58,13 @@ describe('validate', () => {
54
58
  .send({})
55
59
  .expect(422)
56
60
  .expect(({ text }) =>
57
- expect(text).toMatchInlineSnapshot(
58
- `"Expected { id: string; description: string; }, but was incompatible"`,
59
- ),
61
+ expect(text).toMatchInlineSnapshot(`
62
+ "Validation failed:
63
+ {
64
+ "id": "Expected string, but was missing",
65
+ "description": "Expected string, but was missing"
66
+ }.
67
+ Object should match { id: string; description: string; }"
68
+ `),
60
69
  ));
61
70
  });
package/template/lambda-sqs-worker/package.json CHANGED
@@ -12,7 +12,7 @@
12
12
  "@types/chance": "^1.1.3",
13
13
  "@types/node": "^16.0.0",
14
14
  "chance": "^1.1.8",
15
- "pino-pretty": "^8.0.0",
15
+ "pino-pretty": "^9.0.0",
16
16
  "serverless": "^3.17.0",
17
17
  "serverless-plugin-canary-deployments": "^0.8.0",
18
18
  "serverless-prune-plugin": "^2.0.0",
package/template/lambda-sqs-worker/src/app.test.ts CHANGED
@@ -42,9 +42,9 @@ describe('handler', () => {
42
42
 
43
43
  await expect(app.handler(event, ctx)).resolves.toBeUndefined();
44
44
 
45
- expect(scoringService.request).toBeCalledTimes(1);
45
+ expect(scoringService.request).toHaveBeenCalledTimes(1);
46
46
 
47
- expect(logger.error).not.toBeCalled();
47
+ expect(logger.error).not.toHaveBeenCalled();
48
48
 
49
49
  expect(logger.info.mock.calls).toEqual([
50
50
  [{ count: 1 }, 'received jobs'],
@@ -57,7 +57,7 @@ describe('handler', () => {
57
57
  ['job.scored', 1],
58
58
  ]);
59
59
 
60
- expect(sns.publish).toBeCalledTimes(1);
60
+ expect(sns.publish).toHaveBeenCalledTimes(1);
61
61
  });
62
62
 
63
63
  it('throws on invalid input', () => {
@@ -75,7 +75,7 @@ describe('handler', () => {
75
75
 
76
76
  await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
77
77
 
78
- expect(logger.error).toBeCalledWith({ err }, 'request');
78
+ expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
79
79
  });
80
80
 
81
81
  it('bubbles up SNS error', async () => {
@@ -87,7 +87,7 @@ describe('handler', () => {
87
87
 
88
88
  await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
89
89
 
90
- expect(logger.error).toBeCalledWith({ err }, 'request');
90
+ expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
91
91
  });
92
92
 
93
93
  it('throws on zero records', async () => {
@@ -97,7 +97,7 @@ describe('handler', () => {
97
97
 
98
98
  await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
99
99
 
100
- expect(logger.error).toBeCalledWith({ err }, 'request');
100
+ expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
101
101
  });
102
102
 
103
103
  it('throws on multiple records', async () => {
@@ -110,6 +110,6 @@ describe('handler', () => {
110
110
 
111
111
  await expect(app.handler(event, ctx)).rejects.toThrow('invoke error');
112
112
 
113
- expect(logger.error).toBeCalledWith({ err }, 'request');
113
+ expect(logger.error).toHaveBeenCalledWith({ err }, 'request');
114
114
  });
115
115
  });