orval 7.0.0 → 7.1.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.
- package/dist/bin/orval.js +98 -170
- package/dist/bin/orval.js.map +1 -1
- package/dist/index.js +98 -170
- package/dist/index.js.map +1 -1
- package/package.json +10 -10
package/dist/bin/orval.js
CHANGED
|
@@ -554,10 +554,8 @@ function isObject(subject) {
|
|
|
554
554
|
return typeof subject === "object" && subject !== null;
|
|
555
555
|
}
|
|
556
556
|
function toArray(sequence) {
|
|
557
|
-
if (Array.isArray(sequence))
|
|
558
|
-
|
|
559
|
-
else if (isNothing(sequence))
|
|
560
|
-
return [];
|
|
557
|
+
if (Array.isArray(sequence)) return sequence;
|
|
558
|
+
else if (isNothing(sequence)) return [];
|
|
561
559
|
return [sequence];
|
|
562
560
|
}
|
|
563
561
|
function extend(target, source) {
|
|
@@ -597,8 +595,7 @@ var common = {
|
|
|
597
595
|
};
|
|
598
596
|
function formatError(exception2, compact) {
|
|
599
597
|
var where = "", message = exception2.reason || "(unknown reason)";
|
|
600
|
-
if (!exception2.mark)
|
|
601
|
-
return message;
|
|
598
|
+
if (!exception2.mark) return message;
|
|
602
599
|
if (exception2.mark.name) {
|
|
603
600
|
where += 'in "' + exception2.mark.name + '" ';
|
|
604
601
|
}
|
|
@@ -649,16 +646,11 @@ function padStart(string, max) {
|
|
|
649
646
|
}
|
|
650
647
|
function makeSnippet(mark, options) {
|
|
651
648
|
options = Object.create(options || null);
|
|
652
|
-
if (!mark.buffer)
|
|
653
|
-
|
|
654
|
-
if (
|
|
655
|
-
|
|
656
|
-
if (typeof options.
|
|
657
|
-
options.indent = 1;
|
|
658
|
-
if (typeof options.linesBefore !== "number")
|
|
659
|
-
options.linesBefore = 3;
|
|
660
|
-
if (typeof options.linesAfter !== "number")
|
|
661
|
-
options.linesAfter = 2;
|
|
649
|
+
if (!mark.buffer) return null;
|
|
650
|
+
if (!options.maxLength) options.maxLength = 79;
|
|
651
|
+
if (typeof options.indent !== "number") options.indent = 1;
|
|
652
|
+
if (typeof options.linesBefore !== "number") options.linesBefore = 3;
|
|
653
|
+
if (typeof options.linesAfter !== "number") options.linesAfter = 2;
|
|
662
654
|
var re = /\r?\n|\r|\0/g;
|
|
663
655
|
var lineStarts = [0];
|
|
664
656
|
var lineEnds = [];
|
|
@@ -671,14 +663,12 @@ function makeSnippet(mark, options) {
|
|
|
671
663
|
foundLineNo = lineStarts.length - 2;
|
|
672
664
|
}
|
|
673
665
|
}
|
|
674
|
-
if (foundLineNo < 0)
|
|
675
|
-
foundLineNo = lineStarts.length - 1;
|
|
666
|
+
if (foundLineNo < 0) foundLineNo = lineStarts.length - 1;
|
|
676
667
|
var result = "", i, line;
|
|
677
668
|
var lineNoLength = Math.min(mark.line + options.linesAfter, lineEnds.length).toString().length;
|
|
678
669
|
var maxLineLength = options.maxLength - (options.indent + lineNoLength + 3);
|
|
679
670
|
for (i = 1; i <= options.linesBefore; i++) {
|
|
680
|
-
if (foundLineNo - i < 0)
|
|
681
|
-
break;
|
|
671
|
+
if (foundLineNo - i < 0) break;
|
|
682
672
|
line = getLine(
|
|
683
673
|
mark.buffer,
|
|
684
674
|
lineStarts[foundLineNo - i],
|
|
@@ -692,8 +682,7 @@ function makeSnippet(mark, options) {
|
|
|
692
682
|
result += common.repeat(" ", options.indent) + padStart((mark.line + 1).toString(), lineNoLength) + " | " + line.str + "\n";
|
|
693
683
|
result += common.repeat("-", options.indent + lineNoLength + 3 + line.pos) + "^\n";
|
|
694
684
|
for (i = 1; i <= options.linesAfter; i++) {
|
|
695
|
-
if (foundLineNo + i >= lineEnds.length)
|
|
696
|
-
break;
|
|
685
|
+
if (foundLineNo + i >= lineEnds.length) break;
|
|
697
686
|
line = getLine(
|
|
698
687
|
mark.buffer,
|
|
699
688
|
lineStarts[foundLineNo + i],
|
|
@@ -812,10 +801,8 @@ Schema$1.prototype.extend = function extend2(definition) {
|
|
|
812
801
|
} else if (Array.isArray(definition)) {
|
|
813
802
|
explicit = explicit.concat(definition);
|
|
814
803
|
} else if (definition && (Array.isArray(definition.implicit) || Array.isArray(definition.explicit))) {
|
|
815
|
-
if (definition.implicit)
|
|
816
|
-
|
|
817
|
-
if (definition.explicit)
|
|
818
|
-
explicit = explicit.concat(definition.explicit);
|
|
804
|
+
if (definition.implicit) implicit = implicit.concat(definition.implicit);
|
|
805
|
+
if (definition.explicit) explicit = explicit.concat(definition.explicit);
|
|
819
806
|
} else {
|
|
820
807
|
throw new exception("Schema.extend argument should be a Type, [ Type ], or a schema definition ({ implicit: [...], explicit: [...] })");
|
|
821
808
|
}
|
|
@@ -870,8 +857,7 @@ var failsafe = new schema({
|
|
|
870
857
|
]
|
|
871
858
|
});
|
|
872
859
|
function resolveYamlNull(data) {
|
|
873
|
-
if (data === null)
|
|
874
|
-
return true;
|
|
860
|
+
if (data === null) return true;
|
|
875
861
|
var max = data.length;
|
|
876
862
|
return max === 1 && data === "~" || max === 4 && (data === "null" || data === "Null" || data === "NULL");
|
|
877
863
|
}
|
|
@@ -906,8 +892,7 @@ var _null = new type("tag:yaml.org,2002:null", {
|
|
|
906
892
|
defaultStyle: "lowercase"
|
|
907
893
|
});
|
|
908
894
|
function resolveYamlBoolean(data) {
|
|
909
|
-
if (data === null)
|
|
910
|
-
return false;
|
|
895
|
+
if (data === null) return false;
|
|
911
896
|
var max = data.length;
|
|
912
897
|
return max === 4 && (data === "true" || data === "True" || data === "TRUE") || max === 5 && (data === "false" || data === "False" || data === "FALSE");
|
|
913
898
|
}
|
|
@@ -945,27 +930,22 @@ function isDecCode(c) {
|
|
|
945
930
|
return 48 <= c && c <= 57;
|
|
946
931
|
}
|
|
947
932
|
function resolveYamlInteger(data) {
|
|
948
|
-
if (data === null)
|
|
949
|
-
return false;
|
|
933
|
+
if (data === null) return false;
|
|
950
934
|
var max = data.length, index = 0, hasDigits = false, ch;
|
|
951
|
-
if (!max)
|
|
952
|
-
return false;
|
|
935
|
+
if (!max) return false;
|
|
953
936
|
ch = data[index];
|
|
954
937
|
if (ch === "-" || ch === "+") {
|
|
955
938
|
ch = data[++index];
|
|
956
939
|
}
|
|
957
940
|
if (ch === "0") {
|
|
958
|
-
if (index + 1 === max)
|
|
959
|
-
return true;
|
|
941
|
+
if (index + 1 === max) return true;
|
|
960
942
|
ch = data[++index];
|
|
961
943
|
if (ch === "b") {
|
|
962
944
|
index++;
|
|
963
945
|
for (; index < max; index++) {
|
|
964
946
|
ch = data[index];
|
|
965
|
-
if (ch === "_")
|
|
966
|
-
|
|
967
|
-
if (ch !== "0" && ch !== "1")
|
|
968
|
-
return false;
|
|
947
|
+
if (ch === "_") continue;
|
|
948
|
+
if (ch !== "0" && ch !== "1") return false;
|
|
969
949
|
hasDigits = true;
|
|
970
950
|
}
|
|
971
951
|
return hasDigits && ch !== "_";
|
|
@@ -974,10 +954,8 @@ function resolveYamlInteger(data) {
|
|
|
974
954
|
index++;
|
|
975
955
|
for (; index < max; index++) {
|
|
976
956
|
ch = data[index];
|
|
977
|
-
if (ch === "_")
|
|
978
|
-
|
|
979
|
-
if (!isHexCode(data.charCodeAt(index)))
|
|
980
|
-
return false;
|
|
957
|
+
if (ch === "_") continue;
|
|
958
|
+
if (!isHexCode(data.charCodeAt(index))) return false;
|
|
981
959
|
hasDigits = true;
|
|
982
960
|
}
|
|
983
961
|
return hasDigits && ch !== "_";
|
|
@@ -986,28 +964,23 @@ function resolveYamlInteger(data) {
|
|
|
986
964
|
index++;
|
|
987
965
|
for (; index < max; index++) {
|
|
988
966
|
ch = data[index];
|
|
989
|
-
if (ch === "_")
|
|
990
|
-
|
|
991
|
-
if (!isOctCode(data.charCodeAt(index)))
|
|
992
|
-
return false;
|
|
967
|
+
if (ch === "_") continue;
|
|
968
|
+
if (!isOctCode(data.charCodeAt(index))) return false;
|
|
993
969
|
hasDigits = true;
|
|
994
970
|
}
|
|
995
971
|
return hasDigits && ch !== "_";
|
|
996
972
|
}
|
|
997
973
|
}
|
|
998
|
-
if (ch === "_")
|
|
999
|
-
return false;
|
|
974
|
+
if (ch === "_") return false;
|
|
1000
975
|
for (; index < max; index++) {
|
|
1001
976
|
ch = data[index];
|
|
1002
|
-
if (ch === "_")
|
|
1003
|
-
continue;
|
|
977
|
+
if (ch === "_") continue;
|
|
1004
978
|
if (!isDecCode(data.charCodeAt(index))) {
|
|
1005
979
|
return false;
|
|
1006
980
|
}
|
|
1007
981
|
hasDigits = true;
|
|
1008
982
|
}
|
|
1009
|
-
if (!hasDigits || ch === "_")
|
|
1010
|
-
return false;
|
|
983
|
+
if (!hasDigits || ch === "_") return false;
|
|
1011
984
|
return true;
|
|
1012
985
|
}
|
|
1013
986
|
function constructYamlInteger(data) {
|
|
@@ -1017,20 +990,15 @@ function constructYamlInteger(data) {
|
|
|
1017
990
|
}
|
|
1018
991
|
ch = value[0];
|
|
1019
992
|
if (ch === "-" || ch === "+") {
|
|
1020
|
-
if (ch === "-")
|
|
1021
|
-
sign = -1;
|
|
993
|
+
if (ch === "-") sign = -1;
|
|
1022
994
|
value = value.slice(1);
|
|
1023
995
|
ch = value[0];
|
|
1024
996
|
}
|
|
1025
|
-
if (value === "0")
|
|
1026
|
-
return 0;
|
|
997
|
+
if (value === "0") return 0;
|
|
1027
998
|
if (ch === "0") {
|
|
1028
|
-
if (value[1] === "b")
|
|
1029
|
-
|
|
1030
|
-
if (value[1] === "
|
|
1031
|
-
return sign * parseInt(value.slice(2), 16);
|
|
1032
|
-
if (value[1] === "o")
|
|
1033
|
-
return sign * parseInt(value.slice(2), 8);
|
|
999
|
+
if (value[1] === "b") return sign * parseInt(value.slice(2), 2);
|
|
1000
|
+
if (value[1] === "x") return sign * parseInt(value.slice(2), 16);
|
|
1001
|
+
if (value[1] === "o") return sign * parseInt(value.slice(2), 8);
|
|
1034
1002
|
}
|
|
1035
1003
|
return sign * parseInt(value, 10);
|
|
1036
1004
|
}
|
|
@@ -1070,8 +1038,7 @@ var YAML_FLOAT_PATTERN = new RegExp(
|
|
|
1070
1038
|
"^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$"
|
|
1071
1039
|
);
|
|
1072
1040
|
function resolveYamlFloat(data) {
|
|
1073
|
-
if (data === null)
|
|
1074
|
-
return false;
|
|
1041
|
+
if (data === null) return false;
|
|
1075
1042
|
if (!YAML_FLOAT_PATTERN.test(data) || // Quick hack to not allow integers end with `_`
|
|
1076
1043
|
// Probably should update regexp & check speed
|
|
1077
1044
|
data[data.length - 1] === "_") {
|
|
@@ -1156,21 +1123,16 @@ var YAML_TIMESTAMP_REGEXP = new RegExp(
|
|
|
1156
1123
|
"^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$"
|
|
1157
1124
|
);
|
|
1158
1125
|
function resolveYamlTimestamp(data) {
|
|
1159
|
-
if (data === null)
|
|
1160
|
-
|
|
1161
|
-
if (
|
|
1162
|
-
return true;
|
|
1163
|
-
if (YAML_TIMESTAMP_REGEXP.exec(data) !== null)
|
|
1164
|
-
return true;
|
|
1126
|
+
if (data === null) return false;
|
|
1127
|
+
if (YAML_DATE_REGEXP.exec(data) !== null) return true;
|
|
1128
|
+
if (YAML_TIMESTAMP_REGEXP.exec(data) !== null) return true;
|
|
1165
1129
|
return false;
|
|
1166
1130
|
}
|
|
1167
1131
|
function constructYamlTimestamp(data) {
|
|
1168
1132
|
var match, year, month, day, hour, minute, second, fraction = 0, delta = null, tz_hour, tz_minute, date;
|
|
1169
1133
|
match = YAML_DATE_REGEXP.exec(data);
|
|
1170
|
-
if (match === null)
|
|
1171
|
-
|
|
1172
|
-
if (match === null)
|
|
1173
|
-
throw new Error("Date resolve error");
|
|
1134
|
+
if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(data);
|
|
1135
|
+
if (match === null) throw new Error("Date resolve error");
|
|
1174
1136
|
year = +match[1];
|
|
1175
1137
|
month = +match[2] - 1;
|
|
1176
1138
|
day = +match[3];
|
|
@@ -1191,12 +1153,10 @@ function constructYamlTimestamp(data) {
|
|
|
1191
1153
|
tz_hour = +match[10];
|
|
1192
1154
|
tz_minute = +(match[11] || 0);
|
|
1193
1155
|
delta = (tz_hour * 60 + tz_minute) * 6e4;
|
|
1194
|
-
if (match[9] === "-")
|
|
1195
|
-
delta = -delta;
|
|
1156
|
+
if (match[9] === "-") delta = -delta;
|
|
1196
1157
|
}
|
|
1197
1158
|
date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
|
|
1198
|
-
if (delta)
|
|
1199
|
-
date.setTime(date.getTime() - delta);
|
|
1159
|
+
if (delta) date.setTime(date.getTime() - delta);
|
|
1200
1160
|
return date;
|
|
1201
1161
|
}
|
|
1202
1162
|
function representYamlTimestamp(object) {
|
|
@@ -1218,15 +1178,12 @@ var merge = new type("tag:yaml.org,2002:merge", {
|
|
|
1218
1178
|
});
|
|
1219
1179
|
var BASE64_MAP = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";
|
|
1220
1180
|
function resolveYamlBinary(data) {
|
|
1221
|
-
if (data === null)
|
|
1222
|
-
return false;
|
|
1181
|
+
if (data === null) return false;
|
|
1223
1182
|
var code, idx, bitlen = 0, max = data.length, map2 = BASE64_MAP;
|
|
1224
1183
|
for (idx = 0; idx < max; idx++) {
|
|
1225
1184
|
code = map2.indexOf(data.charAt(idx));
|
|
1226
|
-
if (code > 64)
|
|
1227
|
-
|
|
1228
|
-
if (code < 0)
|
|
1229
|
-
return false;
|
|
1185
|
+
if (code > 64) continue;
|
|
1186
|
+
if (code < 0) return false;
|
|
1230
1187
|
bitlen += 6;
|
|
1231
1188
|
}
|
|
1232
1189
|
return bitlen % 8 === 0;
|
|
@@ -1297,28 +1254,21 @@ var binary = new type("tag:yaml.org,2002:binary", {
|
|
|
1297
1254
|
var _hasOwnProperty$3 = Object.prototype.hasOwnProperty;
|
|
1298
1255
|
var _toString$2 = Object.prototype.toString;
|
|
1299
1256
|
function resolveYamlOmap(data) {
|
|
1300
|
-
if (data === null)
|
|
1301
|
-
return true;
|
|
1257
|
+
if (data === null) return true;
|
|
1302
1258
|
var objectKeys = [], index, length, pair, pairKey, pairHasKey, object = data;
|
|
1303
1259
|
for (index = 0, length = object.length; index < length; index += 1) {
|
|
1304
1260
|
pair = object[index];
|
|
1305
1261
|
pairHasKey = false;
|
|
1306
|
-
if (_toString$2.call(pair) !== "[object Object]")
|
|
1307
|
-
return false;
|
|
1262
|
+
if (_toString$2.call(pair) !== "[object Object]") return false;
|
|
1308
1263
|
for (pairKey in pair) {
|
|
1309
1264
|
if (_hasOwnProperty$3.call(pair, pairKey)) {
|
|
1310
|
-
if (!pairHasKey)
|
|
1311
|
-
|
|
1312
|
-
else
|
|
1313
|
-
return false;
|
|
1265
|
+
if (!pairHasKey) pairHasKey = true;
|
|
1266
|
+
else return false;
|
|
1314
1267
|
}
|
|
1315
1268
|
}
|
|
1316
|
-
if (!pairHasKey)
|
|
1317
|
-
|
|
1318
|
-
|
|
1319
|
-
objectKeys.push(pairKey);
|
|
1320
|
-
else
|
|
1321
|
-
return false;
|
|
1269
|
+
if (!pairHasKey) return false;
|
|
1270
|
+
if (objectKeys.indexOf(pairKey) === -1) objectKeys.push(pairKey);
|
|
1271
|
+
else return false;
|
|
1322
1272
|
}
|
|
1323
1273
|
return true;
|
|
1324
1274
|
}
|
|
@@ -1332,24 +1282,20 @@ var omap = new type("tag:yaml.org,2002:omap", {
|
|
|
1332
1282
|
});
|
|
1333
1283
|
var _toString$1 = Object.prototype.toString;
|
|
1334
1284
|
function resolveYamlPairs(data) {
|
|
1335
|
-
if (data === null)
|
|
1336
|
-
return true;
|
|
1285
|
+
if (data === null) return true;
|
|
1337
1286
|
var index, length, pair, keys, result, object = data;
|
|
1338
1287
|
result = new Array(object.length);
|
|
1339
1288
|
for (index = 0, length = object.length; index < length; index += 1) {
|
|
1340
1289
|
pair = object[index];
|
|
1341
|
-
if (_toString$1.call(pair) !== "[object Object]")
|
|
1342
|
-
return false;
|
|
1290
|
+
if (_toString$1.call(pair) !== "[object Object]") return false;
|
|
1343
1291
|
keys = Object.keys(pair);
|
|
1344
|
-
if (keys.length !== 1)
|
|
1345
|
-
return false;
|
|
1292
|
+
if (keys.length !== 1) return false;
|
|
1346
1293
|
result[index] = [keys[0], pair[keys[0]]];
|
|
1347
1294
|
}
|
|
1348
1295
|
return true;
|
|
1349
1296
|
}
|
|
1350
1297
|
function constructYamlPairs(data) {
|
|
1351
|
-
if (data === null)
|
|
1352
|
-
return [];
|
|
1298
|
+
if (data === null) return [];
|
|
1353
1299
|
var index, length, pair, keys, result, object = data;
|
|
1354
1300
|
result = new Array(object.length);
|
|
1355
1301
|
for (index = 0, length = object.length; index < length; index += 1) {
|
|
@@ -1366,13 +1312,11 @@ var pairs = new type("tag:yaml.org,2002:pairs", {
|
|
|
1366
1312
|
});
|
|
1367
1313
|
var _hasOwnProperty$2 = Object.prototype.hasOwnProperty;
|
|
1368
1314
|
function resolveYamlSet(data) {
|
|
1369
|
-
if (data === null)
|
|
1370
|
-
return true;
|
|
1315
|
+
if (data === null) return true;
|
|
1371
1316
|
var key, object = data;
|
|
1372
1317
|
for (key in object) {
|
|
1373
1318
|
if (_hasOwnProperty$2.call(object, key)) {
|
|
1374
|
-
if (object[key] !== null)
|
|
1375
|
-
return false;
|
|
1319
|
+
if (object[key] !== null) return false;
|
|
1376
1320
|
}
|
|
1377
1321
|
}
|
|
1378
1322
|
return true;
|
|
@@ -2033,8 +1977,7 @@ function readBlockScalar(state, nodeIndent) {
|
|
|
2033
1977
|
}
|
|
2034
1978
|
function readBlockSequence(state, nodeIndent) {
|
|
2035
1979
|
var _line, _tag = state.tag, _anchor = state.anchor, _result = [], following, detected = false, ch;
|
|
2036
|
-
if (state.firstTabInLine !== -1)
|
|
2037
|
-
return false;
|
|
1980
|
+
if (state.firstTabInLine !== -1) return false;
|
|
2038
1981
|
if (state.anchor !== null) {
|
|
2039
1982
|
state.anchorMap[state.anchor] = _result;
|
|
2040
1983
|
}
|
|
@@ -2082,8 +2025,7 @@ function readBlockSequence(state, nodeIndent) {
|
|
|
2082
2025
|
}
|
|
2083
2026
|
function readBlockMapping(state, nodeIndent, flowIndent) {
|
|
2084
2027
|
var following, allowCompact, _line, _keyLine, _keyLineStart, _keyPos, _tag = state.tag, _anchor = state.anchor, _result = {}, overridableKeys = /* @__PURE__ */ Object.create(null), keyTag = null, keyNode = null, valueNode = null, atExplicitKey = false, detected = false, ch;
|
|
2085
|
-
if (state.firstTabInLine !== -1)
|
|
2086
|
-
return false;
|
|
2028
|
+
if (state.firstTabInLine !== -1) return false;
|
|
2087
2029
|
if (state.anchor !== null) {
|
|
2088
2030
|
state.anchorMap[state.anchor] = _result;
|
|
2089
2031
|
}
|
|
@@ -2193,8 +2135,7 @@ function readBlockMapping(state, nodeIndent, flowIndent) {
|
|
|
2193
2135
|
function readTagProperty(state) {
|
|
2194
2136
|
var _position, isVerbatim = false, isNamed = false, tagHandle, tagName, ch;
|
|
2195
2137
|
ch = state.input.charCodeAt(state.position);
|
|
2196
|
-
if (ch !== 33)
|
|
2197
|
-
return false;
|
|
2138
|
+
if (ch !== 33) return false;
|
|
2198
2139
|
if (state.tag !== null) {
|
|
2199
2140
|
throwError(state, "duplication of a tag property");
|
|
2200
2141
|
}
|
|
@@ -2265,8 +2206,7 @@ function readTagProperty(state) {
|
|
|
2265
2206
|
function readAnchorProperty(state) {
|
|
2266
2207
|
var _position, ch;
|
|
2267
2208
|
ch = state.input.charCodeAt(state.position);
|
|
2268
|
-
if (ch !== 38)
|
|
2269
|
-
return false;
|
|
2209
|
+
if (ch !== 38) return false;
|
|
2270
2210
|
if (state.anchor !== null) {
|
|
2271
2211
|
throwError(state, "duplication of an anchor property");
|
|
2272
2212
|
}
|
|
@@ -2284,8 +2224,7 @@ function readAnchorProperty(state) {
|
|
|
2284
2224
|
function readAlias(state) {
|
|
2285
2225
|
var _position, alias, ch;
|
|
2286
2226
|
ch = state.input.charCodeAt(state.position);
|
|
2287
|
-
if (ch !== 42)
|
|
2288
|
-
return false;
|
|
2227
|
+
if (ch !== 42) return false;
|
|
2289
2228
|
ch = state.input.charCodeAt(++state.position);
|
|
2290
2229
|
_position = state.position;
|
|
2291
2230
|
while (ch !== 0 && !is_WS_OR_EOL(ch) && !is_FLOW_INDICATOR(ch)) {
|
|
@@ -2461,16 +2400,14 @@ function readDocument(state) {
|
|
|
2461
2400
|
} while (ch !== 0 && !is_EOL(ch));
|
|
2462
2401
|
break;
|
|
2463
2402
|
}
|
|
2464
|
-
if (is_EOL(ch))
|
|
2465
|
-
break;
|
|
2403
|
+
if (is_EOL(ch)) break;
|
|
2466
2404
|
_position = state.position;
|
|
2467
2405
|
while (ch !== 0 && !is_WS_OR_EOL(ch)) {
|
|
2468
2406
|
ch = state.input.charCodeAt(++state.position);
|
|
2469
2407
|
}
|
|
2470
2408
|
directiveArgs.push(state.input.slice(_position, state.position));
|
|
2471
2409
|
}
|
|
2472
|
-
if (ch !== 0)
|
|
2473
|
-
readLineBreak(state);
|
|
2410
|
+
if (ch !== 0) readLineBreak(state);
|
|
2474
2411
|
if (_hasOwnProperty$1.call(directiveHandlers, directiveName)) {
|
|
2475
2412
|
directiveHandlers[directiveName](state, directiveName, directiveArgs);
|
|
2476
2413
|
} else {
|
|
@@ -2622,8 +2559,7 @@ var DEPRECATED_BOOLEANS_SYNTAX = [
|
|
|
2622
2559
|
var DEPRECATED_BASE60_SYNTAX = /^[-+]?[0-9_]+(?::[0-9_]+)+(?:\.[0-9_]*)?$/;
|
|
2623
2560
|
function compileStyleMap(schema2, map2) {
|
|
2624
2561
|
var result, keys, index, length, tag, style, type2;
|
|
2625
|
-
if (map2 === null)
|
|
2626
|
-
return {};
|
|
2562
|
+
if (map2 === null) return {};
|
|
2627
2563
|
result = {};
|
|
2628
2564
|
keys = Object.keys(map2);
|
|
2629
2565
|
for (index = 0, length = keys.length; index < length; index += 1) {
|
|
@@ -2692,8 +2628,7 @@ function indentString(string, spaces) {
|
|
|
2692
2628
|
line = string.slice(position, next + 1);
|
|
2693
2629
|
position = next + 1;
|
|
2694
2630
|
}
|
|
2695
|
-
if (line.length && line !== "\n")
|
|
2696
|
-
result += ind;
|
|
2631
|
+
if (line.length && line !== "\n") result += ind;
|
|
2697
2632
|
result += line;
|
|
2698
2633
|
}
|
|
2699
2634
|
return result;
|
|
@@ -2877,8 +2812,7 @@ function foldString(string, width) {
|
|
|
2877
2812
|
return result;
|
|
2878
2813
|
}
|
|
2879
2814
|
function foldLine(line, width) {
|
|
2880
|
-
if (line === "" || line[0] === " ")
|
|
2881
|
-
return line;
|
|
2815
|
+
if (line === "" || line[0] === " ") return line;
|
|
2882
2816
|
var breakRe = / [^ ]/g;
|
|
2883
2817
|
var match;
|
|
2884
2818
|
var start = 0, end, curr = 0, next = 0;
|
|
@@ -2909,8 +2843,7 @@ function escapeString(string) {
|
|
|
2909
2843
|
escapeSeq = ESCAPE_SEQUENCES[char];
|
|
2910
2844
|
if (!escapeSeq && isPrintable(char)) {
|
|
2911
2845
|
result += string[i];
|
|
2912
|
-
if (char >= 65536)
|
|
2913
|
-
result += string[i + 1];
|
|
2846
|
+
if (char >= 65536) result += string[i + 1];
|
|
2914
2847
|
} else {
|
|
2915
2848
|
result += escapeSeq || encodeHex(char);
|
|
2916
2849
|
}
|
|
@@ -2925,8 +2858,7 @@ function writeFlowSequence(state, level, object) {
|
|
|
2925
2858
|
value = state.replacer.call(object, String(index), value);
|
|
2926
2859
|
}
|
|
2927
2860
|
if (writeNode(state, level, value, false, false) || typeof value === "undefined" && writeNode(state, level, null, false, false)) {
|
|
2928
|
-
if (_result !== "")
|
|
2929
|
-
_result += "," + (!state.condenseFlow ? " " : "");
|
|
2861
|
+
if (_result !== "") _result += "," + (!state.condenseFlow ? " " : "");
|
|
2930
2862
|
_result += state.dump;
|
|
2931
2863
|
}
|
|
2932
2864
|
}
|
|
@@ -2959,10 +2891,8 @@ function writeFlowMapping(state, level, object) {
|
|
|
2959
2891
|
var _result = "", _tag = state.tag, objectKeyList = Object.keys(object), index, length, objectKey, objectValue, pairBuffer;
|
|
2960
2892
|
for (index = 0, length = objectKeyList.length; index < length; index += 1) {
|
|
2961
2893
|
pairBuffer = "";
|
|
2962
|
-
if (_result !== "")
|
|
2963
|
-
|
|
2964
|
-
if (state.condenseFlow)
|
|
2965
|
-
pairBuffer += '"';
|
|
2894
|
+
if (_result !== "") pairBuffer += ", ";
|
|
2895
|
+
if (state.condenseFlow) pairBuffer += '"';
|
|
2966
2896
|
objectKey = objectKeyList[index];
|
|
2967
2897
|
objectValue = object[objectKey];
|
|
2968
2898
|
if (state.replacer) {
|
|
@@ -2971,8 +2901,7 @@ function writeFlowMapping(state, level, object) {
|
|
|
2971
2901
|
if (!writeNode(state, level, objectKey, false, false)) {
|
|
2972
2902
|
continue;
|
|
2973
2903
|
}
|
|
2974
|
-
if (state.dump.length > 1024)
|
|
2975
|
-
pairBuffer += "? ";
|
|
2904
|
+
if (state.dump.length > 1024) pairBuffer += "? ";
|
|
2976
2905
|
pairBuffer += state.dump + (state.condenseFlow ? '"' : "") + ":" + (state.condenseFlow ? "" : " ");
|
|
2977
2906
|
if (!writeNode(state, level, objectValue, false, false)) {
|
|
2978
2907
|
continue;
|
|
@@ -3123,8 +3052,7 @@ function writeNode(state, level, object, block, compact, iskey, isblockseq) {
|
|
|
3123
3052
|
} else if (type2 === "[object Undefined]") {
|
|
3124
3053
|
return false;
|
|
3125
3054
|
} else {
|
|
3126
|
-
if (state.skipInvalid)
|
|
3127
|
-
return false;
|
|
3055
|
+
if (state.skipInvalid) return false;
|
|
3128
3056
|
throw new exception("unacceptable kind of an object to dump " + type2);
|
|
3129
3057
|
}
|
|
3130
3058
|
if (state.tag !== null && state.tag !== "?") {
|
|
@@ -3177,14 +3105,12 @@ function inspectNode(object, objects, duplicatesIndexes) {
|
|
|
3177
3105
|
function dump$1(input, options) {
|
|
3178
3106
|
options = options || {};
|
|
3179
3107
|
var state = new State(options);
|
|
3180
|
-
if (!state.noRefs)
|
|
3181
|
-
getDuplicateReferences(input, state);
|
|
3108
|
+
if (!state.noRefs) getDuplicateReferences(input, state);
|
|
3182
3109
|
var value = input;
|
|
3183
3110
|
if (state.replacer) {
|
|
3184
3111
|
value = state.replacer.call({ "": value }, "", value);
|
|
3185
3112
|
}
|
|
3186
|
-
if (writeNode(state, 0, value, true, true))
|
|
3187
|
-
return state.dump + "\n";
|
|
3113
|
+
if (writeNode(state, 0, value, true, true)) return state.dump + "\n";
|
|
3188
3114
|
return "";
|
|
3189
3115
|
}
|
|
3190
3116
|
var dump_1 = dump$1;
|
|
@@ -3813,7 +3739,7 @@ var import_chalk2 = __toESM(require("chalk"));
|
|
|
3813
3739
|
var package_default = {
|
|
3814
3740
|
name: "orval",
|
|
3815
3741
|
description: "A swagger client generator for typescript",
|
|
3816
|
-
version: "7.
|
|
3742
|
+
version: "7.1.0",
|
|
3817
3743
|
license: "MIT",
|
|
3818
3744
|
files: [
|
|
3819
3745
|
"dist"
|
|
@@ -3867,15 +3793,15 @@ var package_default = {
|
|
|
3867
3793
|
},
|
|
3868
3794
|
dependencies: {
|
|
3869
3795
|
"@apidevtools/swagger-parser": "^10.1.0",
|
|
3870
|
-
"@orval/angular": "7.
|
|
3871
|
-
"@orval/axios": "7.
|
|
3872
|
-
"@orval/core": "7.
|
|
3873
|
-
"@orval/fetch": "7.
|
|
3874
|
-
"@orval/hono": "7.
|
|
3875
|
-
"@orval/mock": "7.
|
|
3876
|
-
"@orval/query": "7.
|
|
3877
|
-
"@orval/swr": "7.
|
|
3878
|
-
"@orval/zod": "7.
|
|
3796
|
+
"@orval/angular": "7.1.0",
|
|
3797
|
+
"@orval/axios": "7.1.0",
|
|
3798
|
+
"@orval/core": "7.1.0",
|
|
3799
|
+
"@orval/fetch": "7.1.0",
|
|
3800
|
+
"@orval/hono": "7.1.0",
|
|
3801
|
+
"@orval/mock": "7.1.0",
|
|
3802
|
+
"@orval/query": "7.1.0",
|
|
3803
|
+
"@orval/swr": "7.1.0",
|
|
3804
|
+
"@orval/zod": "7.1.0",
|
|
3879
3805
|
ajv: "^8.12.0",
|
|
3880
3806
|
cac: "^6.7.14",
|
|
3881
3807
|
chalk: "^4.1.2",
|
|
@@ -4100,7 +4026,7 @@ var loadTsconfig = async (tsconfig, workspace = process.cwd()) => {
|
|
|
4100
4026
|
|
|
4101
4027
|
// src/utils/options.ts
|
|
4102
4028
|
var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOptions = {}) => {
|
|
4103
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa, _Ta, _Ua, _Va, _Wa, _Xa, _Ya, _Za, __a, _$a, _ab, _bb, _cb, _db, _eb, _fb, _gb, _hb, _ib, _jb, _kb, _lb, _mb, _nb, _ob, _pb, _qb, _rb, _sb, _tb, _ub, _vb, _wb, _xb, _yb, _zb, _Ab, _Bb, _Cb, _Db, _Eb, _Fb, _Gb, _Hb, _Ib, _Jb, _Kb, _Lb, _Mb, _Nb, _Ob, _Pb, _Qb, _Rb, _Sb, _Tb, _Ub, _Vb, _Wb;
|
|
4029
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa, _Ta, _Ua, _Va, _Wa, _Xa, _Ya, _Za, __a, _$a, _ab, _bb, _cb, _db, _eb, _fb, _gb, _hb, _ib, _jb, _kb, _lb, _mb, _nb, _ob, _pb, _qb, _rb, _sb, _tb, _ub, _vb, _wb, _xb, _yb, _zb, _Ab, _Bb, _Cb, _Db, _Eb, _Fb, _Gb, _Hb, _Ib, _Jb, _Kb, _Lb, _Mb, _Nb, _Ob, _Pb, _Qb, _Rb, _Sb, _Tb, _Ub, _Vb, _Wb, _Xb, _Yb, _Zb, __b, _$b;
|
|
4104
4030
|
const options = await ((0, import_core7.isFunction)(optionsExport) ? optionsExport() : optionsExport);
|
|
4105
4031
|
if (!options.input) {
|
|
4106
4032
|
(0, import_core7.createLogger)().error(import_chalk2.default.red(`Config require an input`));
|
|
@@ -4305,14 +4231,18 @@ var normalizeOptions = async (optionsExport, workspace = process.cwd(), globalOp
|
|
|
4305
4231
|
angular: {
|
|
4306
4232
|
provideIn: (_Nb = (_Mb = (_Lb = outputOptions.override) == null ? void 0 : _Lb.angular) == null ? void 0 : _Mb.provideIn) != null ? _Nb : "root"
|
|
4307
4233
|
},
|
|
4308
|
-
|
|
4309
|
-
|
|
4310
|
-
|
|
4311
|
-
|
|
4234
|
+
fetch: {
|
|
4235
|
+
includeHttpStatusReturnType: (_Qb = (_Pb = (_Ob = outputOptions.override) == null ? void 0 : _Ob.fetch) == null ? void 0 : _Pb.includeHttpStatusReturnType) != null ? _Qb : true,
|
|
4236
|
+
...(_Sb = (_Rb = outputOptions.override) == null ? void 0 : _Rb.fetch) != null ? _Sb : {}
|
|
4237
|
+
},
|
|
4238
|
+
useDates: ((_Tb = outputOptions.override) == null ? void 0 : _Tb.useDates) || false,
|
|
4239
|
+
useDeprecatedOperations: (_Vb = (_Ub = outputOptions.override) == null ? void 0 : _Ub.useDeprecatedOperations) != null ? _Vb : true,
|
|
4240
|
+
useNativeEnums: (_Xb = (_Wb = outputOptions.override) == null ? void 0 : _Wb.useNativeEnums) != null ? _Xb : false,
|
|
4241
|
+
suppressReadonlyModifier: ((_Yb = outputOptions.override) == null ? void 0 : _Yb.suppressReadonlyModifier) || false
|
|
4312
4242
|
},
|
|
4313
|
-
allParamsOptional: (
|
|
4314
|
-
urlEncodeParameters: (
|
|
4315
|
-
optionsParamRequired: (
|
|
4243
|
+
allParamsOptional: (_Zb = outputOptions.allParamsOptional) != null ? _Zb : false,
|
|
4244
|
+
urlEncodeParameters: (__b = outputOptions.urlEncodeParameters) != null ? __b : false,
|
|
4245
|
+
optionsParamRequired: (_$b = outputOptions.optionsParamRequired) != null ? _$b : false
|
|
4316
4246
|
},
|
|
4317
4247
|
hooks: options.hooks ? normalizeHooks(options.hooks) : {}
|
|
4318
4248
|
};
|
|
@@ -4587,8 +4517,7 @@ var getDefaultFilesHeader = ({
|
|
|
4587
4517
|
// src/utils/watcher.ts
|
|
4588
4518
|
var import_core8 = require("@orval/core");
|
|
4589
4519
|
var startWatcher = async (watchOptions, watchFn, defaultTarget = ".") => {
|
|
4590
|
-
if (!watchOptions)
|
|
4591
|
-
return;
|
|
4520
|
+
if (!watchOptions) return;
|
|
4592
4521
|
const { watch } = await Promise.resolve().then(() => __toESM(require("chokidar")));
|
|
4593
4522
|
const ignored = ["**/{.git,node_modules}/**"];
|
|
4594
4523
|
const watchPaths = typeof watchOptions === "boolean" ? defaultTarget : Array.isArray(watchOptions) ? watchOptions.filter(
|
|
@@ -4850,8 +4779,7 @@ var generateSpecs = async (config, workspace, projectName) => {
|
|
|
4850
4779
|
},
|
|
4851
4780
|
[]
|
|
4852
4781
|
);
|
|
4853
|
-
if (hasErrors)
|
|
4854
|
-
process.exit(1);
|
|
4782
|
+
if (hasErrors) process.exit(1);
|
|
4855
4783
|
return accumulate;
|
|
4856
4784
|
};
|
|
4857
4785
|
var generateConfig = async (configFile, options) => {
|