@znemz/cfn-include 4.6.20 → 4.6.21
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/dist/lib/schema.d.ts +1 -2
- package/dist/lib/schema.d.ts.map +1 -1
- package/dist/lib/schema.js +62 -17
- package/dist/lib/schema.js.map +1 -1
- package/dist/lib/yaml.d.ts.map +1 -1
- package/dist/lib/yaml.js +14 -7
- package/dist/lib/yaml.js.map +1 -1
- package/package.json +2 -3
package/dist/lib/schema.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import yaml from 'js-yaml';
|
|
2
1
|
export declare const BANG_AMAZON_FUNCS: string[];
|
|
3
2
|
export declare const EXPLICIT_AMAZON_FUNCS: string[];
|
|
4
|
-
declare const yamlSchema: yaml.Schema;
|
|
3
|
+
declare const yamlSchema: import("js-yaml").Schema;
|
|
5
4
|
/**
|
|
6
5
|
* Test the function key to make sure it's something we should process.
|
|
7
6
|
*/
|
package/dist/lib/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AAgJA,eAAO,MAAM,iBAAiB,UAmB7B,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAA2C,CAAC;AAI9E,QAAA,MAAM,UAAU,0BAA6B,CAAC;AAE9C;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,eAAe,UAAU,CAAC"}
|
package/dist/lib/schema.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { CORE_SCHEMA, defineMappingTag, defineScalarTag, defineSequenceTag, } from 'js-yaml';
|
|
2
2
|
import _ from 'lodash';
|
|
3
3
|
const tagDefinitions = [
|
|
4
4
|
{ short: 'Include', full: 'Fn::Include', type: 'scalar' },
|
|
@@ -65,22 +65,65 @@ const tagDefinitions = [
|
|
|
65
65
|
{ short: 'Or', full: 'Fn::Or', type: 'sequence' },
|
|
66
66
|
{ short: 'Condition', full: 'Condition', type: 'scalar' },
|
|
67
67
|
];
|
|
68
|
+
// js-yaml 5 replaced the v4 `new yaml.Type(tag, { kind, construct })` API with
|
|
69
|
+
// per-kind builder factories (defineScalarTag / defineSequenceTag /
|
|
70
|
+
// defineMappingTag). All our tags do the same thing construct() did before:
|
|
71
|
+
// collect the node's value, then wrap it as { <Fn::Full>: value }.
|
|
68
72
|
const tags = tagDefinitions.map((fn) => {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
obj =
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
73
|
+
const tagName = '!' + fn.short;
|
|
74
|
+
const wrap = (obj) => _.fromPairs([[fn.full, obj]]);
|
|
75
|
+
switch (fn.type) {
|
|
76
|
+
case 'scalar':
|
|
77
|
+
return defineScalarTag(tagName, {
|
|
78
|
+
resolve: (source) => {
|
|
79
|
+
let obj = source;
|
|
80
|
+
if (fn.dotSyntax && _.isString(obj)) {
|
|
81
|
+
const indexOfDot = obj.indexOf('.');
|
|
82
|
+
if (indexOfDot !== -1) {
|
|
83
|
+
obj = [obj.substring(0, indexOfDot), obj.substring(indexOfDot + 1)];
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
obj = [obj];
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return wrap(obj);
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
case 'sequence':
|
|
93
|
+
return defineSequenceTag(tagName, {
|
|
94
|
+
create: () => [],
|
|
95
|
+
addItem: (carrier, item) => {
|
|
96
|
+
carrier.push(item);
|
|
97
|
+
},
|
|
98
|
+
finalize: (carrier) => wrap(carrier),
|
|
99
|
+
});
|
|
100
|
+
case 'mapping':
|
|
101
|
+
return defineMappingTag(tagName, {
|
|
102
|
+
create: () => ({}),
|
|
103
|
+
addPair: (carrier, key, value) => {
|
|
104
|
+
if (key !== null && typeof key === 'object') {
|
|
105
|
+
return `${tagName} does not support complex mapping keys`;
|
|
106
|
+
}
|
|
107
|
+
const normalizedKey = String(key);
|
|
108
|
+
if (normalizedKey === '__proto__') {
|
|
109
|
+
Object.defineProperty(carrier, normalizedKey, {
|
|
110
|
+
value,
|
|
111
|
+
enumerable: true,
|
|
112
|
+
configurable: true,
|
|
113
|
+
writable: true,
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
carrier[normalizedKey] = value;
|
|
118
|
+
}
|
|
119
|
+
return '';
|
|
120
|
+
},
|
|
121
|
+
has: (carrier, key) => Object.prototype.hasOwnProperty.call(carrier, String(key)),
|
|
122
|
+
keys: (result) => Object.keys(result),
|
|
123
|
+
get: (result, key) => result[String(key)],
|
|
124
|
+
finalize: (carrier) => wrap(carrier),
|
|
125
|
+
});
|
|
126
|
+
}
|
|
84
127
|
});
|
|
85
128
|
// Build array of strings of all Amazon Intrinsic functions
|
|
86
129
|
export const BANG_AMAZON_FUNCS = [
|
|
@@ -104,7 +147,9 @@ export const BANG_AMAZON_FUNCS = [
|
|
|
104
147
|
'Condition',
|
|
105
148
|
];
|
|
106
149
|
export const EXPLICIT_AMAZON_FUNCS = BANG_AMAZON_FUNCS.map((f) => `Fn::${f}`);
|
|
107
|
-
|
|
150
|
+
// v4's yaml.DEFAULT_SCHEMA.extend(tags) → v5's CORE_SCHEMA.withTags(tags).
|
|
151
|
+
// CORE is the v5 equivalent of the v4 default (YAML 1.2 core types).
|
|
152
|
+
const yamlSchema = CORE_SCHEMA.withTags(tags);
|
|
108
153
|
/**
|
|
109
154
|
* Test the function key to make sure it's something we should process.
|
|
110
155
|
*/
|
package/dist/lib/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/lib/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,eAAe,EACf,iBAAiB,GAElB,MAAM,SAAS,CAAC;AACjB,OAAO,CAAC,MAAM,QAAQ,CAAC;AASvB,MAAM,cAAc,GAAoB;IACtC,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE;IACzD,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;IAC1D,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE;IAC/D,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;IAC9D,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;IACnD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE;IAC3D,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,UAAU,EAAE;IACnE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvD,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE;IACvD,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;IAC1D,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvE,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE;IAC7D,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE;IAC/D,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE;IAC3D,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE;IACjE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;IACxD,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE;IAChE,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE;IACjE,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,UAAU,EAAE;IACrE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE;IAC/D,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE;IAC3D,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;IACpD,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;IAC9D,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;IACxD,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE;IACzD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvD,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE;IAE9D,iBAAiB;IACjB,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;IACxD,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE;IAC/D,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE;IACxE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;IACvD,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE;IACjE,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;IAClE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;IACnD,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE;IAClD,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;IACjD,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE;IACvD,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC7C,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE;IACpD,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE;IAC7D,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;IACnD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE;IACzD,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE;IACjD,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;IACnD,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE;IACjD,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE;CAC1D,CAAC;AAEF,+EAA+E;AAC/E,oEAAoE;AACpE,4EAA4E;AAC5E,mEAAmE;AACnE,MAAM,IAAI,GAAwB,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;IAC1D,MAAM,OAAO,GAAG,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;IAC/B,MAAM,IAAI,GAAG,CAAC,GAAY,EAA2B,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtF,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,eAAe,CAA0B,OAAO,EAAE;gBACvD,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;oBAClB,IAAI,GAAG,GAAY,MAAM,CAAC;oBAC1B,IAAI,EAAE,CAAC,SAAS,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBACpC,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;wBACpC,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;4BACtB,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;wBACtE,CAAC;6BAAM,CAAC;4BACN,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;wBACd,CAAC;oBACH,CAAC;oBACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC;aACF,CAAC,CAAC;QACL,KAAK,UAAU;YACb,OAAO,iBAAiB,CAAqC,OAAO,EAAE;gBACpE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE;gBAChB,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;oBACzB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC;gBACD,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;aACrC,CAAC,CAAC;QACL,KAAK,SAAS;YACZ,OAAO,gBAAgB,CAAmD,OAAO,EAAE;gBACjF,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC/B,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;wBAC5C,OAAO,GAAG,OAAO,wCAAwC,CAAC;oBAC5D,CAAC;oBACD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;oBAClC,IAAI,aAAa,KAAK,WAAW,EAAE,CAAC;wBAClC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE;4BAC5C,KAAK;4BACL,UAAU,EAAE,IAAI;4BAChB,YAAY,EAAE,IAAI;4BAClB,QAAQ,EAAE,IAAI;yBACf,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;oBACjC,CAAC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjF,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;gBACrC,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACzC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;aACrC,CAAC,CAAC;IACP,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,2DAA2D;AAC3D,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,QAAQ;IACR,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,aAAa;IACb,MAAM;IACN,QAAQ;IACR,OAAO;IACP,KAAK;IACL,KAAK;IACL,MAAM;IACN,UAAU;IACV,KAAK;IACL,QAAQ;IACR,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,WAAW;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAE9E,2EAA2E;AAC3E,qEAAqE;AACrE,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE9C;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,cAAsB;IAC1D,OAAO,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC1F,CAAC;AAED,eAAe,UAAU,CAAC"}
|
package/dist/lib/yaml.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../src/lib/yaml.ts"],"names":[],"mappings":"AAoDA,wBAAgB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"yaml.d.ts","sourceRoot":"","sources":["../../src/lib/yaml.ts"],"names":[],"mappings":"AAoDA,wBAAgB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAoBzC;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,GAAE,WAAgB,GAAG,MAAM,CAEjE"}
|
package/dist/lib/yaml.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import yaml from 'js-yaml';
|
|
1
|
+
import * as yaml from 'js-yaml';
|
|
2
2
|
import yamlSchema from './schema.js';
|
|
3
3
|
/**
|
|
4
4
|
* Simple JSON minify - strips comments and whitespace.
|
|
@@ -52,21 +52,28 @@ function jsonMinify(json) {
|
|
|
52
52
|
return result;
|
|
53
53
|
}
|
|
54
54
|
export function load(res) {
|
|
55
|
-
|
|
55
|
+
// js-yaml 4 returned undefined for an empty document; v5 throws.
|
|
56
|
+
if (res.trim() === '')
|
|
57
|
+
return undefined;
|
|
58
|
+
// Strict JSON (with comments minified away) is tried FIRST. With js-yaml 4
|
|
59
|
+
// the YAML parser threw on commented JSON and we fell through to this
|
|
60
|
+
// branch; js-yaml 5's spec-conformant flow parsing instead "succeeds",
|
|
61
|
+
// swallowing the comments into plain scalars — so YAML-first can no longer
|
|
62
|
+
// detect JSON-with-comments input. JSON.parse is unambiguous, and for plain
|
|
63
|
+
// valid JSON, JSON and YAML semantics agree.
|
|
56
64
|
try {
|
|
57
|
-
|
|
65
|
+
return JSON.parse(jsonMinify(res));
|
|
58
66
|
}
|
|
59
|
-
catch (
|
|
67
|
+
catch (jsonErr) {
|
|
60
68
|
try {
|
|
61
|
-
|
|
69
|
+
return yaml.load(res, { schema: yamlSchema });
|
|
62
70
|
}
|
|
63
|
-
catch (
|
|
71
|
+
catch (yamlErr) {
|
|
64
72
|
const err = new Error(String([yamlErr, jsonErr]));
|
|
65
73
|
err.name = 'SyntaxError';
|
|
66
74
|
throw err;
|
|
67
75
|
}
|
|
68
76
|
}
|
|
69
|
-
return json;
|
|
70
77
|
}
|
|
71
78
|
export function dump(obj, opts = {}) {
|
|
72
79
|
return yaml.dump(obj, { sortKeys: true, ...opts });
|
package/dist/lib/yaml.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../src/lib/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../src/lib/yaml.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@znemz/cfn-include",
|
|
3
|
-
"version": "4.6.
|
|
3
|
+
"version": "4.6.21",
|
|
4
4
|
"description": "Preprocessor for CloudFormation templates with support for loops and flexible include statements",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"deepmerge": "^4.2.2",
|
|
82
82
|
"glob": "^13.0.0",
|
|
83
83
|
"jmespath": "^0.16.0",
|
|
84
|
-
"js-yaml": "^
|
|
84
|
+
"js-yaml": "^5.2.1",
|
|
85
85
|
"lodash": "^4.17.21",
|
|
86
86
|
"proxy-agent": "8.0.2",
|
|
87
87
|
"yargs": "~18.0.0"
|
|
@@ -90,7 +90,6 @@
|
|
|
90
90
|
"@commitlint/cli": "^21",
|
|
91
91
|
"@commitlint/config-conventional": "^21",
|
|
92
92
|
"@eslint/js": "^10.0.1",
|
|
93
|
-
"@types/js-yaml": "^4.0.9",
|
|
94
93
|
"@types/lodash": "^4.17.23",
|
|
95
94
|
"@types/node": "^26.0.0",
|
|
96
95
|
"@vitest/coverage-v8": "^4.0.18",
|