@bscotch/yy 1.0.0 → 1.0.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/dist/Yy.parse.js +1 -1
- package/dist/Yy.parse.js.map +1 -1
- package/dist/Yy.stringify.js +38 -9
- package/dist/Yy.stringify.js.map +1 -1
- package/package.json +1 -1
package/dist/Yy.parse.js
CHANGED
|
@@ -233,7 +233,7 @@ export function parseYy(source, schema) {
|
|
|
233
233
|
// Add the usual fields for the old format
|
|
234
234
|
obj.resourceType = key.slice(1);
|
|
235
235
|
// Just need SOME version to pass validation
|
|
236
|
-
obj.resourceVersion
|
|
236
|
+
obj.resourceVersion ||= obj[key];
|
|
237
237
|
}
|
|
238
238
|
}
|
|
239
239
|
white();
|
package/dist/Yy.parse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Yy.parse.js","sourceRoot":"","sources":["../src/Yy.parse.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Yy.parse.js","sourceRoot":"","sources":["../src/Yy.parse.ts"],"names":[],"mappings":"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"}
|
package/dist/Yy.stringify.js
CHANGED
|
@@ -145,12 +145,12 @@ export function stringifyYy(yyData, yyp) {
|
|
|
145
145
|
* - "name": "barrel_tendraam",
|
|
146
146
|
* - Everything else, in alphabetical order (case-insensitive).
|
|
147
147
|
*/
|
|
148
|
-
function prepareForStringification(yyData, yyp) {
|
|
149
|
-
const isNewFormat = yyIsNewFormat(yyData) || yyIsNewFormat(yyp);
|
|
148
|
+
function prepareForStringification(yyData, yyp, __isNewFormat) {
|
|
149
|
+
const isNewFormat = __isNewFormat || yyIsNewFormat(yyData) || yyIsNewFormat(yyp);
|
|
150
150
|
// Make a deep clone so we don't mutate the original.
|
|
151
151
|
// yyData = structuredClone(yyData);
|
|
152
152
|
if (Array.isArray(yyData)) {
|
|
153
|
-
return yyData.map((item) => prepareForStringification(item));
|
|
153
|
+
return yyData.map((item) => prepareForStringification(item, yyp, isNewFormat));
|
|
154
154
|
}
|
|
155
155
|
else if (yyData instanceof FixedNumber) {
|
|
156
156
|
return yyData;
|
|
@@ -161,8 +161,7 @@ function prepareForStringification(yyData, yyp) {
|
|
|
161
161
|
'resourceType' in yyData &&
|
|
162
162
|
typeof yyData.resourceType === 'string') {
|
|
163
163
|
// Then we need to ensure that the file has the `${resourceType}` key
|
|
164
|
-
//
|
|
165
|
-
yyDataCopy[`$${yyData.resourceType}`] = yyData.resourceVersion || '';
|
|
164
|
+
yyDataCopy[`$${yyData.resourceType}`] = ''; //yyData.resourceVersion || '';
|
|
166
165
|
}
|
|
167
166
|
const keys = Object.keys(yyDataCopy);
|
|
168
167
|
keys.sort((a, b) => {
|
|
@@ -186,24 +185,54 @@ function prepareForStringification(yyData, yyp) {
|
|
|
186
185
|
return 1;
|
|
187
186
|
}
|
|
188
187
|
}
|
|
188
|
+
else {
|
|
189
|
+
// localeCompare puts '%' before '$', but '$' should always come first
|
|
190
|
+
const aFirst = a[0];
|
|
191
|
+
const bFirst = b[0];
|
|
192
|
+
if (aFirst === '$')
|
|
193
|
+
return -1;
|
|
194
|
+
if (bFirst === '$')
|
|
195
|
+
return 1;
|
|
196
|
+
if (aFirst === '%')
|
|
197
|
+
return -1;
|
|
198
|
+
if (bFirst === '%')
|
|
199
|
+
return 1;
|
|
200
|
+
}
|
|
189
201
|
return a
|
|
190
202
|
.toLowerCase()
|
|
191
203
|
.localeCompare(b.toLowerCase(), 'en');
|
|
192
204
|
});
|
|
205
|
+
// @ts-expect-error
|
|
206
|
+
const newFormatResourceTypeKey = keys[0]?.[0] === '$' ? keys[0] : undefined;
|
|
207
|
+
if (newFormatResourceTypeKey && keys[1] !== '%Name') {
|
|
208
|
+
// Insert it after the resourceType key
|
|
209
|
+
// @ts-expect-error
|
|
210
|
+
keys.splice(1, 0, '%Name');
|
|
211
|
+
}
|
|
193
212
|
// Delete each entry and re-add it in the sorted order.
|
|
194
213
|
const reference = { ...yyDataCopy };
|
|
195
214
|
keys.forEach((key) => delete yyDataCopy[key]);
|
|
196
215
|
keys.forEach((key) => {
|
|
197
|
-
if (isNewFormat &&
|
|
198
|
-
['name', 'resourceType', 'resourceVersion'].includes(key)) {
|
|
216
|
+
if (isNewFormat && key === 'resourceType') {
|
|
199
217
|
// Then these are legacy format keys that we should skip
|
|
200
218
|
return;
|
|
201
219
|
}
|
|
220
|
+
else if (isNewFormat &&
|
|
221
|
+
key === 'resourceVersion' &&
|
|
222
|
+
newFormatResourceTypeKey !== '$GMProject') {
|
|
223
|
+
// There is a bug in the project file where resourceVersion is still included and required
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
if (newFormatResourceTypeKey && key === 'name') {
|
|
227
|
+
return;
|
|
228
|
+
}
|
|
229
|
+
// @ts-expect-error
|
|
230
|
+
yyDataCopy[key] = prepareForStringification(
|
|
202
231
|
// @ts-expect-error
|
|
203
|
-
|
|
232
|
+
reference[key], yyp, isNewFormat);
|
|
204
233
|
});
|
|
205
234
|
// Ensure that the %name field actually has a value
|
|
206
|
-
if (isNewFormat) {
|
|
235
|
+
if (isNewFormat && newFormatResourceTypeKey) {
|
|
207
236
|
yyDataCopy['%Name'] = yyDataCopy['%Name'] || reference['name'] || '';
|
|
208
237
|
}
|
|
209
238
|
return yyDataCopy;
|
package/dist/Yy.stringify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Yy.stringify.js","sourceRoot":"","sources":["../src/Yy.stringify.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Yy.stringify.js","sourceRoot":"","sources":["../src/Yy.stringify.ts"],"names":[],"mappings":"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"}
|