@alma-cdk/construct-library 0.0.10 → 0.0.12
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.
package/.jsii
CHANGED
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
},
|
|
126
126
|
"locationInModule": {
|
|
127
127
|
"filename": "src/AlmaCdkConstructLibrary.ts",
|
|
128
|
-
"line":
|
|
128
|
+
"line": 106
|
|
129
129
|
},
|
|
130
130
|
"parameters": [
|
|
131
131
|
{
|
|
@@ -139,7 +139,7 @@
|
|
|
139
139
|
"kind": "class",
|
|
140
140
|
"locationInModule": {
|
|
141
141
|
"filename": "src/AlmaCdkConstructLibrary.ts",
|
|
142
|
-
"line":
|
|
142
|
+
"line": 103
|
|
143
143
|
},
|
|
144
144
|
"name": "AlmaCdkConstructLibrary",
|
|
145
145
|
"properties": [
|
|
@@ -150,7 +150,7 @@
|
|
|
150
150
|
"immutable": true,
|
|
151
151
|
"locationInModule": {
|
|
152
152
|
"filename": "src/AlmaCdkConstructLibrary.ts",
|
|
153
|
-
"line":
|
|
153
|
+
"line": 104
|
|
154
154
|
},
|
|
155
155
|
"name": "workflowNodeVersion",
|
|
156
156
|
"type": {
|
|
@@ -171,7 +171,7 @@
|
|
|
171
171
|
"kind": "interface",
|
|
172
172
|
"locationInModule": {
|
|
173
173
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
174
|
-
"line":
|
|
174
|
+
"line": 57
|
|
175
175
|
},
|
|
176
176
|
"name": "AlmaCdkConstructLibraryOptions",
|
|
177
177
|
"properties": [
|
|
@@ -183,7 +183,7 @@
|
|
|
183
183
|
"immutable": true,
|
|
184
184
|
"locationInModule": {
|
|
185
185
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
186
|
-
"line":
|
|
186
|
+
"line": 60
|
|
187
187
|
},
|
|
188
188
|
"name": "author",
|
|
189
189
|
"type": {
|
|
@@ -198,7 +198,7 @@
|
|
|
198
198
|
"immutable": true,
|
|
199
199
|
"locationInModule": {
|
|
200
200
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
201
|
-
"line":
|
|
201
|
+
"line": 61
|
|
202
202
|
},
|
|
203
203
|
"name": "authorAddress",
|
|
204
204
|
"type": {
|
|
@@ -213,7 +213,7 @@
|
|
|
213
213
|
"immutable": true,
|
|
214
214
|
"locationInModule": {
|
|
215
215
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
216
|
-
"line":
|
|
216
|
+
"line": 63
|
|
217
217
|
},
|
|
218
218
|
"name": "description",
|
|
219
219
|
"type": {
|
|
@@ -228,7 +228,7 @@
|
|
|
228
228
|
"immutable": true,
|
|
229
229
|
"locationInModule": {
|
|
230
230
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
231
|
-
"line":
|
|
231
|
+
"line": 59
|
|
232
232
|
},
|
|
233
233
|
"name": "majorVersion",
|
|
234
234
|
"type": {
|
|
@@ -243,7 +243,7 @@
|
|
|
243
243
|
"immutable": true,
|
|
244
244
|
"locationInModule": {
|
|
245
245
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
246
|
-
"line":
|
|
246
|
+
"line": 62
|
|
247
247
|
},
|
|
248
248
|
"name": "name",
|
|
249
249
|
"type": {
|
|
@@ -258,7 +258,7 @@
|
|
|
258
258
|
"immutable": true,
|
|
259
259
|
"locationInModule": {
|
|
260
260
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
261
|
-
"line":
|
|
261
|
+
"line": 65
|
|
262
262
|
},
|
|
263
263
|
"name": "repositoryUrl",
|
|
264
264
|
"type": {
|
|
@@ -273,7 +273,7 @@
|
|
|
273
273
|
"immutable": true,
|
|
274
274
|
"locationInModule": {
|
|
275
275
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
276
|
-
"line":
|
|
276
|
+
"line": 58
|
|
277
277
|
},
|
|
278
278
|
"name": "stability",
|
|
279
279
|
"type": {
|
|
@@ -288,7 +288,7 @@
|
|
|
288
288
|
"immutable": true,
|
|
289
289
|
"locationInModule": {
|
|
290
290
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
291
|
-
"line":
|
|
291
|
+
"line": 70
|
|
292
292
|
},
|
|
293
293
|
"name": "bundledDeps",
|
|
294
294
|
"optional": true,
|
|
@@ -309,7 +309,7 @@
|
|
|
309
309
|
"immutable": true,
|
|
310
310
|
"locationInModule": {
|
|
311
311
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
312
|
-
"line":
|
|
312
|
+
"line": 68
|
|
313
313
|
},
|
|
314
314
|
"name": "deps",
|
|
315
315
|
"optional": true,
|
|
@@ -330,7 +330,7 @@
|
|
|
330
330
|
"immutable": true,
|
|
331
331
|
"locationInModule": {
|
|
332
332
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
333
|
-
"line":
|
|
333
|
+
"line": 69
|
|
334
334
|
},
|
|
335
335
|
"name": "devDeps",
|
|
336
336
|
"optional": true,
|
|
@@ -351,7 +351,7 @@
|
|
|
351
351
|
"immutable": true,
|
|
352
352
|
"locationInModule": {
|
|
353
353
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
354
|
-
"line":
|
|
354
|
+
"line": 64
|
|
355
355
|
},
|
|
356
356
|
"name": "keywords",
|
|
357
357
|
"optional": true,
|
|
@@ -372,7 +372,7 @@
|
|
|
372
372
|
"immutable": true,
|
|
373
373
|
"locationInModule": {
|
|
374
374
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
375
|
-
"line":
|
|
375
|
+
"line": 73
|
|
376
376
|
},
|
|
377
377
|
"name": "maxNodeVersion",
|
|
378
378
|
"optional": true,
|
|
@@ -388,7 +388,7 @@
|
|
|
388
388
|
"immutable": true,
|
|
389
389
|
"locationInModule": {
|
|
390
390
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
391
|
-
"line":
|
|
391
|
+
"line": 71
|
|
392
392
|
},
|
|
393
393
|
"name": "minNodeVersion",
|
|
394
394
|
"optional": true,
|
|
@@ -404,7 +404,7 @@
|
|
|
404
404
|
"immutable": true,
|
|
405
405
|
"locationInModule": {
|
|
406
406
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
407
|
-
"line":
|
|
407
|
+
"line": 66
|
|
408
408
|
},
|
|
409
409
|
"name": "releaseBranches",
|
|
410
410
|
"optional": true,
|
|
@@ -425,7 +425,7 @@
|
|
|
425
425
|
"immutable": true,
|
|
426
426
|
"locationInModule": {
|
|
427
427
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
428
|
-
"line":
|
|
428
|
+
"line": 67
|
|
429
429
|
},
|
|
430
430
|
"name": "releaseEnvironment",
|
|
431
431
|
"optional": true,
|
|
@@ -442,7 +442,7 @@
|
|
|
442
442
|
"immutable": true,
|
|
443
443
|
"locationInModule": {
|
|
444
444
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
445
|
-
"line":
|
|
445
|
+
"line": 75
|
|
446
446
|
},
|
|
447
447
|
"name": "sonarProjectPropertiesExtraLines",
|
|
448
448
|
"optional": true,
|
|
@@ -463,7 +463,7 @@
|
|
|
463
463
|
"immutable": true,
|
|
464
464
|
"locationInModule": {
|
|
465
465
|
"filename": "src/schemas/almaCdkConstructLibraryOptions.ts",
|
|
466
|
-
"line":
|
|
466
|
+
"line": 72
|
|
467
467
|
},
|
|
468
468
|
"name": "workflowNodeVersion",
|
|
469
469
|
"optional": true,
|
|
@@ -475,6 +475,6 @@
|
|
|
475
475
|
"symbolId": "src/schemas/almaCdkConstructLibraryOptions:AlmaCdkConstructLibraryOptions"
|
|
476
476
|
}
|
|
477
477
|
},
|
|
478
|
-
"version": "0.0.
|
|
479
|
-
"fingerprint": "
|
|
478
|
+
"version": "0.0.12",
|
|
479
|
+
"fingerprint": "xazH5Y5wlLEA5O7NZPGPYXqDNjkEqNklQ/M/G5Im0wc="
|
|
480
480
|
}
|
|
@@ -14,77 +14,84 @@ const CDK_VERSION = '2.220.0';
|
|
|
14
14
|
const CONSTRUCTS_VERSION = '10.3.0';
|
|
15
15
|
const JSII_VERSION = '~5.9.0';
|
|
16
16
|
const JEST_VERSION = '^30';
|
|
17
|
+
const DEFAULT_KEYWORDS = ['cdk', 'aws-cdk', 'awscdk', 'aws'];
|
|
18
|
+
const PRETTIER_IGNORE_PATTERNS = [
|
|
19
|
+
'.github/**/*',
|
|
20
|
+
'.projen/**/*',
|
|
21
|
+
'.vscode/**/*',
|
|
22
|
+
'coverage/**/*',
|
|
23
|
+
'dist/**/*',
|
|
24
|
+
'/*.*',
|
|
25
|
+
'!.projenrc.ts',
|
|
26
|
+
];
|
|
27
|
+
const DEFAULT_GITIGNORE_PATTERNS = [
|
|
28
|
+
'.DS_Store',
|
|
29
|
+
'/examples/**/cdk.context.json',
|
|
30
|
+
'/examples/**/node_modules',
|
|
31
|
+
'/examples/**/cdk.out',
|
|
32
|
+
'/examples/**/.git',
|
|
33
|
+
'TODO.md',
|
|
34
|
+
'.scannerwork/',
|
|
35
|
+
'**/*.drawio.bkp',
|
|
36
|
+
'**/*.afdesign~lock~',
|
|
37
|
+
];
|
|
38
|
+
function buildKeywords(keywords) {
|
|
39
|
+
return (0, uniqueKeywordsCaseInsensitive_1.uniqueKeywordsCaseInsensitive)([...DEFAULT_KEYWORDS, ...keywords]);
|
|
40
|
+
}
|
|
41
|
+
function buildPublishToPypiOptions(name) {
|
|
42
|
+
const { scope, packageName } = (0, name_1.parseScopedPackageName)(name);
|
|
43
|
+
return {
|
|
44
|
+
distName: `${scope}.${packageName}`,
|
|
45
|
+
module: `${scope.replace(/-/g, '_')}.${packageName.replace(/-/g, '_')}`,
|
|
46
|
+
trustedPublishing: true,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
function buildPublishToGoOptions(repositoryUrl) {
|
|
50
|
+
return {
|
|
51
|
+
moduleName: `${repositoryUrl.replace('https://', '').replace('.git', '')}-go`,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
function buildAwsCdkConstructLibraryOptions(validatedOptions) {
|
|
55
|
+
return {
|
|
56
|
+
...validatedOptions,
|
|
57
|
+
// Package manager & projen
|
|
58
|
+
projenCommand: 'pnpm exec projen',
|
|
59
|
+
authorOrganization: true,
|
|
60
|
+
defaultReleaseBranch: 'main',
|
|
61
|
+
packageManager: projen_1.javascript.NodePackageManager.PNPM,
|
|
62
|
+
npmAccess: projen_1.javascript.NpmAccess.PUBLIC,
|
|
63
|
+
npmTrustedPublishing: true,
|
|
64
|
+
projenrcTs: true,
|
|
65
|
+
jsiiVersion: JSII_VERSION,
|
|
66
|
+
keywords: buildKeywords(validatedOptions.keywords),
|
|
67
|
+
jestOptions: {
|
|
68
|
+
jestVersion: JEST_VERSION,
|
|
69
|
+
updateSnapshot: javascript_1.UpdateSnapshot.NEVER,
|
|
70
|
+
},
|
|
71
|
+
// Code quality (Prettier)
|
|
72
|
+
prettier: true,
|
|
73
|
+
prettierOptions: {
|
|
74
|
+
ignoreFileOptions: {
|
|
75
|
+
ignorePatterns: [...PRETTIER_IGNORE_PATTERNS],
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
// Publishing
|
|
79
|
+
publishToPypi: buildPublishToPypiOptions(validatedOptions.name),
|
|
80
|
+
publishToGo: buildPublishToGoOptions(validatedOptions.repositoryUrl),
|
|
81
|
+
// CDK
|
|
82
|
+
cdkVersion: CDK_VERSION,
|
|
83
|
+
constructsVersion: CONSTRUCTS_VERSION,
|
|
84
|
+
// Git & dev
|
|
85
|
+
gitignore: [...DEFAULT_GITIGNORE_PATTERNS],
|
|
86
|
+
tsconfigDev: {
|
|
87
|
+
include: ['AlmaCdkConstructLibrary/**/*.ts'],
|
|
88
|
+
},
|
|
89
|
+
};
|
|
90
|
+
}
|
|
17
91
|
class AlmaCdkConstructLibrary extends projen_1.awscdk.AwsCdkConstructLibrary {
|
|
18
92
|
constructor(options) {
|
|
19
93
|
const validatedOptions = almaCdkConstructLibraryOptions_1.almaCdkConstructLibraryOptionsSchema.parse(options);
|
|
20
|
-
|
|
21
|
-
const opts = {
|
|
22
|
-
...validatedOptions,
|
|
23
|
-
// Package manager & projen
|
|
24
|
-
projenCommand: 'pnpm exec projen',
|
|
25
|
-
authorOrganization: true,
|
|
26
|
-
defaultReleaseBranch: 'main',
|
|
27
|
-
packageManager: projen_1.javascript.NodePackageManager.PNPM,
|
|
28
|
-
npmAccess: projen_1.javascript.NpmAccess.PUBLIC,
|
|
29
|
-
npmTrustedPublishing: true,
|
|
30
|
-
projenrcTs: true,
|
|
31
|
-
jsiiVersion: JSII_VERSION,
|
|
32
|
-
keywords: (0, uniqueKeywordsCaseInsensitive_1.uniqueKeywordsCaseInsensitive)([
|
|
33
|
-
'cdk',
|
|
34
|
-
'aws-cdk',
|
|
35
|
-
'awscdk',
|
|
36
|
-
'aws',
|
|
37
|
-
...validatedOptions.keywords,
|
|
38
|
-
]),
|
|
39
|
-
jestOptions: {
|
|
40
|
-
jestVersion: JEST_VERSION,
|
|
41
|
-
updateSnapshot: javascript_1.UpdateSnapshot.NEVER,
|
|
42
|
-
},
|
|
43
|
-
// Code quality (Prettier)
|
|
44
|
-
prettier: true,
|
|
45
|
-
prettierOptions: {
|
|
46
|
-
ignoreFileOptions: {
|
|
47
|
-
ignorePatterns: [
|
|
48
|
-
'.github/**/*',
|
|
49
|
-
'.projen/**/*',
|
|
50
|
-
'.vscode/**/*',
|
|
51
|
-
'coverage/**/*',
|
|
52
|
-
'dist/**/*',
|
|
53
|
-
'/*.*',
|
|
54
|
-
'!.projenrc.ts',
|
|
55
|
-
],
|
|
56
|
-
},
|
|
57
|
-
},
|
|
58
|
-
// Publishing
|
|
59
|
-
publishToPypi: {
|
|
60
|
-
distName: `${packageScope}.${packageName}`,
|
|
61
|
-
module: `${packageScope.replace('-', '_')}.${packageName.replace('-', '_')}`,
|
|
62
|
-
trustedPublishing: true,
|
|
63
|
-
},
|
|
64
|
-
publishToGo: {
|
|
65
|
-
moduleName: `${validatedOptions.repositoryUrl.replace('https://', '').replace('.git', '')}-go`,
|
|
66
|
-
},
|
|
67
|
-
// CDK
|
|
68
|
-
cdkVersion: CDK_VERSION,
|
|
69
|
-
constructsVersion: CONSTRUCTS_VERSION,
|
|
70
|
-
// Git & dev
|
|
71
|
-
gitignore: [
|
|
72
|
-
'.DS_Store',
|
|
73
|
-
'/examples/**/cdk.context.json',
|
|
74
|
-
'/examples/**/node_modules',
|
|
75
|
-
'/examples/**/cdk.out',
|
|
76
|
-
'/examples/**/.git',
|
|
77
|
-
'TODO.md',
|
|
78
|
-
'.scannerwork/',
|
|
79
|
-
'**/*.drawio.bkp',
|
|
80
|
-
'**/*.afdesign~lock~',
|
|
81
|
-
],
|
|
82
|
-
tsconfigDev: {
|
|
83
|
-
include: ['AlmaCdkConstructLibrary/**/*.ts'],
|
|
84
|
-
},
|
|
85
|
-
};
|
|
86
|
-
super(opts);
|
|
87
|
-
// Schema default ensures this is set
|
|
94
|
+
super(buildAwsCdkConstructLibraryOptions(validatedOptions));
|
|
88
95
|
this.workflowNodeVersion = validatedOptions.workflowNodeVersion;
|
|
89
96
|
this.addDevDeps('typescript@^5.9'); // Defaults to very old typescript@4.9
|
|
90
97
|
this.addDevDeps('@types/semver@^7');
|
|
@@ -102,5 +109,5 @@ class AlmaCdkConstructLibrary extends projen_1.awscdk.AwsCdkConstructLibrary {
|
|
|
102
109
|
}
|
|
103
110
|
exports.AlmaCdkConstructLibrary = AlmaCdkConstructLibrary;
|
|
104
111
|
_a = JSII_RTTI_SYMBOL_1;
|
|
105
|
-
AlmaCdkConstructLibrary[_a] = { fqn: "@alma-cdk/construct-library.AlmaCdkConstructLibrary", version: "0.0.
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
AlmaCdkConstructLibrary[_a] = { fqn: "@alma-cdk/construct-library.AlmaCdkConstructLibrary", version: "0.0.12" };
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AlmaCdkConstructLibrary.js","sourceRoot":"","sources":["../src/AlmaCdkConstructLibrary.ts"],"names":[],"mappings":"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","sourcesContent":["import { awscdk, javascript } from 'projen';\nimport { UpdateSnapshot } from 'projen/lib/javascript';\nimport { z } from 'zod';\nimport { NodeConfig } from './NodeConfig';\nimport {\n  almaCdkConstructLibraryOptionsSchema,\n  type AlmaCdkConstructLibraryOptions,\n} from './schemas/almaCdkConstructLibraryOptions';\nimport { parseScopedPackageName } from './schemas/name';\nimport { SonarCloudReportWorkflow } from './SonarCloudReportWorkflow';\nimport { uniqueKeywordsCaseInsensitive } from './uniqueKeywordsCaseInsensitive';\n\nexport type { AlmaCdkConstructLibraryOptions } from './schemas/almaCdkConstructLibraryOptions';\n\nconst CDK_VERSION = '2.220.0';\nconst CONSTRUCTS_VERSION = '10.3.0';\nconst JSII_VERSION = '~5.9.0';\nconst JEST_VERSION = '^30';\nconst DEFAULT_KEYWORDS = ['cdk', 'aws-cdk', 'awscdk', 'aws'] as const;\nconst PRETTIER_IGNORE_PATTERNS = [\n  '.github/**/*',\n  '.projen/**/*',\n  '.vscode/**/*',\n  'coverage/**/*',\n  'dist/**/*',\n  '/*.*',\n  '!.projenrc.ts',\n] as const;\nconst DEFAULT_GITIGNORE_PATTERNS = [\n  '.DS_Store',\n  '/examples/**/cdk.context.json',\n  '/examples/**/node_modules',\n  '/examples/**/cdk.out',\n  '/examples/**/.git',\n  'TODO.md',\n  '.scannerwork/',\n  '**/*.drawio.bkp',\n  '**/*.afdesign~lock~',\n] as const;\n\ntype ValidatedOptions = z.infer<typeof almaCdkConstructLibraryOptionsSchema>;\n\nfunction buildKeywords(keywords: readonly string[]): string[] {\n  return uniqueKeywordsCaseInsensitive([...DEFAULT_KEYWORDS, ...keywords]);\n}\n\nfunction buildPublishToPypiOptions(name: string) {\n  const { scope, packageName } = parseScopedPackageName(name);\n\n  return {\n    distName: `${scope}.${packageName}`,\n    module: `${scope.replace(/-/g, '_')}.${packageName.replace(/-/g, '_')}`,\n    trustedPublishing: true,\n  };\n}\n\nfunction buildPublishToGoOptions(repositoryUrl: string) {\n  return {\n    moduleName: `${repositoryUrl.replace('https://', '').replace('.git', '')}-go`,\n  };\n}\n\nfunction buildAwsCdkConstructLibraryOptions(\n  validatedOptions: ValidatedOptions,\n): awscdk.AwsCdkConstructLibraryOptions {\n  return {\n    ...validatedOptions,\n    // Package manager & projen\n    projenCommand: 'pnpm exec projen',\n    authorOrganization: true,\n    defaultReleaseBranch: 'main',\n    packageManager: javascript.NodePackageManager.PNPM,\n    npmAccess: javascript.NpmAccess.PUBLIC,\n    npmTrustedPublishing: true,\n    projenrcTs: true,\n    jsiiVersion: JSII_VERSION,\n    keywords: buildKeywords(validatedOptions.keywords),\n    jestOptions: {\n      jestVersion: JEST_VERSION,\n      updateSnapshot: UpdateSnapshot.NEVER,\n    },\n    // Code quality (Prettier)\n    prettier: true,\n    prettierOptions: {\n      ignoreFileOptions: {\n        ignorePatterns: [...PRETTIER_IGNORE_PATTERNS],\n      },\n    },\n    // Publishing\n    publishToPypi: buildPublishToPypiOptions(validatedOptions.name),\n    publishToGo: buildPublishToGoOptions(validatedOptions.repositoryUrl),\n    // CDK\n    cdkVersion: CDK_VERSION,\n    constructsVersion: CONSTRUCTS_VERSION,\n    // Git & dev\n    gitignore: [...DEFAULT_GITIGNORE_PATTERNS],\n    tsconfigDev: {\n      include: ['AlmaCdkConstructLibrary/**/*.ts'],\n    },\n  };\n}\n\nexport class AlmaCdkConstructLibrary extends awscdk.AwsCdkConstructLibrary {\n  public readonly workflowNodeVersion: string;\n\n  constructor(options: AlmaCdkConstructLibraryOptions) {\n    const validatedOptions =\n      almaCdkConstructLibraryOptionsSchema.parse(options);\n    super(buildAwsCdkConstructLibraryOptions(validatedOptions));\n\n    this.workflowNodeVersion = validatedOptions.workflowNodeVersion;\n\n    this.addDevDeps('typescript@^5.9'); // Defaults to very old typescript@4.9\n    this.addDevDeps('@types/semver@^7');\n    this.addDevDeps('json-schema-to-typescript@^15');\n\n    this.addBundledDeps('zod@4');\n    this.addBundledDeps('semver@7');\n\n    this.addTask('format', {\n      exec: 'prettier --write .',\n    });\n\n    new SonarCloudReportWorkflow(this, {\n      sonarProjectPropertiesExtraLines:\n        validatedOptions.sonarProjectPropertiesExtraLines,\n    });\n\n    new NodeConfig(this);\n  }\n}\n"]}
|
|
@@ -4,6 +4,20 @@ exports.SonarCloudReportWorkflow = void 0;
|
|
|
4
4
|
const projen_1 = require("projen");
|
|
5
5
|
const github_1 = require("projen/lib/github");
|
|
6
6
|
const workflows_model_1 = require("projen/lib/github/workflows-model");
|
|
7
|
+
const name_1 = require("./schemas/name");
|
|
8
|
+
function buildSonarProjectPropertiesLines(projectName, extraLines = []) {
|
|
9
|
+
const { scope, packageName } = (0, name_1.parseScopedPackageName)(projectName);
|
|
10
|
+
return [
|
|
11
|
+
'sonar.host.url=https://sonarcloud.io',
|
|
12
|
+
`sonar.projectKey=${scope}_${packageName}`,
|
|
13
|
+
`sonar.organization=${scope}`,
|
|
14
|
+
'sonar.javascript.lcov.reportPaths=./coverage/lcov.info',
|
|
15
|
+
'sonar.sources=./src',
|
|
16
|
+
'sonar.tests=./test',
|
|
17
|
+
'sonar.test.inclusions=**/*.test.*',
|
|
18
|
+
...extraLines,
|
|
19
|
+
];
|
|
20
|
+
}
|
|
7
21
|
class SonarCloudReportWorkflow {
|
|
8
22
|
constructor(project, options) {
|
|
9
23
|
const sonarCloudReportWorkflow = project.github?.addWorkflow('sonarcloud-report');
|
|
@@ -42,20 +56,11 @@ class SonarCloudReportWorkflow {
|
|
|
42
56
|
/**
|
|
43
57
|
* Sonarcloud properties file
|
|
44
58
|
*/
|
|
45
|
-
const sonarProjectPropertiesLines =
|
|
46
|
-
'sonar.host.url=https://sonarcloud.io',
|
|
47
|
-
`sonar.projectKey=${project.name.replace('@', '').replace('/', '_')}`,
|
|
48
|
-
`sonar.organization=${project.name.replace('@', '').split('/')[0]}`,
|
|
49
|
-
'sonar.javascript.lcov.reportPaths=./coverage/lcov.info',
|
|
50
|
-
'sonar.sources=./src',
|
|
51
|
-
'sonar.tests=./test',
|
|
52
|
-
'sonar.test.inclusions=**/*.test.*',
|
|
53
|
-
...(options?.sonarProjectPropertiesExtraLines ?? []),
|
|
54
|
-
];
|
|
59
|
+
const sonarProjectPropertiesLines = buildSonarProjectPropertiesLines(project.name, options?.sonarProjectPropertiesExtraLines);
|
|
55
60
|
new projen_1.TextFile(project, 'sonar-project.properties', {
|
|
56
61
|
lines: sonarProjectPropertiesLines,
|
|
57
62
|
});
|
|
58
63
|
}
|
|
59
64
|
}
|
|
60
65
|
exports.SonarCloudReportWorkflow = SonarCloudReportWorkflow;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU29uYXJDbG91ZFJlcG9ydFdvcmtmbG93LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1NvbmFyQ2xvdWRSZXBvcnRXb3JrZmxvdy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBMEM7QUFDMUMsOENBQWtEO0FBQ2xELHVFQUFrRTtBQUNsRSx5Q0FBd0Q7QUFPeEQsU0FBUyxnQ0FBZ0MsQ0FDdkMsV0FBbUIsRUFDbkIsYUFBZ0MsRUFBRTtJQUVsQyxNQUFNLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxHQUFHLElBQUEsNkJBQXNCLEVBQUMsV0FBVyxDQUFDLENBQUM7SUFFbkUsT0FBTztRQUNMLHNDQUFzQztRQUN0QyxvQkFBb0IsS0FBSyxJQUFJLFdBQVcsRUFBRTtRQUMxQyxzQkFBc0IsS0FBSyxFQUFFO1FBQzdCLHdEQUF3RDtRQUN4RCxxQkFBcUI7UUFDckIsb0JBQW9CO1FBQ3BCLG1DQUFtQztRQUNuQyxHQUFHLFVBQVU7S0FDZCxDQUFDO0FBQ0osQ0FBQztBQUVELE1BQWEsd0JBQXdCO0lBQ25DLFlBQ0UsT0FBc0MsRUFDdEMsT0FBeUM7UUFFekMsTUFBTSx3QkFBd0IsR0FDNUIsT0FBTyxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsbUJBQW1CLENBQUMsQ0FBQztRQUVuRCx3QkFBd0IsRUFBRSxFQUFFLENBQUM7WUFDM0IsSUFBSSxFQUFFLEVBQUUsUUFBUSxFQUFFLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxFQUFFO1lBQ3BDLFdBQVcsRUFBRTtnQkFDWCxLQUFLLEVBQUUsQ0FBQyxRQUFRLEVBQUUsYUFBYSxFQUFFLFVBQVUsQ0FBQzthQUM3QztTQUNGLENBQUMsQ0FBQztRQUVILHdCQUF3QixFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsRUFBRTtZQUNwRCxNQUFNLEVBQUUsQ0FBQyxlQUFlLENBQUM7WUFDekIsV0FBVyxFQUFFO2dCQUNYLFFBQVEsRUFBRSwrQkFBYSxDQUFDLElBQUk7YUFDN0I7WUFDRCxLQUFLLEVBQUU7Z0JBQ0wsc0JBQWEsQ0FBQyxRQUFRLENBQUM7b0JBQ3JCLElBQUksRUFBRTt3QkFDSixVQUFVLEVBQUUsQ0FBQztxQkFDZDtpQkFDRixDQUFDO2dCQUNGLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixFQUFFO2dCQUNoQztvQkFDRSxJQUFJLEVBQUUsV0FBVztvQkFDakIsR0FBRyxFQUFFLGVBQWU7aUJBQ3JCO2dCQUNEO29CQUNFLElBQUksRUFBRSxpQkFBaUI7b0JBQ3ZCLElBQUksRUFBRSxzQ0FBc0M7b0JBQzVDLEdBQUcsRUFBRTt3QkFDSCxZQUFZLEVBQUUsNkJBQTZCO3dCQUMzQyxXQUFXLEVBQUUsNEJBQTRCO3FCQUMxQztpQkFDRjthQUNGO1NBQ0YsQ0FBQyxDQUFDO1FBRUg7O1dBRUc7UUFDSCxNQUFNLDJCQUEyQixHQUFHLGdDQUFnQyxDQUNsRSxPQUFPLENBQUMsSUFBSSxFQUNaLE9BQU8sRUFBRSxnQ0FBZ0MsQ0FDMUMsQ0FBQztRQUVGLElBQUksaUJBQVEsQ0FBQyxPQUFPLEVBQUUsMEJBQTBCLEVBQUU7WUFDaEQsS0FBSyxFQUFFLDJCQUEyQjtTQUNuQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUF0REQsNERBc0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgYXdzY2RrLCBUZXh0RmlsZSB9IGZyb20gJ3Byb2plbic7XG5pbXBvcnQgeyBXb3JrZmxvd1N0ZXBzIH0gZnJvbSAncHJvamVuL2xpYi9naXRodWInO1xuaW1wb3J0IHsgSm9iUGVybWlzc2lvbiB9IGZyb20gJ3Byb2plbi9saWIvZ2l0aHViL3dvcmtmbG93cy1tb2RlbCc7XG5pbXBvcnQgeyBwYXJzZVNjb3BlZFBhY2thZ2VOYW1lIH0gZnJvbSAnLi9zY2hlbWFzL25hbWUnO1xuXG5leHBvcnQgaW50ZXJmYWNlIFNvbmFyQ2xvdWRSZXBvcnRXb3JrZmxvd09wdGlvbnMge1xuICAvKiogTGluZXMgYXBwZW5kZWQgYWZ0ZXIgdGhlIGRlZmF1bHQgYHNvbmFyLXByb2plY3QucHJvcGVydGllc2AgY29udGVudC4gKi9cbiAgcmVhZG9ubHkgc29uYXJQcm9qZWN0UHJvcGVydGllc0V4dHJhTGluZXM/OiByZWFkb25seSBzdHJpbmdbXTtcbn1cblxuZnVuY3Rpb24gYnVpbGRTb25hclByb2plY3RQcm9wZXJ0aWVzTGluZXMoXG4gIHByb2plY3ROYW1lOiBzdHJpbmcsXG4gIGV4dHJhTGluZXM6IHJlYWRvbmx5IHN0cmluZ1tdID0gW10sXG4pOiBzdHJpbmdbXSB7XG4gIGNvbnN0IHsgc2NvcGUsIHBhY2thZ2VOYW1lIH0gPSBwYXJzZVNjb3BlZFBhY2thZ2VOYW1lKHByb2plY3ROYW1lKTtcblxuICByZXR1cm4gW1xuICAgICdzb25hci5ob3N0LnVybD1odHRwczovL3NvbmFyY2xvdWQuaW8nLFxuICAgIGBzb25hci5wcm9qZWN0S2V5PSR7c2NvcGV9XyR7cGFja2FnZU5hbWV9YCxcbiAgICBgc29uYXIub3JnYW5pemF0aW9uPSR7c2NvcGV9YCxcbiAgICAnc29uYXIuamF2YXNjcmlwdC5sY292LnJlcG9ydFBhdGhzPS4vY292ZXJhZ2UvbGNvdi5pbmZvJyxcbiAgICAnc29uYXIuc291cmNlcz0uL3NyYycsXG4gICAgJ3NvbmFyLnRlc3RzPS4vdGVzdCcsXG4gICAgJ3NvbmFyLnRlc3QuaW5jbHVzaW9ucz0qKi8qLnRlc3QuKicsXG4gICAgLi4uZXh0cmFMaW5lcyxcbiAgXTtcbn1cblxuZXhwb3J0IGNsYXNzIFNvbmFyQ2xvdWRSZXBvcnRXb3JrZmxvdyB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByb2plY3Q6IGF3c2Nkay5Bd3NDZGtDb25zdHJ1Y3RMaWJyYXJ5LFxuICAgIG9wdGlvbnM/OiBTb25hckNsb3VkUmVwb3J0V29ya2Zsb3dPcHRpb25zLFxuICApIHtcbiAgICBjb25zdCBzb25hckNsb3VkUmVwb3J0V29ya2Zsb3cgPVxuICAgICAgcHJvamVjdC5naXRodWI/LmFkZFdvcmtmbG93KCdzb25hcmNsb3VkLXJlcG9ydCcpO1xuXG4gICAgc29uYXJDbG91ZFJlcG9ydFdvcmtmbG93Py5vbih7XG4gICAgICBwdXNoOiB7IGJyYW5jaGVzOiBbJ21haW4nLCAnYmV0YSddIH0sXG4gICAgICBwdWxsUmVxdWVzdDoge1xuICAgICAgICB0eXBlczogWydvcGVuZWQnLCAnc3luY2hyb25pemUnLCAncmVvcGVuZWQnXSxcbiAgICAgIH0sXG4gICAgfSk7XG5cbiAgICBzb25hckNsb3VkUmVwb3J0V29ya2Zsb3c/LmFkZEpvYignc29uYXJjbG91ZC1yZXBvcnQnLCB7XG4gICAgICBydW5zT246IFsndWJ1bnR1LWxhdGVzdCddLFxuICAgICAgcGVybWlzc2lvbnM6IHtcbiAgICAgICAgY29udGVudHM6IEpvYlBlcm1pc3Npb24uUkVBRCxcbiAgICAgIH0sXG4gICAgICBzdGVwczogW1xuICAgICAgICBXb3JrZmxvd1N0ZXBzLmNoZWNrb3V0KHtcbiAgICAgICAgICB3aXRoOiB7XG4gICAgICAgICAgICBmZXRjaERlcHRoOiAwLFxuICAgICAgICAgIH0sXG4gICAgICAgIH0pLFxuICAgICAgICAuLi5wcm9qZWN0LnJlbmRlcldvcmtmbG93U2V0dXAoKSxcbiAgICAgICAge1xuICAgICAgICAgIG5hbWU6ICdSdW4gdGVzdHMnLFxuICAgICAgICAgIHJ1bjogJ3BucG0gcnVuIHRlc3QnLFxuICAgICAgICB9LFxuICAgICAgICB7XG4gICAgICAgICAgbmFtZTogJ1NvbmFyQ2xvdWQgU2NhbicsXG4gICAgICAgICAgdXNlczogJ1NvbmFyU291cmNlL3NvbmFycXViZS1zY2FuLWFjdGlvbkB2NycsXG4gICAgICAgICAgZW52OiB7XG4gICAgICAgICAgICBHSVRIVUJfVE9LRU46ICcke3sgc2VjcmV0cy5HSVRIVUJfVE9LRU4gfX0nLFxuICAgICAgICAgICAgU09OQVJfVE9LRU46ICcke3sgc2VjcmV0cy5TT05BUl9UT0tFTiB9fScsXG4gICAgICAgICAgfSxcbiAgICAgICAgfSxcbiAgICAgIF0sXG4gICAgfSk7XG5cbiAgICAvKipcbiAgICAgKiBTb25hcmNsb3VkIHByb3BlcnRpZXMgZmlsZVxuICAgICAqL1xuICAgIGNvbnN0IHNvbmFyUHJvamVjdFByb3BlcnRpZXNMaW5lcyA9IGJ1aWxkU29uYXJQcm9qZWN0UHJvcGVydGllc0xpbmVzKFxuICAgICAgcHJvamVjdC5uYW1lLFxuICAgICAgb3B0aW9ucz8uc29uYXJQcm9qZWN0UHJvcGVydGllc0V4dHJhTGluZXMsXG4gICAgKTtcblxuICAgIG5ldyBUZXh0RmlsZShwcm9qZWN0LCAnc29uYXItcHJvamVjdC5wcm9wZXJ0aWVzJywge1xuICAgICAgbGluZXM6IHNvbmFyUHJvamVjdFByb3BlcnRpZXNMaW5lcyxcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -59,8 +59,8 @@ export declare const almaCdkConstructLibraryOptionsSchema: z.ZodObject<{
|
|
|
59
59
|
deps: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
60
60
|
devDeps: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
61
61
|
bundledDeps: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
62
|
-
minNodeVersion: z.ZodDefault<z.
|
|
63
|
-
workflowNodeVersion: z.ZodDefault<z.
|
|
64
|
-
maxNodeVersion: z.ZodDefault<z.
|
|
62
|
+
minNodeVersion: z.ZodDefault<z.ZodString>;
|
|
63
|
+
workflowNodeVersion: z.ZodDefault<z.ZodString>;
|
|
64
|
+
maxNodeVersion: z.ZodDefault<z.ZodString>;
|
|
65
65
|
sonarProjectPropertiesExtraLines: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
66
66
|
}, z.core.$strip>;
|
|
@@ -8,21 +8,19 @@ const name_1 = require("./name");
|
|
|
8
8
|
const repositoryUrl_1 = require("./repositoryUrl");
|
|
9
9
|
/** Positive integer (≥ 1) */
|
|
10
10
|
const positiveInteger = zod_1.z.number().int().positive();
|
|
11
|
+
function coerceValidSemver(value) {
|
|
12
|
+
const coerced = semver.coerce(value);
|
|
13
|
+
return coerced != null && semver.valid(coerced) != null ? coerced : null;
|
|
14
|
+
}
|
|
11
15
|
/**
|
|
12
|
-
* Node/engine version: must
|
|
13
|
-
*
|
|
16
|
+
* Node/engine version: must be valid semver or coercible to one (e.g. major-only `20`).
|
|
17
|
+
* Parsed output is the original string — no normalization (e.g. `20` stays `20`, not `20.0.0`).
|
|
14
18
|
*/
|
|
15
|
-
const nodeVersionStringSchema = zod_1.z
|
|
16
|
-
.string()
|
|
17
|
-
.refine((s) => {
|
|
18
|
-
const coerced = semver.coerce(s);
|
|
19
|
-
return coerced != null && semver.valid(coerced) != null;
|
|
20
|
-
}, { message: 'Must be a valid semver or coercible to one' })
|
|
21
|
-
.transform((s) => semver.coerce(s).version);
|
|
19
|
+
const nodeVersionStringSchema = zod_1.z.string().refine((s) => coerceValidSemver(s) != null, { message: 'Must be a valid semver or coercible to one' });
|
|
22
20
|
function validateNodeVersionOrder(opts) {
|
|
23
|
-
const min =
|
|
24
|
-
const max =
|
|
25
|
-
const workflow =
|
|
21
|
+
const min = coerceValidSemver(opts.minNodeVersion);
|
|
22
|
+
const max = coerceValidSemver(opts.maxNodeVersion);
|
|
23
|
+
const workflow = coerceValidSemver(opts.workflowNodeVersion);
|
|
26
24
|
if (min == null || max == null || workflow == null)
|
|
27
25
|
return true; // let field-level validation handle invalid semver
|
|
28
26
|
return (semver.lte(min, max) &&
|
|
@@ -40,7 +38,11 @@ exports.branchOptionsSchema = zod_1.z.object({
|
|
|
40
38
|
tagPrefix: zod_1.z.string().optional(),
|
|
41
39
|
npmDistTag: zod_1.z.string().optional(),
|
|
42
40
|
});
|
|
41
|
+
const NODEJS_MIN_VERSION = '20';
|
|
42
|
+
const NODEJS_MAX_VERSION = '24';
|
|
43
43
|
/** Projen AwsCdkConstructLibrary options with validation and defaults (min/max/workflow Node versions, scoped name, etc.). */
|
|
44
|
+
// JSII cannot infer this schema shape cleanly, so we keep the runtime schema
|
|
45
|
+
// and its public options interface aligned explicitly.
|
|
44
46
|
exports.almaCdkConstructLibraryOptionsSchema = zod_1.z
|
|
45
47
|
.object({
|
|
46
48
|
stability: zod_1.z.enum(projen_1.cdk.Stability),
|
|
@@ -56,12 +58,12 @@ exports.almaCdkConstructLibraryOptionsSchema = zod_1.z
|
|
|
56
58
|
deps: zod_1.z.array(zod_1.z.string()).optional(),
|
|
57
59
|
devDeps: zod_1.z.array(zod_1.z.string()).optional(),
|
|
58
60
|
bundledDeps: zod_1.z.array(zod_1.z.string()).optional(),
|
|
59
|
-
minNodeVersion: nodeVersionStringSchema.default(
|
|
60
|
-
workflowNodeVersion: nodeVersionStringSchema.default(
|
|
61
|
-
maxNodeVersion: nodeVersionStringSchema.default(
|
|
61
|
+
minNodeVersion: nodeVersionStringSchema.default(NODEJS_MIN_VERSION),
|
|
62
|
+
workflowNodeVersion: nodeVersionStringSchema.default(NODEJS_MAX_VERSION),
|
|
63
|
+
maxNodeVersion: nodeVersionStringSchema.default(NODEJS_MAX_VERSION),
|
|
62
64
|
sonarProjectPropertiesExtraLines: zod_1.z.array(zod_1.z.string()).optional(),
|
|
63
65
|
})
|
|
64
66
|
.refine(validateNodeVersionOrder, {
|
|
65
67
|
message: 'Node versions must satisfy min <= workflow <= max',
|
|
66
68
|
});
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
69
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"almaCdkConstructLibraryOptions.js","sourceRoot":"","sources":["../../src/schemas/almaCdkConstructLibraryOptions.ts"],"names":[],"mappings":"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","sourcesContent":["import { awscdk, cdk } from 'projen';\nimport { BranchOptions } from 'projen/lib/release';\nimport * as semver from 'semver';\nimport { z } from 'zod';\nimport { nameSchema } from './name';\nimport { repositoryUrlSchema } from './repositoryUrl';\n\n/** Positive integer (≥ 1) */\nconst positiveInteger = z.number().int().positive();\n\nfunction coerceValidSemver(value: string): semver.SemVer | null {\n  const coerced = semver.coerce(value);\n  return coerced != null && semver.valid(coerced) != null ? coerced : null;\n}\n\n/**\n * Node/engine version: must be valid semver or coercible to one (e.g. major-only `20`).\n * Parsed output is the original string — no normalization (e.g. `20` stays `20`, not `20.0.0`).\n */\nconst nodeVersionStringSchema = z.string().refine(\n  (s) => coerceValidSemver(s) != null,\n  { message: 'Must be a valid semver or coercible to one' },\n);\n\nfunction validateNodeVersionOrder(opts: {\n  minNodeVersion: string;\n  maxNodeVersion: string;\n  workflowNodeVersion: string;\n}): boolean {\n  const min = coerceValidSemver(opts.minNodeVersion);\n  const max = coerceValidSemver(opts.maxNodeVersion);\n  const workflow = coerceValidSemver(opts.workflowNodeVersion);\n  if (min == null || max == null || workflow == null) return true; // let field-level validation handle invalid semver\n  return (\n    semver.lte(min, max) &&\n    semver.lte(min, workflow) &&\n    semver.lte(workflow, max)\n  );\n}\n\n/** Options for a release branch (matches projen BranchOptions) */\nexport const branchOptionsSchema = z.object({\n  workflowName: z.string().optional(),\n  environment: z.string().optional(),\n  majorVersion: positiveInteger,\n  minMajorVersion: positiveInteger.optional(),\n  minorVersion: positiveInteger.optional(),\n  prerelease: z.string().optional(),\n  tagPrefix: z.string().optional(),\n  npmDistTag: z.string().optional(),\n});\n\n\n/**\n * Needs to be manually typed due to JSII limitations.\n */\nexport interface AlmaCdkConstructLibraryOptions {\n  readonly stability: cdk.Stability;\n  readonly majorVersion: number;\n  readonly author: string;\n  readonly authorAddress: string;\n  readonly name: string;\n  readonly description: string;\n  readonly keywords?: string[];\n  readonly repositoryUrl: string;\n  readonly releaseBranches?: Record<string, BranchOptions>;\n  readonly releaseEnvironment?: string;\n  readonly deps?: string[];\n  readonly devDeps?: string[];\n  readonly bundledDeps?: string[];\n  readonly minNodeVersion?: string;\n  readonly workflowNodeVersion?: string;\n  readonly maxNodeVersion?: string;\n  /** Appended to generated `sonar-project.properties` after the default lines (e.g. Sonar multicriteria ignores). */\n  readonly sonarProjectPropertiesExtraLines?: string[];\n}\n\nconst NODEJS_MIN_VERSION = '20';\nconst NODEJS_MAX_VERSION = '24';\n\n\n/** Projen AwsCdkConstructLibrary options with validation and defaults (min/max/workflow Node versions, scoped name, etc.). */\n// JSII cannot infer this schema shape cleanly, so we keep the runtime schema\n// and its public options interface aligned explicitly.\nexport const almaCdkConstructLibraryOptionsSchema = z\n  .object({\n    stability: z.enum(cdk.Stability),\n    majorVersion: positiveInteger,\n    author: z.string(),\n    authorAddress: z.email(),\n    name: nameSchema,\n    description: z.string(),\n    keywords: z.array(z.string()).default([]),\n    repositoryUrl: repositoryUrlSchema,\n    releaseBranches: z.record(z.string(), branchOptionsSchema).optional(),\n    releaseEnvironment: z.string(),\n    deps: z.array(z.string()).optional(),\n    devDeps: z.array(z.string()).optional(),\n    bundledDeps: z.array(z.string()).optional(),\n    minNodeVersion: nodeVersionStringSchema.default(NODEJS_MIN_VERSION),\n    workflowNodeVersion: nodeVersionStringSchema.default(NODEJS_MAX_VERSION),\n    maxNodeVersion: nodeVersionStringSchema.default(NODEJS_MAX_VERSION),\n    sonarProjectPropertiesExtraLines: z.array(z.string()).optional(),\n  })\n  .refine(validateNodeVersionOrder, {\n    message: 'Node versions must satisfy min <= workflow <= max',\n  }) satisfies z.ZodType<Partial<awscdk.AwsCdkConstructLibraryOptions>> & z.ZodType<AlmaCdkConstructLibraryOptions>;\n\n"]}
|