bc-minecraft-molang 1.21.100-0 → 1.21.100-11
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/lib/src/graph/index.d.ts +1 -0
- package/lib/src/graph/index.js +38 -0
- package/lib/src/graph/index.js.map +1 -0
- package/lib/src/main.d.ts +2 -1
- package/lib/src/main.js +2 -24
- package/lib/src/main.js.map +1 -1
- package/lib/src/molang/functions.js +4 -3
- package/lib/src/molang/functions.js.map +1 -1
- package/lib/src/molang/index.d.ts +1 -0
- package/lib/src/molang/index.js +1 -0
- package/lib/src/molang/index.js.map +1 -1
- package/lib/src/molang/molang-set.d.ts +2 -1
- package/lib/src/molang/molang-set.js +5 -1
- package/lib/src/molang/molang-set.js.map +1 -1
- package/lib/src/molang/syntax/nodes.d.ts +4 -2
- package/lib/src/molang/syntax/nodes.js +50 -0
- package/lib/src/molang/syntax/nodes.js.map +1 -1
- package/lib/src/molang/syntax/operators.d.ts +8 -0
- package/lib/src/molang/syntax/operators.js +4 -3
- package/lib/src/molang/syntax/operators.js.map +1 -1
- package/lib/src/molang/syntax/parse.js +45 -3
- package/lib/src/molang/syntax/parse.js.map +1 -1
- package/lib/src/molang/syntax/tokens.js +30 -2
- package/lib/src/molang/syntax/tokens.js.map +1 -1
- package/package.json +8 -8
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * as Mermaid from './mermaid';
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.Mermaid = void 0;
|
|
37
|
+
exports.Mermaid = __importStar(require("./mermaid"));
|
|
38
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/graph/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAoC"}
|
package/lib/src/main.d.ts
CHANGED
package/lib/src/main.js
CHANGED
|
@@ -10,33 +10,11 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
o[k2] = m[k];
|
|
12
12
|
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
19
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
20
15
|
};
|
|
21
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
22
|
-
var ownKeys = function(o) {
|
|
23
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
24
|
-
var ar = [];
|
|
25
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
26
|
-
return ar;
|
|
27
|
-
};
|
|
28
|
-
return ownKeys(o);
|
|
29
|
-
};
|
|
30
|
-
return function (mod) {
|
|
31
|
-
if (mod && mod.__esModule) return mod;
|
|
32
|
-
var result = {};
|
|
33
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
34
|
-
__setModuleDefault(result, mod);
|
|
35
|
-
return result;
|
|
36
|
-
};
|
|
37
|
-
})();
|
|
38
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.Molang = void 0;
|
|
40
17
|
__exportStar(require("./data"), exports);
|
|
41
|
-
|
|
18
|
+
__exportStar(require("./graph"), exports);
|
|
19
|
+
__exportStar(require("./molang"), exports);
|
|
42
20
|
//# sourceMappingURL=main.js.map
|
package/lib/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,0CAAwB;AACxB,2CAAyB"}
|
|
@@ -37,7 +37,7 @@ function isMolangType(data) {
|
|
|
37
37
|
return MolangType.unknown;
|
|
38
38
|
}
|
|
39
39
|
function isMolang(data) {
|
|
40
|
-
return molangRegexp.test(data);
|
|
40
|
+
return molangRegexp.test(data) && data !== "this";
|
|
41
41
|
}
|
|
42
42
|
/**
|
|
43
43
|
* Already assumes that the given data is of type MolangType.event
|
|
@@ -54,10 +54,11 @@ function getEvent(data) {
|
|
|
54
54
|
function isValidMolang(molang) {
|
|
55
55
|
let instr = false;
|
|
56
56
|
let level = 0;
|
|
57
|
-
for (let
|
|
58
|
-
switch (molang[
|
|
57
|
+
for (let i = 0; i < molang.length; i++) {
|
|
58
|
+
switch (molang[i]) {
|
|
59
59
|
case "'":
|
|
60
60
|
instr = !instr;
|
|
61
|
+
break;
|
|
61
62
|
case "[":
|
|
62
63
|
case "{":
|
|
63
64
|
case "(":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../src/molang/functions.ts"],"names":[],"mappings":";;;AAuBA,oCAMC;AAED,4BAEC;AAMD,4BAEC;AAOD,
|
|
1
|
+
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../src/molang/functions.ts"],"names":[],"mappings":";;;AAuBA,oCAMC;AAED,4BAEC;AAMD,4BAEC;AAOD,sCAyBC;AASD,oBAgCC;AAlHD,mCAAmC;AACnC,yBAAyB;AACzB,IAAY,UASX;AATD,WAAY,UAAU;IACpB,gBAAgB;IAChB,iDAAO,CAAA;IACP,eAAe;IACf,6CAAK,CAAA;IACL,qBAAqB;IACrB,+CAAM,CAAA;IACN,cAAc;IACd,iDAAO,CAAA;AACT,CAAC,EATW,UAAU,0BAAV,UAAU,QASrB;AAED,MAAM,UAAU,GAAG,kBAAkB,CAAC;AACtC,MAAM,YAAY,GAAG,aAAa,CAAC;AACnC,MAAM,YAAY,GAChB,2GAA2G,CAAC;AAE9G;;;;GAIG;AACH,SAAgB,YAAY,CAAC,IAAY;IACvC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC,OAAO,CAAC;IACvD,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACnD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,UAAU,CAAC,MAAM,CAAC;IAEtD,OAAO,UAAU,CAAC,OAAO,CAAC;AAC5B,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAY;IACnC,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,MAAM,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,SAAgB,QAAQ,CAAC,IAAY;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9B,CAAC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,MAAc;IAC1C,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,QAAQ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAClB,KAAK,GAAG;gBACN,KAAK,GAAG,CAAC,KAAK,CAAC;gBACf,MAAM;YAER,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,IAAI,CAAC,KAAK;oBAAE,KAAK,EAAE,CAAC;gBACpB,MAAM;YAER,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,IAAI,CAAC,KAAK;oBAAE,KAAK,EAAE,CAAC;gBACpB,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,KAAK,CAAC;AACxC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,IAAI,CAAC,MAAc,EAAE,UAAkB,EAAE,IAAY;IACnE,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IAEnC,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACnC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;gBACzC,OAAO,CAAC,CAAC;YACX,CAAC;QACH,CAAC;QAED,QAAQ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAClB,KAAK,GAAG;gBACN,KAAK,GAAG,CAAC,KAAK,CAAC;YAEjB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,IAAI,CAAC,KAAK;oBAAE,KAAK,EAAE,CAAC;gBACpB,MAAM;YAER,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,IAAI,CAAC,KAAK;oBAAE,KAAK,EAAE,CAAC;gBACpB,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC"}
|
package/lib/src/molang/index.js
CHANGED
|
@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
/* Auto generated */
|
|
18
|
+
__exportStar(require("./cache"), exports);
|
|
18
19
|
__exportStar(require("./functions"), exports);
|
|
19
20
|
__exportStar(require("./molang-set"), exports);
|
|
20
21
|
__exportStar(require("./syntax"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/molang/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAoB;AACpB,8CAA4B;AAC5B,+CAA6B;AAC7B,2CAAyB;AACzB,6CAA2B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/molang/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oBAAoB;AACpB,0CAAwB;AACxB,8CAA4B;AAC5B,+CAA6B;AAC7B,2CAAyB;AACzB,6CAA2B"}
|
|
@@ -21,5 +21,6 @@ export declare class MolangSet {
|
|
|
21
21
|
add(molang: OffsetWord): void;
|
|
22
22
|
private walkFn;
|
|
23
23
|
private checkAssigned;
|
|
24
|
-
harvest(object: Record<string, any> | string, originalText: string):
|
|
24
|
+
harvest(object: Record<string, any> | string, originalText: string): this;
|
|
25
|
+
static harvest(object: Record<string, any> | string, originalText: string): MolangSet;
|
|
25
26
|
}
|
|
@@ -60,7 +60,7 @@ class MolangSet {
|
|
|
60
60
|
if (typeof object === "string") {
|
|
61
61
|
if ((0, functions_1.isMolang)(object)) {
|
|
62
62
|
this.add(types_1.OffsetWord.create(object, originalText.indexOf(object)));
|
|
63
|
-
return;
|
|
63
|
+
return this;
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
for (const [, value] of Object.entries(object)) {
|
|
@@ -78,6 +78,10 @@ class MolangSet {
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
+
return this;
|
|
82
|
+
}
|
|
83
|
+
static harvest(object, originalText) {
|
|
84
|
+
return new MolangSet().harvest(object, originalText);
|
|
81
85
|
}
|
|
82
86
|
}
|
|
83
87
|
exports.MolangSet = MolangSet;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"molang-set.js","sourceRoot":"","sources":["../../../src/molang/molang-set.ts"],"names":[],"mappings":";;;AAAA,gEAAkE;AAClE,mCAA4C;AAC5C,2CAAsD;AACtD,qCAAiH;AAEjH,uCAAuC;AACvC,MAAa,SAAS;IAMpB;QALO,UAAK,GAAG,IAAI,yBAAiB,EAAE,CAAC;QAChC,aAAQ,GAAG,IAAI,GAAG,EAAwC,CAAC;QAC3D,cAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;QACxC,UAAK,GAAG,IAAI,GAAG,EAAwC,CAAC;IAEhD,CAAC;IAEhB;;;OAGG;IACH,KAAK,CAAC,MAAkB;QACtB,IAAI,IAAA,yBAAa,EAAC,MAAM,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,MAAkB;QACpB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO;QAC9B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,aAAI,EAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAEO,MAAM,CAAC,IAAoB;QACjC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,iBAAQ,CAAC,UAAU;gBACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,iBAAQ,CAAC,YAAY;gBACxB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;YACR,KAAK,iBAAQ,CAAC,iBAAiB,CAAC;YAChC,KAAK,iBAAQ,CAAC,QAAQ;gBACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;oBAAE,MAAM;gBACnC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACrB,MAAM;QACV,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,IAAoB;QACxC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,iBAAQ,CAAC,iBAAiB,CAAC;YAChC,KAAK,iBAAQ,CAAC,QAAQ;gBACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,CAAC,MAAoC,EAAE,YAAoB;QAChE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,IAAI,IAAA,oBAAQ,EAAC,MAAM,CAAC,EAAE,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,kBAAU,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClE,OAAO;
|
|
1
|
+
{"version":3,"file":"molang-set.js","sourceRoot":"","sources":["../../../src/molang/molang-set.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Token } from "./tokens";
|
|
2
2
|
/** Variable scope types in Molang */
|
|
3
|
-
export type VariableScope = "temp" | "t" | "variable" | "v" | "context" | "c" | "array";
|
|
3
|
+
export type VariableScope = "this" | "temp" | "t" | "variable" | "v" | "context" | "c" | "array";
|
|
4
4
|
/** Function namespace types in Molang */
|
|
5
5
|
export type FunctionScope = "math" | "query" | "q";
|
|
6
6
|
export type ResourceScope = "texture" | "material" | "geometry";
|
|
@@ -107,7 +107,7 @@ export declare namespace FunctionCallNode {
|
|
|
107
107
|
export interface VariableNode extends SyntaxNode {
|
|
108
108
|
type: NodeType.Variable;
|
|
109
109
|
scope: VariableScope;
|
|
110
|
-
names: [string] | [string, string];
|
|
110
|
+
names: [] | [string] | [string, string];
|
|
111
111
|
}
|
|
112
112
|
export declare namespace VariableNode {
|
|
113
113
|
const create: (data: Omit<VariableNode, "type">) => VariableNode;
|
|
@@ -167,4 +167,6 @@ export declare namespace MarkerNode {
|
|
|
167
167
|
export type ExpressionNode = ArrayAccessNode | AssignmentNode | BinaryOperationNode | ConditionalExpressionNode | ConditionalNode | FunctionCallNode | LiteralNode | MarkerNode | NullishCoalescingNode | ResourceReferenceNode | StatementSequenceNode | StringLiteralNode | UnaryOperationNode | VariableNode;
|
|
168
168
|
export declare namespace ExpressionNode {
|
|
169
169
|
function getChildern(node: ExpressionNode): ExpressionNode[];
|
|
170
|
+
function getIdentifier(node: Pick<ResourceReferenceNode | VariableNode | FunctionCallNode, "scope" | "names">, prefixed?: boolean): string;
|
|
171
|
+
function getLastEndPosition(node: ExpressionNode): number;
|
|
170
172
|
}
|
|
@@ -127,5 +127,55 @@ var ExpressionNode;
|
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
ExpressionNode.getChildern = getChildern;
|
|
130
|
+
function getIdentifier(node, prefixed = true) {
|
|
131
|
+
if (prefixed) {
|
|
132
|
+
return `${node.scope}.${node.names.join(".")}`;
|
|
133
|
+
}
|
|
134
|
+
return node.names.join(".");
|
|
135
|
+
}
|
|
136
|
+
ExpressionNode.getIdentifier = getIdentifier;
|
|
137
|
+
function getLastEndPosition(node) {
|
|
138
|
+
var _a;
|
|
139
|
+
function max(a, b) {
|
|
140
|
+
return a.position > b.position ? a : b;
|
|
141
|
+
}
|
|
142
|
+
while (node !== undefined) {
|
|
143
|
+
switch (node.type) {
|
|
144
|
+
// End of trees
|
|
145
|
+
case NodeType.ResourceReference:
|
|
146
|
+
case NodeType.Variable:
|
|
147
|
+
return node.position + getIdentifier(node).length;
|
|
148
|
+
case NodeType.Literal:
|
|
149
|
+
case NodeType.StringLiteral:
|
|
150
|
+
return node.position + node.value.length;
|
|
151
|
+
case NodeType.Marker:
|
|
152
|
+
return node.token.position + node.token.value.length;
|
|
153
|
+
case NodeType.ArrayAccess:
|
|
154
|
+
node = node.index;
|
|
155
|
+
break;
|
|
156
|
+
case NodeType.UnaryOperation:
|
|
157
|
+
node = node.operand;
|
|
158
|
+
break;
|
|
159
|
+
case NodeType.NullishCoalescing:
|
|
160
|
+
case NodeType.BinaryOperation:
|
|
161
|
+
case NodeType.Assignment:
|
|
162
|
+
node = max(node.right, node.left);
|
|
163
|
+
break;
|
|
164
|
+
case NodeType.FunctionCall:
|
|
165
|
+
const args = node.arguments;
|
|
166
|
+
args.forEach((arg) => (node = max(node, arg)));
|
|
167
|
+
break;
|
|
168
|
+
case NodeType.StatementSequence:
|
|
169
|
+
const stats = node.statements;
|
|
170
|
+
stats.forEach((arg) => (node = max(node, arg)));
|
|
171
|
+
break;
|
|
172
|
+
case NodeType.Conditional:
|
|
173
|
+
node = max(node.condition, max(node.falseExpression, node.trueExpression));
|
|
174
|
+
break;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
return (_a = node === null || node === void 0 ? void 0 : node.position) !== null && _a !== void 0 ? _a : 0;
|
|
178
|
+
}
|
|
179
|
+
ExpressionNode.getLastEndPosition = getLastEndPosition;
|
|
130
180
|
})(ExpressionNode || (exports.ExpressionNode = ExpressionNode = {}));
|
|
131
181
|
//# sourceMappingURL=nodes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../../src/molang/syntax/nodes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../../src/molang/syntax/nodes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,10 @@
|
|
|
1
1
|
import { SyntaxBuilder } from "./builder";
|
|
2
2
|
export declare function processOperators(builder: SyntaxBuilder): void;
|
|
3
|
+
export interface Processed {
|
|
4
|
+
_processed: boolean;
|
|
5
|
+
}
|
|
6
|
+
export declare namespace Processed {
|
|
7
|
+
function withValue<T extends object>(obj: T, value: boolean): void;
|
|
8
|
+
/** */
|
|
9
|
+
function shouldSkip<T extends object>(obj: T): boolean;
|
|
10
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Processed = void 0;
|
|
3
4
|
exports.processOperators = processOperators;
|
|
4
5
|
const console_1 = require("console");
|
|
5
6
|
const errors_1 = require("./errors");
|
|
@@ -9,7 +10,7 @@ function processOperators(builder) {
|
|
|
9
10
|
if (builder.hasOperator("??"))
|
|
10
11
|
processNullishCoalescing(builder); // ??
|
|
11
12
|
// Process unary operators (highest precedence)
|
|
12
|
-
processUnaryOperators(builder); //
|
|
13
|
+
processUnaryOperators(builder); // ?, !, return or -u
|
|
13
14
|
ifOperator(builder, "==");
|
|
14
15
|
ifOperator(builder, "!=");
|
|
15
16
|
ifOperator(builder, "<");
|
|
@@ -39,7 +40,7 @@ var Processed;
|
|
|
39
40
|
return (obj === null || obj === void 0 ? void 0 : obj._processed) === true;
|
|
40
41
|
}
|
|
41
42
|
Processed.shouldSkip = shouldSkip;
|
|
42
|
-
})(Processed || (Processed = {}));
|
|
43
|
+
})(Processed || (exports.Processed = Processed = {}));
|
|
43
44
|
function ifOperator(builder, operator) {
|
|
44
45
|
if (builder.hasOperator(operator))
|
|
45
46
|
processBinaryOperators(builder, operator);
|
|
@@ -209,7 +210,7 @@ function wrapIf(nodes) {
|
|
|
209
210
|
});
|
|
210
211
|
}
|
|
211
212
|
/**
|
|
212
|
-
*
|
|
213
|
+
* ?, !, return and -u
|
|
213
214
|
*/
|
|
214
215
|
function processUnaryOperators(builder) {
|
|
215
216
|
const statements = builder.result.statements;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../src/molang/syntax/operators.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"operators.js","sourceRoot":"","sources":["../../../../src/molang/syntax/operators.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const operators_1 = require("./operators");
|
|
|
10
10
|
/** Main function to parse Molang code into a syntax tree */
|
|
11
11
|
function parseMolang(line) {
|
|
12
12
|
const tokens = (0, tokens_1.tokenize)(line.text);
|
|
13
|
+
tokens.forEach((t) => (t.position += line.offset));
|
|
13
14
|
const statements = splitTokens(tokens, (item) => item.type === tokens_1.TokenType.Semicolon).filter((t) => t.length > 0);
|
|
14
15
|
// Parse each statement
|
|
15
16
|
return statements
|
|
@@ -24,7 +25,7 @@ function parseMolang(line) {
|
|
|
24
25
|
*/
|
|
25
26
|
function parseTokens(tokens) {
|
|
26
27
|
var _a, _b;
|
|
27
|
-
tokens = trimBraces(tokens);
|
|
28
|
+
// tokens = trimBraces(tokens);
|
|
28
29
|
tokens = trimEnding(tokens);
|
|
29
30
|
if (tokens.length === 1)
|
|
30
31
|
return (_a = convertToken(tokens[0])) !== null && _a !== void 0 ? _a : costlyConvertToken(tokens, 0).node;
|
|
@@ -108,9 +109,25 @@ function trimEnding(tokens) {
|
|
|
108
109
|
*/
|
|
109
110
|
function convertToken(token) {
|
|
110
111
|
switch (token.type) {
|
|
112
|
+
case tokens_1.TokenType.Identifier:
|
|
113
|
+
switch (token.value) {
|
|
114
|
+
case "this":
|
|
115
|
+
return nodes_1.VariableNode.create({
|
|
116
|
+
scope: "this",
|
|
117
|
+
names: [],
|
|
118
|
+
position: token.position,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
break;
|
|
111
122
|
case tokens_1.TokenType.NamespacedIdentifier:
|
|
112
123
|
const parts = token.value.split(".");
|
|
113
124
|
switch (parts[0]) {
|
|
125
|
+
case "this":
|
|
126
|
+
return nodes_1.VariableNode.create({
|
|
127
|
+
scope: "this",
|
|
128
|
+
names: [],
|
|
129
|
+
position: token.position,
|
|
130
|
+
});
|
|
114
131
|
case "q":
|
|
115
132
|
case "math":
|
|
116
133
|
case "query":
|
|
@@ -140,6 +157,12 @@ function convertToken(token) {
|
|
|
140
157
|
position: token.position,
|
|
141
158
|
scope: parts[0],
|
|
142
159
|
});
|
|
160
|
+
case "return":
|
|
161
|
+
return nodes_1.UnaryOperationNode.create({
|
|
162
|
+
operator: token.value,
|
|
163
|
+
position: token.position,
|
|
164
|
+
operand: {},
|
|
165
|
+
});
|
|
143
166
|
}
|
|
144
167
|
break;
|
|
145
168
|
case tokens_1.TokenType.Number:
|
|
@@ -160,6 +183,9 @@ function convertToken(token) {
|
|
|
160
183
|
right: {},
|
|
161
184
|
});
|
|
162
185
|
case tokens_1.TokenType.UnaryOperator:
|
|
186
|
+
// Skip the return operator, and have that done via costly
|
|
187
|
+
if (token.value === "return")
|
|
188
|
+
break;
|
|
163
189
|
return nodes_1.UnaryOperationNode.create({
|
|
164
190
|
operator: token.value,
|
|
165
191
|
position: token.position,
|
|
@@ -205,11 +231,27 @@ function costlyConvertToken(tokens, startIndex) {
|
|
|
205
231
|
case tokens_1.TokenType.OpenParen:
|
|
206
232
|
const code = (0, util_1.getMatchingTokenSlice)(tokens, startIndex);
|
|
207
233
|
return {
|
|
208
|
-
node: parseTokens(code),
|
|
234
|
+
node: parseTokens(trimBraces(code)),
|
|
209
235
|
startIndex: startIndex + code.length,
|
|
210
236
|
};
|
|
237
|
+
case tokens_1.TokenType.UnaryOperator:
|
|
238
|
+
// Everything that comes after return is part of its expression statement
|
|
239
|
+
if (current.value === "return") {
|
|
240
|
+
const code = tokens.slice(startIndex + 1);
|
|
241
|
+
const node = nodes_1.UnaryOperationNode.create({
|
|
242
|
+
operator: current.value,
|
|
243
|
+
position: current.position,
|
|
244
|
+
operand: parseTokens(trimBraces(code)),
|
|
245
|
+
});
|
|
246
|
+
// We already processed the return statement
|
|
247
|
+
operators_1.Processed.withValue(node, true);
|
|
248
|
+
return {
|
|
249
|
+
node: node,
|
|
250
|
+
startIndex: startIndex + 1 + code.length,
|
|
251
|
+
};
|
|
252
|
+
}
|
|
211
253
|
}
|
|
212
|
-
throw errors_1.MolangSyntaxError.fromToken(current, `don't know how to process this token: ${current.value} ${tokens_1.TokenType[current.type]}`);
|
|
254
|
+
throw errors_1.MolangSyntaxError.fromToken(current, `don't know how to process this token: ['${current.value}' ${tokens_1.TokenType[current.type]}]`);
|
|
213
255
|
}
|
|
214
256
|
function splitTokens(tokens, predicate) {
|
|
215
257
|
const result = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../../src/molang/syntax/parse.ts"],"names":[],"mappings":";;AAwBA,
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../../src/molang/syntax/parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,6 +72,10 @@ function tokenize(input) {
|
|
|
72
72
|
value += input[pos];
|
|
73
73
|
pos++;
|
|
74
74
|
}
|
|
75
|
+
if (input[pos] === "f") {
|
|
76
|
+
value += input[pos];
|
|
77
|
+
pos++;
|
|
78
|
+
}
|
|
75
79
|
tokens.push({ type: TokenType.Number, value, position: start });
|
|
76
80
|
continue;
|
|
77
81
|
}
|
|
@@ -208,7 +212,13 @@ function tokenize(input) {
|
|
|
208
212
|
return tokens;
|
|
209
213
|
}
|
|
210
214
|
function checkUnaryOperators(item, index, items) {
|
|
211
|
-
if (item.type
|
|
215
|
+
if (item.type === TokenType.Identifier && item.value === "return") {
|
|
216
|
+
item.type = TokenType.UnaryOperator;
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
if (item.type !== TokenType.Operator)
|
|
220
|
+
return;
|
|
221
|
+
if (item.value !== "-" && item.value !== "+")
|
|
212
222
|
return;
|
|
213
223
|
if (index === 0) {
|
|
214
224
|
item.type = TokenType.UnaryOperator;
|
|
@@ -216,11 +226,29 @@ function checkUnaryOperators(item, index, items) {
|
|
|
216
226
|
}
|
|
217
227
|
const previous = items[index - 1];
|
|
218
228
|
switch (previous.type) {
|
|
229
|
+
case TokenType.CloseBrace:
|
|
230
|
+
case TokenType.CloseBracket:
|
|
231
|
+
case TokenType.CloseParen:
|
|
232
|
+
case TokenType.Identifier:
|
|
233
|
+
case TokenType.NamespacedIdentifier:
|
|
234
|
+
case TokenType.Number:
|
|
235
|
+
case TokenType.StringLiteral:
|
|
236
|
+
break;
|
|
237
|
+
case TokenType.ArrayAccess:
|
|
238
|
+
case TokenType.Arrow:
|
|
239
|
+
case TokenType.Assignment:
|
|
240
|
+
case TokenType.Colon:
|
|
219
241
|
case TokenType.Comma:
|
|
220
|
-
case TokenType.
|
|
242
|
+
case TokenType.Dot:
|
|
243
|
+
case TokenType.EOF:
|
|
244
|
+
case TokenType.NullishCoalescing:
|
|
221
245
|
case TokenType.OpenBrace:
|
|
222
246
|
case TokenType.OpenBracket:
|
|
223
247
|
case TokenType.OpenParen:
|
|
248
|
+
case TokenType.Operator:
|
|
249
|
+
case TokenType.QuestionMark:
|
|
250
|
+
case TokenType.Semicolon:
|
|
251
|
+
case TokenType.UnaryOperator:
|
|
224
252
|
item.type = TokenType.UnaryOperator;
|
|
225
253
|
break;
|
|
226
254
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../../src/molang/syntax/tokens.ts"],"names":[],"mappings":";;;AA2DA,
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../../../src/molang/syntax/tokens.ts"],"names":[],"mappings":";;;AA2DA,4BA6KC;AAjOD,IAAiB,KAAK,CAMrB;AAND,WAAiB,KAAK;IACpB,SAAgB,SAAS,CAAC,CAAkC,EAAE,GAAG,MAAmB;QAClF,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAElC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAJe,eAAS,YAIxB,CAAA;AACH,CAAC,EANgB,KAAK,qBAAL,KAAK,QAMrB;AAED,IAAY,SAuBX;AAvBD,WAAY,SAAS;IACnB,uDAAW,CAAA;IACX,2CAAK,CAAA;IACL,qDAAU,CAAA;IACV,qDAAU,CAAA;IACV,yDAAY,CAAA;IACZ,qDAAU,CAAA;IACV,2CAAK,CAAA;IACL,2CAAK,CAAA;IACL,uCAAG,CAAA;IACH,qDAAU,CAAA;IACV,0EAAoB,CAAA;IACpB,oEAAiB,CAAA;IACjB,8CAAM,CAAA;IACN,oDAAS,CAAA;IACT,wDAAW,CAAA;IACX,oDAAS,CAAA;IACT,kDAAQ,CAAA;IACR,0DAAY,CAAA;IACZ,oDAAS,CAAA;IACT,4DAAa,CAAA;IACb,4DAAa,CAAA;IACb,wCAAG,CAAA;AACL,CAAC,EAvBW,SAAS,yBAAT,SAAS,QAuBpB;AAED,SAAS,OAAO,CAAC,EAAU;IACzB,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM;AACzC,CAAC;AAED,SAAS,OAAO,CAAC,EAAU;IACzB,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,CACL,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,IAAI,MAAM;QACpC,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,IAAI,GAAG,CAAC,IAAI,MAAM;QACrC,EAAE,KAAK,GAAG,CACX,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,EAAU;IAChC,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;AACpC,CAAC;AAED,sDAAsD;AACtD,SAAgB,QAAQ,CAAC,KAAa;IACpC,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,IAAI,GAAG,GAAG,CAAC,CAAC;IAEZ,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAExB,kBAAkB;QAClB,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG,CAAC;YACT,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI;gBACP,GAAG,EAAE,CAAC;gBACN,SAAS;QACb,CAAC;QAED,UAAU;QACV,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAClB,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,GAAG,CAAC;YAElB,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;gBACzE,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpB,GAAG,EAAE,CAAC;YACR,CAAC;YAED,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC;gBACvB,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBACpB,GAAG,EAAE,CAAC;YACR,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAChE,SAAS;QACX,CAAC;QAED,4EAA4E;QAC5E,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAClB,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,GAAG,CAAC;YAElB,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC1B,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtB,mEAAmE;gBACnE,IAAI,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;oBACnD,KAAK,IAAI,EAAE,CAAC;oBACZ,GAAG,EAAE,CAAC;gBACR,CAAC;qBAAM,CAAC;oBACN,MAAM;gBACR,CAAC;YACH,CAAC;YAED,qDAAqD;YACrD,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,oBAAoB,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YACrG,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3F,CAAC;YACD,SAAS;QACX,CAAC;QAED,4BAA4B;QAC5B,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QAC9C,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;YACtF,GAAG,IAAI,CAAC,CAAC;YACT,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QAC5C,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI,CAAC;YACV,KAAK,IAAI;gBACP,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC3E,GAAG,IAAI,CAAC,CAAC;gBACT,SAAS;YACX,KAAK,IAAI;gBACP,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACpF,GAAG,IAAI,CAAC,CAAC;gBACT,SAAS;YACX,QAAQ;QACV,CAAC;QAED,6CAA6C;QAC7C,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACvE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACvE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACzE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC1E,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACvE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC1E,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACnE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACjE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC3E,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACtE,MAAM;YACR,KAAK,GAAG;gBACN,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACnE,MAAM;YACR,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,yBAAyB;gBACzB,MAAM,KAAK,GAAG,IAAI,CAAC;gBACnB,MAAM,KAAK,GAAG,GAAG,CAAC;gBAClB,GAAG,EAAE,CAAC;gBACN,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,OAAO,GAAG,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;oBAClD,gEAAgE;oBAChE,KAAK,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,GAAG,EAAE,CAAC;gBACR,CAAC;gBACD,IAAI,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,oDAAoD,KAAK,EAAE,CAAC,CAAC;gBAC/E,CAAC;gBACD,GAAG,EAAE,CAAC,CAAC,qBAAqB;gBAC5B,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,SAAS,CAAC,aAAa;oBAC7B,KAAK,EAAE,KAAK,EAAE,2CAA2C;oBACzD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CAAC;gBACH,SAAS,CAAC,wEAAwE;YACpF;gBACE,MAAM,IAAI,KAAK,CAAC,oCAAoC,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,GAAG,EAAE,CAAC;QACN,SAAS;IACX,CAAC;IAED,qCAAqC;IACrC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;IAEhE,4BAA4B;IAC5B,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAEpC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAW,EAAE,KAAa,EAAE,KAAc;IACrE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAClE,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC;QACpC,OAAO;IACT,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ;QAAE,OAAO;IAC7C,IAAI,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,KAAK,GAAG;QAAE,OAAO;IAErD,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC;QACpC,OAAO;IACT,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAClC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,SAAS,CAAC,UAAU,CAAC;QAC1B,KAAK,SAAS,CAAC,YAAY,CAAC;QAC5B,KAAK,SAAS,CAAC,UAAU,CAAC;QAC1B,KAAK,SAAS,CAAC,UAAU,CAAC;QAC1B,KAAK,SAAS,CAAC,oBAAoB,CAAC;QACpC,KAAK,SAAS,CAAC,MAAM,CAAC;QACtB,KAAK,SAAS,CAAC,aAAa;YAC1B,MAAM;QACR,KAAK,SAAS,CAAC,WAAW,CAAC;QAC3B,KAAK,SAAS,CAAC,KAAK,CAAC;QACrB,KAAK,SAAS,CAAC,UAAU,CAAC;QAC1B,KAAK,SAAS,CAAC,KAAK,CAAC;QACrB,KAAK,SAAS,CAAC,KAAK,CAAC;QACrB,KAAK,SAAS,CAAC,GAAG,CAAC;QACnB,KAAK,SAAS,CAAC,GAAG,CAAC;QACnB,KAAK,SAAS,CAAC,iBAAiB,CAAC;QACjC,KAAK,SAAS,CAAC,SAAS,CAAC;QACzB,KAAK,SAAS,CAAC,WAAW,CAAC;QAC3B,KAAK,SAAS,CAAC,SAAS,CAAC;QACzB,KAAK,SAAS,CAAC,QAAQ,CAAC;QACxB,KAAK,SAAS,CAAC,YAAY,CAAC;QAC5B,KAAK,SAAS,CAAC,SAAS,CAAC;QACzB,KAAK,SAAS,CAAC,aAAa;YAC1B,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,aAAa,CAAC;YACpC,MAAM;QACR,QAAQ;IACV,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bc-minecraft-molang",
|
|
3
|
-
"version": "1.21.100-
|
|
3
|
+
"version": "1.21.100-11",
|
|
4
4
|
"description": "The library designed to deal with minecraft bedrock molang",
|
|
5
5
|
"main": "./lib/src/main.js",
|
|
6
6
|
"types": "./lib/src/main.d.ts",
|
|
@@ -40,20 +40,20 @@
|
|
|
40
40
|
"lib/src/**/*.d.ts"
|
|
41
41
|
],
|
|
42
42
|
"devDependencies": {
|
|
43
|
-
"@eslint/js": "^9.
|
|
43
|
+
"@eslint/js": "^9.35.0",
|
|
44
44
|
"@types/eslint__js": "^8.42.3",
|
|
45
45
|
"@types/jest": "^30.0.0",
|
|
46
|
-
"@types/node": "^24.
|
|
47
|
-
"eslint": "^9.
|
|
46
|
+
"@types/node": "^24.3.1",
|
|
47
|
+
"eslint": "^9.35.0",
|
|
48
48
|
"eslint-plugin-jest": "^29.0.1",
|
|
49
49
|
"rimraf": "^6.0.1",
|
|
50
|
-
"ts-jest": "^29.
|
|
50
|
+
"ts-jest": "^29.4.1",
|
|
51
51
|
"ts-loader": "^9.5.0",
|
|
52
52
|
"ts-node": "^10.9.1",
|
|
53
|
-
"typescript": "^5.
|
|
54
|
-
"typescript-eslint": "^8.
|
|
53
|
+
"typescript": "^5.9.2",
|
|
54
|
+
"typescript-eslint": "^8.42.0"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"bc-minecraft-bedrock-types": "^1.22.1-
|
|
57
|
+
"bc-minecraft-bedrock-types": "^1.22.1-16"
|
|
58
58
|
}
|
|
59
59
|
}
|