@bscotch/yy 2.3.1 → 2.3.2
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.stringify.d.ts.map +1 -1
- package/dist/Yy.stringify.js +7 -1
- package/dist/Yy.stringify.js.map +1 -1
- package/dist/types/GameMakerVersionString.d.ts +9 -1
- package/dist/types/GameMakerVersionString.d.ts.map +1 -1
- package/dist/types/GameMakerVersionString.js +16 -4
- package/dist/types/GameMakerVersionString.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Yy.stringify.d.ts","sourceRoot":"","sources":["../src/Yy.stringify.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAe,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Yy.stringify.d.ts","sourceRoot":"","sources":["../src/Yy.stringify.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAe,MAAM,gBAAgB,CAAC;AAyCvD,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AAErE;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,CA2J1D"}
|
package/dist/Yy.stringify.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { GameMakerVersionString } from './types/GameMakerVersionString.js';
|
|
2
|
-
import { FixedNumber, nameField, yyIsNewFormat } from './types/utility.js';
|
|
2
|
+
import { FixedNumber, isObjectWithField, nameField, yyIsNewFormat, } from './types/utility.js';
|
|
3
3
|
const escapable =
|
|
4
4
|
// eslint-disable-next-line no-control-regex, no-misleading-character-class
|
|
5
5
|
/[\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
|
|
@@ -170,6 +170,12 @@ function prepareForStringification(yyData, yyp, __meta = { root: yyData, isNewFo
|
|
|
170
170
|
isNewFormat,
|
|
171
171
|
path: [...__meta.path],
|
|
172
172
|
};
|
|
173
|
+
if (isObjectWithField(yyData, '$GMScript')) {
|
|
174
|
+
if (ideVersion?.gte('2024.800.0.618')) {
|
|
175
|
+
// Then we need to set this to "v1" instead of ""
|
|
176
|
+
yyData[`$GMScript`] = 'v1';
|
|
177
|
+
}
|
|
178
|
+
}
|
|
173
179
|
if (Array.isArray(yyData)) {
|
|
174
180
|
const prepared = yyData.map((item, i) => {
|
|
175
181
|
const meta = { ...__meta, path: [...__meta.path, i] };
|
package/dist/Yy.stringify.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Yy.stringify.js","sourceRoot":"","sources":["../src/Yy.stringify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,OAAO,
|
|
1
|
+
{"version":3,"file":"Yy.stringify.js","sourceRoot":"","sources":["../src/Yy.stringify.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
|
+
export type GameMakerVersionParsed = [
|
|
2
|
+
year: number,
|
|
3
|
+
month: number,
|
|
4
|
+
major: number,
|
|
5
|
+
minor: number
|
|
6
|
+
];
|
|
1
7
|
/** Utility class for GameMaker version strings, allowing easy comparison etc */
|
|
2
8
|
export declare class GameMakerVersionString {
|
|
3
9
|
#private;
|
|
4
10
|
readonly version: string;
|
|
5
11
|
constructor(version: string);
|
|
6
12
|
/** Get an array of integer values making up the version (returns a cloned array) */
|
|
7
|
-
get parsed():
|
|
13
|
+
get parsed(): GameMakerVersionParsed;
|
|
8
14
|
compare(other: GameMakerVersionString | string): 0 | 1 | -1;
|
|
9
15
|
gt(other: GameMakerVersionString | string): boolean;
|
|
10
16
|
gte(other: GameMakerVersionString | string): boolean;
|
|
@@ -18,6 +24,8 @@ export declare class GameMakerVersionString {
|
|
|
18
24
|
* A function that can be used for sorting GameMaker IDE/Runtime version
|
|
19
25
|
* strings, which are in the format "W.X.Y.Z" where W, X, Y, and Z
|
|
20
26
|
* are all integers.
|
|
27
|
+
* Note that comparisons across branches (lts, public, dev, beta)
|
|
28
|
+
* are messy, so mileage will vary for those.
|
|
21
29
|
* @returns -1 if a < b, 0 if a === b, 1 if a > b
|
|
22
30
|
*/
|
|
23
31
|
static compare(a: string | GameMakerVersionString, b: string | GameMakerVersionString): -1 | 0 | 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GameMakerVersionString.d.ts","sourceRoot":"","sources":["../../src/types/GameMakerVersionString.ts"],"names":[],"mappings":"AAEA,gFAAgF;AAChF,qBAAa,sBAAsB;;IAGrB,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;IAIpC,oFAAoF;IACpF,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"GameMakerVersionString.d.ts","sourceRoot":"","sources":["../../src/types/GameMakerVersionString.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,gFAAgF;AAChF,qBAAa,sBAAsB;;IAGrB,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAAf,OAAO,EAAE,MAAM;IAIpC,oFAAoF;IACpF,IAAI,MAAM,IAAI,sBAAsB,CAEnC;IAED,OAAO,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM;IAO9C,EAAE,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM;IAIzC,GAAG,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM;IAI1C,EAAE,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM;IAIzC,EAAE,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM;IAIzC,GAAG,CAAC,KAAK,EAAE,sBAAsB,GAAG,MAAM;IAI1C,QAAQ;IAGR,MAAM;IAIN,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,MAAM,EACrC,QAAQ,EAAE,CAAC,GACV,CAAC,SAAS,MAAM,EAAE,GAAG,sBAAsB,EAAE,GAAG,sBAAsB;IAOzE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,CACZ,CAAC,EAAE,MAAM,GAAG,sBAAsB,EAClC,CAAC,EAAE,MAAM,GAAG,sBAAsB,GACjC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAsBb,MAAM,CAAC,EAAE,CACP,CAAC,EAAE,MAAM,GAAG,sBAAsB,EAClC,CAAC,EAAE,MAAM,GAAG,sBAAsB;IAKpC,MAAM,CAAC,GAAG,CACR,CAAC,EAAE,MAAM,GAAG,sBAAsB,EAClC,CAAC,EAAE,MAAM,GAAG,sBAAsB;IAKpC,MAAM,CAAC,EAAE,CACP,CAAC,EAAE,MAAM,GAAG,sBAAsB,EAClC,CAAC,EAAE,MAAM,GAAG,sBAAsB;IAKpC,MAAM,CAAC,EAAE,CACP,CAAC,EAAE,MAAM,GAAG,sBAAsB,EAClC,CAAC,EAAE,MAAM,GAAG,sBAAsB;IAKpC,MAAM,CAAC,GAAG,CACR,CAAC,EAAE,MAAM,GAAG,sBAAsB,EAClC,CAAC,EAAE,MAAM,GAAG,sBAAsB;IAKpC,MAAM,CAAC,KAAK,CACV,OAAO,EAAE,MAAM,GACd,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;IAU9D,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC;CAQ3E"}
|
|
@@ -45,15 +45,27 @@ export class GameMakerVersionString {
|
|
|
45
45
|
* A function that can be used for sorting GameMaker IDE/Runtime version
|
|
46
46
|
* strings, which are in the format "W.X.Y.Z" where W, X, Y, and Z
|
|
47
47
|
* are all integers.
|
|
48
|
+
* Note that comparisons across branches (lts, public, dev, beta)
|
|
49
|
+
* are messy, so mileage will vary for those.
|
|
48
50
|
* @returns -1 if a < b, 0 if a === b, 1 if a > b
|
|
49
51
|
*/
|
|
50
52
|
static compare(a, b) {
|
|
51
|
-
const aVersion = typeof a === 'string' ? GameMakerVersionString.parse(a) : a.
|
|
52
|
-
const bVersion = typeof b === 'string' ? GameMakerVersionString.parse(b) : b.
|
|
53
|
+
const aVersion = typeof a === 'string' ? GameMakerVersionString.parse(a) : a.parsed;
|
|
54
|
+
const bVersion = typeof b === 'string' ? GameMakerVersionString.parse(b) : b.parsed;
|
|
53
55
|
for (let i = 0; i < 4; i++) {
|
|
54
|
-
|
|
56
|
+
let [aPart, bPart] = [aVersion[i], bVersion[i]];
|
|
57
|
+
if (i === 1) {
|
|
58
|
+
// GameMaker adds two zeros to the end of beta-channel versions, so if this entry is >= 100 we want to divide by 100
|
|
59
|
+
if (aPart >= 100) {
|
|
60
|
+
aPart = Math.floor(aPart / 100);
|
|
61
|
+
}
|
|
62
|
+
if (bPart >= 100) {
|
|
63
|
+
bPart = Math.floor(bPart / 100);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
if (aPart < bPart)
|
|
55
67
|
return -1;
|
|
56
|
-
if (
|
|
68
|
+
if (aPart > bPart)
|
|
57
69
|
return 1;
|
|
58
70
|
}
|
|
59
71
|
return 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GameMakerVersionString.js","sourceRoot":"","sources":["../../src/types/GameMakerVersionString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"GameMakerVersionString.js","sourceRoot":"","sources":["../../src/types/GameMakerVersionString.ts"],"names":[],"mappings":"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"}
|