projen 0.54.57 → 0.55.1
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 +49 -19
- package/changelog.md +6 -1
- package/docs/api/API.md +14 -1
- package/docs/escape-hatches.md +19 -0
- package/lib/awscdk/auto-discover.js +4 -4
- package/lib/awscdk/awscdk-app-java.js +1 -1
- package/lib/awscdk/awscdk-app-py.js +1 -1
- package/lib/awscdk/awscdk-app-ts.js +1 -1
- package/lib/awscdk/awscdk-construct.js +2 -2
- package/lib/awscdk/awscdk-deps-java.js +1 -1
- package/lib/awscdk/awscdk-deps-js.js +1 -1
- package/lib/awscdk/awscdk-deps.js +1 -1
- package/lib/awscdk/cdk-config.js +1 -1
- package/lib/awscdk/cdk-tasks.js +1 -1
- package/lib/awscdk/integration-test.js +1 -1
- package/lib/awscdk/lambda-extension.js +1 -1
- package/lib/awscdk/lambda-function.js +2 -2
- package/lib/build/build-workflow.js +1 -1
- package/lib/cdk/auto-discover-base.js +2 -2
- package/lib/cdk/construct-lib.js +1 -1
- package/lib/cdk/integration-test-base.js +1 -1
- package/lib/cdk/jsii-docgen.js +1 -1
- package/lib/cdk/jsii-project.js +1 -1
- package/lib/cdk8s/auto-discover.js +2 -2
- package/lib/cdk8s/cdk8s-app-ts.js +1 -1
- package/lib/cdk8s/cdk8s-construct.js +1 -1
- package/lib/cdk8s/integration-test.js +1 -1
- package/lib/cdktf/cdktf-construct.js +1 -1
- package/lib/component.js +1 -1
- package/lib/dependencies.js +1 -1
- package/lib/dev-env.js +1 -1
- package/lib/docker-compose.js +2 -2
- package/lib/file.js +1 -1
- package/lib/gitattributes.js +1 -1
- package/lib/github/auto-approve.js +1 -1
- package/lib/github/auto-merge.js +1 -1
- package/lib/github/dependabot.js +1 -1
- package/lib/github/github-credentials.js +1 -1
- package/lib/github/github-project.js +1 -1
- package/lib/github/github.js +1 -1
- package/lib/github/mergify.js +1 -1
- package/lib/github/pr-template.js +1 -1
- package/lib/github/pull-request-lint.js +1 -1
- package/lib/github/stale.js +1 -1
- package/lib/github/task-workflow.js +1 -1
- package/lib/github/workflows.js +1 -1
- package/lib/gitlab/configuration.js +1 -1
- package/lib/gitlab/gitlab-configuration.js +1 -1
- package/lib/gitlab/nested-configuration.js +1 -1
- package/lib/gitpod.js +1 -1
- package/lib/ignore-file.js +1 -1
- package/lib/ini.js +1 -1
- package/lib/java/java-project.js +1 -1
- package/lib/java/junit.js +1 -1
- package/lib/java/maven-compile.js +1 -1
- package/lib/java/maven-packaging.js +1 -1
- package/lib/java/maven-sample.js +1 -1
- package/lib/java/pom.js +1 -1
- package/lib/java/projenrc.js +1 -1
- package/lib/javascript/bundler.js +1 -1
- package/lib/javascript/eslint.js +1 -1
- package/lib/javascript/jest.js +1 -1
- package/lib/javascript/node-package.js +1 -1
- package/lib/javascript/node-project.js +1 -1
- package/lib/javascript/npm-config.js +1 -1
- package/lib/javascript/prettier.js +1 -1
- package/lib/javascript/projenrc.js +1 -1
- package/lib/javascript/typescript-config.js +1 -1
- package/lib/javascript/upgrade-dependencies.js +2 -2
- package/lib/json.js +1 -1
- package/lib/license.js +1 -1
- package/lib/logger.js +1 -1
- package/lib/makefile.js +1 -1
- package/lib/object-file.js +1 -1
- package/lib/project-build.js +1 -1
- package/lib/project.d.ts +10 -0
- package/lib/project.js +28 -2
- package/lib/projects.js +1 -1
- package/lib/projenrc-json.js +1 -1
- package/lib/python/pip.js +1 -1
- package/lib/python/poetry.js +2 -2
- package/lib/python/projenrc.js +1 -1
- package/lib/python/pytest-sample.js +1 -1
- package/lib/python/pytest.js +1 -1
- package/lib/python/python-project.js +1 -1
- package/lib/python/python-sample.js +1 -1
- package/lib/python/requirements-file.js +1 -1
- package/lib/python/setuppy.js +1 -1
- package/lib/python/setuptools.js +1 -1
- package/lib/python/venv.js +1 -1
- package/lib/readme.js +1 -1
- package/lib/release/publisher.js +1 -1
- package/lib/release/release-trigger.js +1 -1
- package/lib/release/release.js +1 -1
- package/lib/sample-file.js +2 -2
- package/lib/semver.js +1 -1
- package/lib/source-code.js +1 -1
- package/lib/task-runtime.js +1 -1
- package/lib/task.js +1 -1
- package/lib/tasks.js +1 -1
- package/lib/testing.js +1 -1
- package/lib/textfile.js +1 -1
- package/lib/toml.js +1 -1
- package/lib/typescript/projenrc.js +1 -1
- package/lib/typescript/typescript-typedoc.js +1 -1
- package/lib/typescript/typescript.js +5 -5
- package/lib/util.d.ts +1 -1
- package/lib/version.js +1 -1
- package/lib/vscode/devcontainer.js +1 -1
- package/lib/vscode/launch-config.js +1 -1
- package/lib/vscode/vscode.js +1 -1
- package/lib/web/next.js +3 -3
- package/lib/web/postcss.js +1 -1
- package/lib/web/react.js +4 -4
- package/lib/web/tailwind.js +1 -1
- package/lib/xmlfile.js +1 -1
- package/lib/yaml.js +1 -1
- package/node_modules/xmlbuilder2/node_modules/@types/node/README.md +1 -1
- package/node_modules/xmlbuilder2/node_modules/@types/node/diagnostics_channel.d.ts +18 -0
- package/node_modules/xmlbuilder2/node_modules/@types/node/package.json +2 -2
- package/node_modules/yaml/README.md +1 -1
- package/node_modules/yaml/browser/dist/compose/compose-doc.js +1 -1
- package/node_modules/yaml/browser/dist/compose/compose-scalar.js +4 -4
- package/node_modules/yaml/browser/dist/compose/composer.js +1 -0
- package/node_modules/yaml/browser/dist/compose/resolve-block-map.js +2 -2
- package/node_modules/yaml/browser/dist/compose/resolve-block-scalar.js +3 -1
- package/node_modules/yaml/browser/dist/compose/resolve-flow-collection.js +4 -3
- package/node_modules/yaml/browser/dist/compose/resolve-flow-scalar.js +2 -1
- package/node_modules/yaml/browser/dist/compose/resolve-props.js +1 -1
- package/node_modules/yaml/browser/dist/doc/Document.js +9 -5
- package/node_modules/yaml/browser/dist/doc/anchors.js +2 -2
- package/node_modules/yaml/browser/dist/doc/createNode.js +7 -4
- package/node_modules/yaml/browser/dist/nodes/Pair.js +2 -2
- package/node_modules/yaml/browser/dist/nodes/Scalar.js +1 -1
- package/node_modules/yaml/browser/dist/nodes/YAMLMap.js +5 -4
- package/node_modules/yaml/browser/dist/nodes/YAMLSeq.js +1 -1
- package/node_modules/yaml/browser/dist/nodes/addPairToJSMap.js +1 -1
- package/node_modules/yaml/browser/dist/nodes/toJS.js +3 -1
- package/node_modules/yaml/browser/dist/parse/cst-visit.js +2 -2
- package/node_modules/yaml/browser/dist/parse/lexer.js +2 -1
- package/node_modules/yaml/browser/dist/parse/parser.js +50 -14
- package/node_modules/yaml/browser/dist/public-api.js +2 -1
- package/node_modules/yaml/browser/dist/schema/Schema.js +6 -2
- package/node_modules/yaml/browser/dist/schema/yaml-1.1/omap.js +1 -1
- package/node_modules/yaml/browser/dist/schema/yaml-1.1/pairs.js +2 -1
- package/node_modules/yaml/browser/dist/stringify/stringify.js +8 -8
- package/node_modules/yaml/browser/dist/stringify/stringifyComment.js +5 -3
- package/node_modules/yaml/browser/dist/stringify/stringifyPair.js +4 -1
- package/node_modules/yaml/browser/dist/stringify/stringifyString.js +2 -2
- package/node_modules/yaml/dist/compose/compose-doc.js +1 -1
- package/node_modules/yaml/dist/compose/compose-scalar.js +4 -4
- package/node_modules/yaml/dist/compose/composer.js +1 -0
- package/node_modules/yaml/dist/compose/resolve-block-map.js +2 -2
- package/node_modules/yaml/dist/compose/resolve-block-scalar.js +3 -1
- package/node_modules/yaml/dist/compose/resolve-flow-collection.js +4 -3
- package/node_modules/yaml/dist/compose/resolve-flow-scalar.js +2 -1
- package/node_modules/yaml/dist/compose/resolve-props.d.ts +1 -1
- package/node_modules/yaml/dist/compose/resolve-props.js +1 -1
- package/node_modules/yaml/dist/doc/Document.d.ts +1 -1
- package/node_modules/yaml/dist/doc/Document.js +9 -5
- package/node_modules/yaml/dist/doc/anchors.d.ts +2 -2
- package/node_modules/yaml/dist/doc/anchors.js +2 -2
- package/node_modules/yaml/dist/doc/createNode.d.ts +1 -1
- package/node_modules/yaml/dist/doc/createNode.js +7 -4
- package/node_modules/yaml/dist/doc/directives.d.ts +1 -1
- package/node_modules/yaml/dist/nodes/Pair.js +2 -2
- package/node_modules/yaml/dist/nodes/Scalar.js +1 -1
- package/node_modules/yaml/dist/nodes/YAMLMap.d.ts +3 -1
- package/node_modules/yaml/dist/nodes/YAMLMap.js +5 -4
- package/node_modules/yaml/dist/nodes/YAMLSeq.js +1 -1
- package/node_modules/yaml/dist/nodes/addPairToJSMap.js +1 -1
- package/node_modules/yaml/dist/nodes/toJS.js +3 -1
- package/node_modules/yaml/dist/options.d.ts +1 -1
- package/node_modules/yaml/dist/parse/cst-visit.js +2 -2
- package/node_modules/yaml/dist/parse/lexer.js +2 -1
- package/node_modules/yaml/dist/parse/parser.js +50 -14
- package/node_modules/yaml/dist/public-api.js +2 -1
- package/node_modules/yaml/dist/schema/Schema.js +6 -2
- package/node_modules/yaml/dist/schema/yaml-1.1/omap.js +1 -1
- package/node_modules/yaml/dist/schema/yaml-1.1/pairs.js +2 -1
- package/node_modules/yaml/dist/stringify/stringify.js +8 -8
- package/node_modules/yaml/dist/stringify/stringifyComment.js +5 -3
- package/node_modules/yaml/dist/stringify/stringifyPair.js +4 -1
- package/node_modules/yaml/dist/stringify/stringifyString.js +2 -2
- package/node_modules/yaml/dist/test-events.js +1 -1
- package/node_modules/yaml/package.json +2 -2
- package/package.json +4 -4
- package/releasetag.txt +1 -1
- package/version.txt +1 -1
|
@@ -6,6 +6,7 @@ var Scalar = require('../../nodes/Scalar.js');
|
|
|
6
6
|
var YAMLSeq = require('../../nodes/YAMLSeq.js');
|
|
7
7
|
|
|
8
8
|
function resolvePairs(seq, onError) {
|
|
9
|
+
var _a;
|
|
9
10
|
if (Node.isSeq(seq)) {
|
|
10
11
|
for (let i = 0; i < seq.items.length; ++i) {
|
|
11
12
|
let item = seq.items[i];
|
|
@@ -20,7 +21,7 @@ function resolvePairs(seq, onError) {
|
|
|
20
21
|
? `${item.commentBefore}\n${pair.key.commentBefore}`
|
|
21
22
|
: item.commentBefore;
|
|
22
23
|
if (item.comment) {
|
|
23
|
-
const cn = pair.value
|
|
24
|
+
const cn = (_a = pair.value) !== null && _a !== void 0 ? _a : pair.key;
|
|
24
25
|
cn.comment = cn.comment
|
|
25
26
|
? `${item.comment}\n${cn.comment}`
|
|
26
27
|
: item.comment;
|
|
@@ -45,26 +45,26 @@ function createStringifyContext(doc, options) {
|
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
47
|
function getTagObject(tags, item) {
|
|
48
|
+
var _a, _b, _c, _d;
|
|
48
49
|
if (item.tag) {
|
|
49
50
|
const match = tags.filter(t => t.tag === item.tag);
|
|
50
51
|
if (match.length > 0)
|
|
51
|
-
return match.find(t => t.format === item.format)
|
|
52
|
+
return (_a = match.find(t => t.format === item.format)) !== null && _a !== void 0 ? _a : match[0];
|
|
52
53
|
}
|
|
53
54
|
let tagObj = undefined;
|
|
54
55
|
let obj;
|
|
55
56
|
if (Node.isScalar(item)) {
|
|
56
57
|
obj = item.value;
|
|
57
|
-
const match = tags.filter(t => t.identify
|
|
58
|
+
const match = tags.filter(t => { var _a; return (_a = t.identify) === null || _a === void 0 ? void 0 : _a.call(t, obj); });
|
|
58
59
|
tagObj =
|
|
59
|
-
match.find(t => t.format === item.format)
|
|
60
|
+
(_b = match.find(t => t.format === item.format)) !== null && _b !== void 0 ? _b : match.find(t => !t.format);
|
|
60
61
|
}
|
|
61
62
|
else {
|
|
62
63
|
obj = item;
|
|
63
64
|
tagObj = tags.find(t => t.nodeClass && obj instanceof t.nodeClass);
|
|
64
65
|
}
|
|
65
66
|
if (!tagObj) {
|
|
66
|
-
|
|
67
|
-
const name = obj && obj.constructor ? obj.constructor.name : typeof obj;
|
|
67
|
+
const name = (_d = (_c = obj === null || obj === void 0 ? void 0 : obj.constructor) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : typeof obj;
|
|
68
68
|
throw new Error(`Tag not resolved for ${name} value`);
|
|
69
69
|
}
|
|
70
70
|
return tagObj;
|
|
@@ -79,13 +79,13 @@ function stringifyProps(node, tagObj, { anchors: anchors$1, doc }) {
|
|
|
79
79
|
anchors$1.add(anchor);
|
|
80
80
|
props.push(`&${anchor}`);
|
|
81
81
|
}
|
|
82
|
-
const tag = node.tag
|
|
82
|
+
const tag = node.tag ? node.tag : tagObj.default ? null : tagObj.tag;
|
|
83
83
|
if (tag)
|
|
84
84
|
props.push(doc.directives.tagString(tag));
|
|
85
85
|
return props.join(' ');
|
|
86
86
|
}
|
|
87
87
|
function stringify(item, ctx, onComment, onChompKeep) {
|
|
88
|
-
var _a;
|
|
88
|
+
var _a, _b;
|
|
89
89
|
if (Node.isPair(item))
|
|
90
90
|
return item.toString(ctx, onComment, onChompKeep);
|
|
91
91
|
if (Node.isAlias(item)) {
|
|
@@ -110,7 +110,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
|
|
|
110
110
|
tagObj = getTagObject(ctx.doc.schema.tags, node);
|
|
111
111
|
const props = stringifyProps(node, tagObj, ctx);
|
|
112
112
|
if (props.length > 0)
|
|
113
|
-
ctx.indentAtStart = (ctx.indentAtStart
|
|
113
|
+
ctx.indentAtStart = ((_b = ctx.indentAtStart) !== null && _b !== void 0 ? _b : 0) + props.length + 1;
|
|
114
114
|
const str = typeof tagObj.stringify === 'function'
|
|
115
115
|
? tagObj.stringify(node, ctx, onComment, onChompKeep)
|
|
116
116
|
: Node.isScalar(node)
|
|
@@ -13,9 +13,11 @@ function indentComment(comment, indent) {
|
|
|
13
13
|
return comment.substring(1);
|
|
14
14
|
return indent ? comment.replace(/^(?! *$)/gm, indent) : comment;
|
|
15
15
|
}
|
|
16
|
-
const lineComment = (str, indent, comment) =>
|
|
17
|
-
?
|
|
18
|
-
:
|
|
16
|
+
const lineComment = (str, indent, comment) => str.endsWith('\n')
|
|
17
|
+
? indentComment(comment, indent)
|
|
18
|
+
: comment.includes('\n')
|
|
19
|
+
? '\n' + indentComment(comment, indent)
|
|
20
|
+
: (str.endsWith(' ') ? '' : ' ') + comment;
|
|
19
21
|
|
|
20
22
|
exports.indentComment = indentComment;
|
|
21
23
|
exports.lineComment = lineComment;
|
|
@@ -98,7 +98,10 @@ function stringifyPair({ key, value }, ctx, onComment, onChompKeep) {
|
|
|
98
98
|
const valueStr = stringify.stringify(value, ctx, () => (valueCommentDone = true), () => (chompKeep = true));
|
|
99
99
|
let ws = ' ';
|
|
100
100
|
if (vcb || keyComment) {
|
|
101
|
-
|
|
101
|
+
if (valueStr === '' && !ctx.inFlow)
|
|
102
|
+
ws = vcb === '\n' ? '\n\n' : vcb;
|
|
103
|
+
else
|
|
104
|
+
ws = `${vcb}\n${ctx.indent}`;
|
|
102
105
|
}
|
|
103
106
|
else if (!explicitKey && Node.isCollection(value)) {
|
|
104
107
|
const flow = valueStr[0] === '[' || valueStr[0] === '{';
|
|
@@ -245,14 +245,14 @@ function plainString(item, ctx, onComment, onChompKeep) {
|
|
|
245
245
|
// - '\n ', ': ' or ' \n' anywhere
|
|
246
246
|
// - '#' not preceded by a non-space char
|
|
247
247
|
// - end with ' ' or ':'
|
|
248
|
-
return implicitKey || inFlow || value.
|
|
248
|
+
return implicitKey || inFlow || !value.includes('\n')
|
|
249
249
|
? quotedString(value, ctx)
|
|
250
250
|
: blockString(item, ctx, onComment, onChompKeep);
|
|
251
251
|
}
|
|
252
252
|
if (!implicitKey &&
|
|
253
253
|
!inFlow &&
|
|
254
254
|
type !== Scalar.Scalar.PLAIN &&
|
|
255
|
-
value.
|
|
255
|
+
value.includes('\n')) {
|
|
256
256
|
// Where allowed & type not set explicitly, prefer block style for multiline strings
|
|
257
257
|
return blockString(item, ctx, onComment, onChompKeep);
|
|
258
258
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yaml",
|
|
3
|
-
"version": "2.0.0
|
|
3
|
+
"version": "2.0.0",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"author": "Eemeli Aro <eemeli@gmail.com>",
|
|
6
6
|
"repository": "github:eemeli/yaml",
|
|
@@ -89,6 +89,6 @@
|
|
|
89
89
|
"typescript": "^4.3.5"
|
|
90
90
|
},
|
|
91
91
|
"engines": {
|
|
92
|
-
"node": ">=
|
|
92
|
+
"node": ">= 14"
|
|
93
93
|
}
|
|
94
94
|
}
|
package/package.json
CHANGED
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"@types/glob": "^7.2.0",
|
|
54
54
|
"@types/ini": "^1.3.31",
|
|
55
55
|
"@types/jest": "^27.4.1",
|
|
56
|
-
"@types/node": "^
|
|
56
|
+
"@types/node": "^14",
|
|
57
57
|
"@types/semver": "^7.3.9",
|
|
58
58
|
"@types/yargs": "^15.0.14",
|
|
59
59
|
"@typescript-eslint/eslint-plugin": "^5",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"semver": "^7.3.7",
|
|
92
92
|
"shx": "^0.3.4",
|
|
93
93
|
"xmlbuilder2": "^2.4.1",
|
|
94
|
-
"yaml": "2.0.0
|
|
94
|
+
"yaml": "^2.0.0",
|
|
95
95
|
"yargs": "^16.2.0"
|
|
96
96
|
},
|
|
97
97
|
"bundledDependencies": [
|
|
@@ -117,11 +117,11 @@
|
|
|
117
117
|
"scaffolding"
|
|
118
118
|
],
|
|
119
119
|
"engines": {
|
|
120
|
-
"node": ">=
|
|
120
|
+
"node": ">= 14.0.0"
|
|
121
121
|
},
|
|
122
122
|
"main": "lib/index.js",
|
|
123
123
|
"license": "Apache-2.0",
|
|
124
|
-
"version": "0.
|
|
124
|
+
"version": "0.55.1",
|
|
125
125
|
"jest": {
|
|
126
126
|
"testMatch": [
|
|
127
127
|
"<rootDir>/src/**/__tests__/**/*.ts?(x)",
|
package/releasetag.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
v0.
|
|
1
|
+
v0.55.1
|
package/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.55.1
|