agentlang 0.9.1 → 0.9.3
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/out/language/generated/ast.d.ts +12 -9
- package/out/language/generated/ast.d.ts.map +1 -1
- package/out/language/generated/ast.js +6 -2
- package/out/language/generated/ast.js.map +1 -1
- package/out/language/generated/grammar.d.ts.map +1 -1
- package/out/language/generated/grammar.js +164 -13
- package/out/language/generated/grammar.js.map +1 -1
- package/out/language/main.cjs +164 -13
- package/out/language/main.cjs.map +2 -2
- package/out/runtime/jsmodules.d.ts.map +1 -1
- package/out/runtime/jsmodules.js +7 -1
- package/out/runtime/jsmodules.js.map +1 -1
- package/out/runtime/modules/auth.js +2 -2
- package/out/syntaxes/agentlang.monarch.d.ts.map +1 -1
- package/out/syntaxes/agentlang.monarch.js +1 -0
- package/out/syntaxes/agentlang.monarch.js.map +1 -1
- package/package.json +1 -1
- package/src/language/agentlang.langium +5 -1
- package/src/language/generated/ast.ts +17 -10
- package/src/language/generated/grammar.ts +164 -13
- package/src/runtime/jsmodules.ts +6 -1
- package/src/runtime/modules/auth.ts +2 -2
- package/src/syntaxes/agentlang.monarch.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsmodules.d.ts","sourceRoot":"","sources":["../../src/runtime/jsmodules.ts"],"names":[],"mappings":"AA4LA,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"jsmodules.d.ts","sourceRoot":"","sources":["../../src/runtime/jsmodules.ts"],"names":[],"mappings":"AA4LA,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,gBAuBrF;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAErE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAEjD;AAgCD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,EACvB,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC,GAAG,CAAC,CAsCd;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAMlE"}
|
package/out/runtime/jsmodules.js
CHANGED
|
@@ -151,7 +151,13 @@ export async function importModule(path, name, moduleFileName) {
|
|
|
151
151
|
moduleExports = await loadModuleInNode(path, name, moduleFileName);
|
|
152
152
|
}
|
|
153
153
|
else {
|
|
154
|
-
|
|
154
|
+
try {
|
|
155
|
+
moduleExports = await loadModuleInBrowser(path, name, moduleFileName);
|
|
156
|
+
}
|
|
157
|
+
catch (reason) {
|
|
158
|
+
logger.error(`Failed to import module ${path} - ${reason}`);
|
|
159
|
+
return undefined;
|
|
160
|
+
}
|
|
155
161
|
}
|
|
156
162
|
importedModules.set(name, moduleExports);
|
|
157
163
|
logger.info(`Successfully imported module: ${name}`, Object.keys(moduleExports));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsmodules.js","sourceRoot":"","sources":["../../src/runtime/jsmodules.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"jsmodules.js","sourceRoot":"","sources":["../../src/runtime/jsmodules.ts"],"names":[],"mappings":"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"}
|
|
@@ -309,13 +309,13 @@ entity Session {
|
|
|
309
309
|
{Role {name? UpdatePermissionAssignment.roleName}} @as [role]
|
|
310
310
|
{Permission {id? UpdatePermissionAssignment.permissionId}} @as [permission]
|
|
311
311
|
if (role and permission) {
|
|
312
|
-
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission
|
|
312
|
+
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission permission.__path__, Role role.__path__}}
|
|
313
313
|
}
|
|
314
314
|
else if (role) {
|
|
315
315
|
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Role role.__path__}}
|
|
316
316
|
}
|
|
317
317
|
else if (permission) {
|
|
318
|
-
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission
|
|
318
|
+
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission permission.__path__}}
|
|
319
319
|
}
|
|
320
320
|
}
|
|
321
321
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentlang.monarch.d.ts","sourceRoot":"","sources":["../../src/syntaxes/agentlang.monarch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"agentlang.monarch.d.ts","sourceRoot":"","sources":["../../src/syntaxes/agentlang.monarch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wBA8BE"}
|
|
@@ -12,6 +12,7 @@ export default {
|
|
|
12
12
|
{ regex: /(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/, action: { cases: { '@keywords': { "token": "keyword" }, '@default': { "token": "string" } } } },
|
|
13
13
|
{ regex: /[_a-zA-Z][\w_]*/, action: { cases: { '@keywords': { "token": "keyword" }, '@default': { "token": "string" } } } },
|
|
14
14
|
{ regex: /("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/, action: { "token": "string" } },
|
|
15
|
+
{ regex: /(`(((\\([\s\S]))|((?!(((\\|`)|\r)|\n))[\s\S]*?))|(\r?\n))*`)/, action: { "token": "string" } },
|
|
15
16
|
{ regex: /-?[0-9]+/, action: { "token": "number" } },
|
|
16
17
|
{ include: '@whitespace' },
|
|
17
18
|
{ regex: /@symbols/, action: { cases: { '@operators': { "token": "operator" }, '@default': { "token": "" } } } },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentlang.monarch.js","sourceRoot":"","sources":["../../src/syntaxes/agentlang.monarch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agentlang.monarch.js","sourceRoot":"","sources":["../../src/syntaxes/agentlang.monarch.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agentlang",
|
|
3
3
|
"description": "The easiest way to build the most reliable AI agents - enterprise-grade teams of AI agents that collaborate with each other and humans",
|
|
4
|
-
"version": "0.9.
|
|
4
|
+
"version": "0.9.3",
|
|
5
5
|
"license": "Sustainable Use License",
|
|
6
6
|
"author": "agentlang-ai",
|
|
7
7
|
"homepage": "https://github.com/agentlang-ai/agentlang#readme",
|
|
@@ -268,7 +268,11 @@ terminal ID returns string: NAME ('/' NAME)?;
|
|
|
268
268
|
terminal NAME returns string: /[_a-zA-Z][\w_]*/;
|
|
269
269
|
|
|
270
270
|
// quoted strings
|
|
271
|
-
terminal
|
|
271
|
+
terminal QUOTED_STRING returns string: '"' ( '\\' . | !('\\' | '"' | '\r' | '\n') | '\r'? '\n' )* '"';
|
|
272
|
+
|
|
273
|
+
terminal TICK_QUOTED_STRING returns string: '`' ( '\\' . | !('\\' | '`' | '\r' | '\n') | '\r'? '\n' )* '`';
|
|
274
|
+
|
|
275
|
+
STRING returns string: QUOTED_STRING | TICK_QUOTED_STRING;
|
|
272
276
|
|
|
273
277
|
// recognize an Integer (but represented via a 'number' type)
|
|
274
278
|
terminal INT returns number: /-?[0-9]+/;
|
|
@@ -8,7 +8,8 @@ import * as langium from 'langium';
|
|
|
8
8
|
|
|
9
9
|
export const AgentlangTerminals = {
|
|
10
10
|
ID: /(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/,
|
|
11
|
-
|
|
11
|
+
QUOTED_STRING: /("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/,
|
|
12
|
+
TICK_QUOTED_STRING: /(`(((\\([\s\S]))|((?!(((\\|`)|\r)|\n))[\s\S]*?))|(\r?\n))*`)/,
|
|
12
13
|
INT: /-?[0-9]+/,
|
|
13
14
|
WS: /\s+/,
|
|
14
15
|
ML_COMMENT: /\/\*[\s\S]*?\*\//,
|
|
@@ -170,10 +171,10 @@ export function isFlowStepSpec(item: unknown): item is FlowStepSpec {
|
|
|
170
171
|
return reflection.isInstance(item, FlowStepSpec);
|
|
171
172
|
}
|
|
172
173
|
|
|
173
|
-
export type GenericName = string;
|
|
174
|
+
export type GenericName = STRING | string;
|
|
174
175
|
|
|
175
176
|
export function isGenericName(item: unknown): item is GenericName {
|
|
176
|
-
return (typeof item === 'string' && (/(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/.test(item)
|
|
177
|
+
return isSTRING(item) || (typeof item === 'string' && (/(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/.test(item)));
|
|
177
178
|
}
|
|
178
179
|
|
|
179
180
|
export type JoinType = '@full_join' | '@inner_join' | '@join' | '@left_join' | '@right_join';
|
|
@@ -228,6 +229,12 @@ export function isSqlComparisonOpr(item: unknown): item is SqlComparisonOpr {
|
|
|
228
229
|
return item === '=' || item === '<>' || item === '!=' || item === '<' || item === '<=' || item === '>' || item === '>=' || item === 'in' || item === 'like' || item === 'between';
|
|
229
230
|
}
|
|
230
231
|
|
|
232
|
+
export type STRING = string;
|
|
233
|
+
|
|
234
|
+
export function isSTRING(item: unknown): item is STRING {
|
|
235
|
+
return (typeof item === 'string' && (/("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/.test(item) || /(`(((\\([\s\S]))|((?!(((\\|`)|\r)|\n))[\s\S]*?))|(\r?\n))*`)/.test(item)));
|
|
236
|
+
}
|
|
237
|
+
|
|
231
238
|
export type TaggedId = string;
|
|
232
239
|
|
|
233
240
|
export function isTaggedId(item: unknown): item is TaggedId {
|
|
@@ -288,7 +295,7 @@ export interface AgentXtraAttribute extends langium.AstNode {
|
|
|
288
295
|
readonly $container: AgentXtraSpec;
|
|
289
296
|
readonly $type: 'AgentXtraAttribute' | 'Ref';
|
|
290
297
|
name: string;
|
|
291
|
-
value:
|
|
298
|
+
value: STRING;
|
|
292
299
|
}
|
|
293
300
|
|
|
294
301
|
export const AgentXtraAttribute = 'AgentXtraAttribute';
|
|
@@ -456,7 +463,7 @@ export function isCompositeUniqueDefinition(item: unknown): item is CompositeUni
|
|
|
456
463
|
export interface ConditionalFlowStep extends langium.AstNode {
|
|
457
464
|
readonly $container: FlowEntry;
|
|
458
465
|
readonly $type: 'ConditionalFlowStep';
|
|
459
|
-
expr:
|
|
466
|
+
expr: STRING;
|
|
460
467
|
next: FlowStepSpec;
|
|
461
468
|
}
|
|
462
469
|
|
|
@@ -594,7 +601,7 @@ export interface EnumSpec extends langium.AstNode {
|
|
|
594
601
|
readonly $container: AttributeDefinition;
|
|
595
602
|
readonly $type: 'EnumSpec';
|
|
596
603
|
type?: QualifiedName;
|
|
597
|
-
values: Array<
|
|
604
|
+
values: Array<STRING>;
|
|
598
605
|
}
|
|
599
606
|
|
|
600
607
|
export const EnumSpec = 'EnumSpec';
|
|
@@ -815,7 +822,7 @@ export interface Import extends langium.AstNode {
|
|
|
815
822
|
readonly $container: ModuleDefinition;
|
|
816
823
|
readonly $type: 'Import';
|
|
817
824
|
name: string;
|
|
818
|
-
path:
|
|
825
|
+
path: STRING;
|
|
819
826
|
}
|
|
820
827
|
|
|
821
828
|
export const Import = 'Import';
|
|
@@ -876,7 +883,7 @@ export interface Literal extends langium.AstNode {
|
|
|
876
883
|
map?: MapLiteral;
|
|
877
884
|
num?: Decimal;
|
|
878
885
|
ref?: Ref;
|
|
879
|
-
str?:
|
|
886
|
+
str?: STRING;
|
|
880
887
|
}
|
|
881
888
|
|
|
882
889
|
export const Literal = 'Literal';
|
|
@@ -903,7 +910,7 @@ export interface MapKey extends langium.AstNode {
|
|
|
903
910
|
readonly $type: 'MapKey';
|
|
904
911
|
bool?: Boolean;
|
|
905
912
|
num?: Decimal;
|
|
906
|
-
str?:
|
|
913
|
+
str?: STRING;
|
|
907
914
|
}
|
|
908
915
|
|
|
909
916
|
export const MapKey = 'MapKey';
|
|
@@ -1308,7 +1315,7 @@ export function isResolverDefinition(item: unknown): item is ResolverDefinition
|
|
|
1308
1315
|
export interface ResolverFnName extends langium.AstNode {
|
|
1309
1316
|
readonly $container: ResolverMethodSpec;
|
|
1310
1317
|
readonly $type: 'ResolverFnName';
|
|
1311
|
-
name: Ref | string;
|
|
1318
|
+
name: Ref | STRING | string;
|
|
1312
1319
|
}
|
|
1313
1320
|
|
|
1314
1321
|
export const ResolverFnName = 'ResolverFnName';
|
|
@@ -86,7 +86,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
86
86
|
"terminal": {
|
|
87
87
|
"$type": "RuleCall",
|
|
88
88
|
"rule": {
|
|
89
|
-
"$ref": "#/rules@
|
|
89
|
+
"$ref": "#/rules@127"
|
|
90
90
|
},
|
|
91
91
|
"arguments": []
|
|
92
92
|
}
|
|
@@ -1250,7 +1250,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
1250
1250
|
"terminal": {
|
|
1251
1251
|
"$type": "RuleCall",
|
|
1252
1252
|
"rule": {
|
|
1253
|
-
"$ref": "#/rules@
|
|
1253
|
+
"$ref": "#/rules@127"
|
|
1254
1254
|
},
|
|
1255
1255
|
"arguments": []
|
|
1256
1256
|
}
|
|
@@ -1269,7 +1269,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
1269
1269
|
"terminal": {
|
|
1270
1270
|
"$type": "RuleCall",
|
|
1271
1271
|
"rule": {
|
|
1272
|
-
"$ref": "#/rules@
|
|
1272
|
+
"$ref": "#/rules@127"
|
|
1273
1273
|
},
|
|
1274
1274
|
"arguments": []
|
|
1275
1275
|
}
|
|
@@ -2404,7 +2404,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
2404
2404
|
"terminal": {
|
|
2405
2405
|
"$type": "RuleCall",
|
|
2406
2406
|
"rule": {
|
|
2407
|
-
"$ref": "#/rules@
|
|
2407
|
+
"$ref": "#/rules@127"
|
|
2408
2408
|
},
|
|
2409
2409
|
"arguments": []
|
|
2410
2410
|
}
|
|
@@ -2620,7 +2620,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
2620
2620
|
"terminal": {
|
|
2621
2621
|
"$type": "RuleCall",
|
|
2622
2622
|
"rule": {
|
|
2623
|
-
"$ref": "#/rules@
|
|
2623
|
+
"$ref": "#/rules@127"
|
|
2624
2624
|
},
|
|
2625
2625
|
"arguments": []
|
|
2626
2626
|
}
|
|
@@ -4911,7 +4911,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
4911
4911
|
"terminal": {
|
|
4912
4912
|
"$type": "RuleCall",
|
|
4913
4913
|
"rule": {
|
|
4914
|
-
"$ref": "#/rules@
|
|
4914
|
+
"$ref": "#/rules@127"
|
|
4915
4915
|
},
|
|
4916
4916
|
"arguments": []
|
|
4917
4917
|
}
|
|
@@ -5207,7 +5207,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
5207
5207
|
"terminal": {
|
|
5208
5208
|
"$type": "RuleCall",
|
|
5209
5209
|
"rule": {
|
|
5210
|
-
"$ref": "#/rules@
|
|
5210
|
+
"$ref": "#/rules@127"
|
|
5211
5211
|
},
|
|
5212
5212
|
"arguments": []
|
|
5213
5213
|
}
|
|
@@ -5854,7 +5854,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
5854
5854
|
{
|
|
5855
5855
|
"$type": "RuleCall",
|
|
5856
5856
|
"rule": {
|
|
5857
|
-
"$ref": "#/rules@
|
|
5857
|
+
"$ref": "#/rules@127"
|
|
5858
5858
|
},
|
|
5859
5859
|
"arguments": []
|
|
5860
5860
|
}
|
|
@@ -7018,7 +7018,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
7018
7018
|
{
|
|
7019
7019
|
"$type": "RuleCall",
|
|
7020
7020
|
"rule": {
|
|
7021
|
-
"$ref": "#/rules@
|
|
7021
|
+
"$ref": "#/rules@128"
|
|
7022
7022
|
},
|
|
7023
7023
|
"arguments": []
|
|
7024
7024
|
},
|
|
@@ -7028,7 +7028,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
7028
7028
|
{
|
|
7029
7029
|
"$type": "RuleCall",
|
|
7030
7030
|
"rule": {
|
|
7031
|
-
"$ref": "#/rules@
|
|
7031
|
+
"$ref": "#/rules@128"
|
|
7032
7032
|
},
|
|
7033
7033
|
"arguments": []
|
|
7034
7034
|
},
|
|
@@ -7039,7 +7039,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
7039
7039
|
{
|
|
7040
7040
|
"$type": "RuleCall",
|
|
7041
7041
|
"rule": {
|
|
7042
|
-
"$ref": "#/rules@
|
|
7042
|
+
"$ref": "#/rules@128"
|
|
7043
7043
|
},
|
|
7044
7044
|
"arguments": []
|
|
7045
7045
|
}
|
|
@@ -7213,7 +7213,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
7213
7213
|
{
|
|
7214
7214
|
"$type": "RuleCall",
|
|
7215
7215
|
"rule": {
|
|
7216
|
-
"$ref": "#/rules@
|
|
7216
|
+
"$ref": "#/rules@127"
|
|
7217
7217
|
},
|
|
7218
7218
|
"arguments": []
|
|
7219
7219
|
}
|
|
@@ -7282,7 +7282,7 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
7282
7282
|
},
|
|
7283
7283
|
{
|
|
7284
7284
|
"$type": "TerminalRule",
|
|
7285
|
-
"name": "
|
|
7285
|
+
"name": "QUOTED_STRING",
|
|
7286
7286
|
"type": {
|
|
7287
7287
|
"$type": "ReturnType",
|
|
7288
7288
|
"name": "string"
|
|
@@ -7401,6 +7401,157 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
|
|
|
7401
7401
|
"fragment": false,
|
|
7402
7402
|
"hidden": false
|
|
7403
7403
|
},
|
|
7404
|
+
{
|
|
7405
|
+
"$type": "TerminalRule",
|
|
7406
|
+
"name": "TICK_QUOTED_STRING",
|
|
7407
|
+
"type": {
|
|
7408
|
+
"$type": "ReturnType",
|
|
7409
|
+
"name": "string"
|
|
7410
|
+
},
|
|
7411
|
+
"definition": {
|
|
7412
|
+
"$type": "TerminalGroup",
|
|
7413
|
+
"elements": [
|
|
7414
|
+
{
|
|
7415
|
+
"$type": "CharacterRange",
|
|
7416
|
+
"left": {
|
|
7417
|
+
"$type": "Keyword",
|
|
7418
|
+
"value": "\`"
|
|
7419
|
+
}
|
|
7420
|
+
},
|
|
7421
|
+
{
|
|
7422
|
+
"$type": "TerminalAlternatives",
|
|
7423
|
+
"elements": [
|
|
7424
|
+
{
|
|
7425
|
+
"$type": "TerminalAlternatives",
|
|
7426
|
+
"elements": [
|
|
7427
|
+
{
|
|
7428
|
+
"$type": "TerminalGroup",
|
|
7429
|
+
"elements": [
|
|
7430
|
+
{
|
|
7431
|
+
"$type": "CharacterRange",
|
|
7432
|
+
"left": {
|
|
7433
|
+
"$type": "Keyword",
|
|
7434
|
+
"value": "\\\\"
|
|
7435
|
+
}
|
|
7436
|
+
},
|
|
7437
|
+
{
|
|
7438
|
+
"$type": "Wildcard"
|
|
7439
|
+
}
|
|
7440
|
+
]
|
|
7441
|
+
},
|
|
7442
|
+
{
|
|
7443
|
+
"$type": "NegatedToken",
|
|
7444
|
+
"terminal": {
|
|
7445
|
+
"$type": "TerminalAlternatives",
|
|
7446
|
+
"elements": [
|
|
7447
|
+
{
|
|
7448
|
+
"$type": "TerminalAlternatives",
|
|
7449
|
+
"elements": [
|
|
7450
|
+
{
|
|
7451
|
+
"$type": "TerminalAlternatives",
|
|
7452
|
+
"elements": [
|
|
7453
|
+
{
|
|
7454
|
+
"$type": "CharacterRange",
|
|
7455
|
+
"left": {
|
|
7456
|
+
"$type": "Keyword",
|
|
7457
|
+
"value": "\\\\"
|
|
7458
|
+
}
|
|
7459
|
+
},
|
|
7460
|
+
{
|
|
7461
|
+
"$type": "CharacterRange",
|
|
7462
|
+
"left": {
|
|
7463
|
+
"$type": "Keyword",
|
|
7464
|
+
"value": "\`"
|
|
7465
|
+
}
|
|
7466
|
+
}
|
|
7467
|
+
]
|
|
7468
|
+
},
|
|
7469
|
+
{
|
|
7470
|
+
"$type": "CharacterRange",
|
|
7471
|
+
"left": {
|
|
7472
|
+
"$type": "Keyword",
|
|
7473
|
+
"value": "\\r"
|
|
7474
|
+
}
|
|
7475
|
+
}
|
|
7476
|
+
]
|
|
7477
|
+
},
|
|
7478
|
+
{
|
|
7479
|
+
"$type": "CharacterRange",
|
|
7480
|
+
"left": {
|
|
7481
|
+
"$type": "Keyword",
|
|
7482
|
+
"value": "\\n"
|
|
7483
|
+
}
|
|
7484
|
+
}
|
|
7485
|
+
]
|
|
7486
|
+
}
|
|
7487
|
+
}
|
|
7488
|
+
]
|
|
7489
|
+
},
|
|
7490
|
+
{
|
|
7491
|
+
"$type": "TerminalGroup",
|
|
7492
|
+
"elements": [
|
|
7493
|
+
{
|
|
7494
|
+
"$type": "CharacterRange",
|
|
7495
|
+
"left": {
|
|
7496
|
+
"$type": "Keyword",
|
|
7497
|
+
"value": "\\r"
|
|
7498
|
+
},
|
|
7499
|
+
"cardinality": "?"
|
|
7500
|
+
},
|
|
7501
|
+
{
|
|
7502
|
+
"$type": "CharacterRange",
|
|
7503
|
+
"left": {
|
|
7504
|
+
"$type": "Keyword",
|
|
7505
|
+
"value": "\\n"
|
|
7506
|
+
}
|
|
7507
|
+
}
|
|
7508
|
+
]
|
|
7509
|
+
}
|
|
7510
|
+
],
|
|
7511
|
+
"cardinality": "*"
|
|
7512
|
+
},
|
|
7513
|
+
{
|
|
7514
|
+
"$type": "CharacterRange",
|
|
7515
|
+
"left": {
|
|
7516
|
+
"$type": "Keyword",
|
|
7517
|
+
"value": "\`"
|
|
7518
|
+
}
|
|
7519
|
+
}
|
|
7520
|
+
]
|
|
7521
|
+
},
|
|
7522
|
+
"fragment": false,
|
|
7523
|
+
"hidden": false
|
|
7524
|
+
},
|
|
7525
|
+
{
|
|
7526
|
+
"$type": "ParserRule",
|
|
7527
|
+
"name": "STRING",
|
|
7528
|
+
"dataType": "string",
|
|
7529
|
+
"definition": {
|
|
7530
|
+
"$type": "Alternatives",
|
|
7531
|
+
"elements": [
|
|
7532
|
+
{
|
|
7533
|
+
"$type": "RuleCall",
|
|
7534
|
+
"rule": {
|
|
7535
|
+
"$ref": "#/rules@125"
|
|
7536
|
+
},
|
|
7537
|
+
"arguments": []
|
|
7538
|
+
},
|
|
7539
|
+
{
|
|
7540
|
+
"$type": "RuleCall",
|
|
7541
|
+
"rule": {
|
|
7542
|
+
"$ref": "#/rules@126"
|
|
7543
|
+
},
|
|
7544
|
+
"arguments": []
|
|
7545
|
+
}
|
|
7546
|
+
]
|
|
7547
|
+
},
|
|
7548
|
+
"definesHiddenTokens": false,
|
|
7549
|
+
"entry": false,
|
|
7550
|
+
"fragment": false,
|
|
7551
|
+
"hiddenTokens": [],
|
|
7552
|
+
"parameters": [],
|
|
7553
|
+
"wildcard": false
|
|
7554
|
+
},
|
|
7404
7555
|
{
|
|
7405
7556
|
"$type": "TerminalRule",
|
|
7406
7557
|
"name": "INT",
|
package/src/runtime/jsmodules.ts
CHANGED
|
@@ -196,7 +196,12 @@ export async function importModule(path: string, name: string, moduleFileName?:
|
|
|
196
196
|
if (isNodeEnv) {
|
|
197
197
|
moduleExports = await loadModuleInNode(path, name, moduleFileName);
|
|
198
198
|
} else {
|
|
199
|
-
|
|
199
|
+
try {
|
|
200
|
+
moduleExports = await loadModuleInBrowser(path, name, moduleFileName);
|
|
201
|
+
} catch (reason: any) {
|
|
202
|
+
logger.error(`Failed to import module ${path} - ${reason}`);
|
|
203
|
+
return undefined;
|
|
204
|
+
}
|
|
200
205
|
}
|
|
201
206
|
|
|
202
207
|
importedModules.set(name, moduleExports);
|
|
@@ -337,13 +337,13 @@ entity Session {
|
|
|
337
337
|
{Role {name? UpdatePermissionAssignment.roleName}} @as [role]
|
|
338
338
|
{Permission {id? UpdatePermissionAssignment.permissionId}} @as [permission]
|
|
339
339
|
if (role and permission) {
|
|
340
|
-
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission
|
|
340
|
+
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission permission.__path__, Role role.__path__}}
|
|
341
341
|
}
|
|
342
342
|
else if (role) {
|
|
343
343
|
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Role role.__path__}}
|
|
344
344
|
}
|
|
345
345
|
else if (permission) {
|
|
346
|
-
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission
|
|
346
|
+
{RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission permission.__path__}}
|
|
347
347
|
}
|
|
348
348
|
}
|
|
349
349
|
|
|
@@ -13,6 +13,7 @@ export default {
|
|
|
13
13
|
{ regex: /(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
|
|
14
14
|
{ regex: /[_a-zA-Z][\w_]*/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
|
|
15
15
|
{ regex: /("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/, action: {"token":"string"} },
|
|
16
|
+
{ regex: /(`(((\\([\s\S]))|((?!(((\\|`)|\r)|\n))[\s\S]*?))|(\r?\n))*`)/, action: {"token":"string"} },
|
|
16
17
|
{ regex: /-?[0-9]+/, action: {"token":"number"} },
|
|
17
18
|
{ include: '@whitespace' },
|
|
18
19
|
{ regex: /@symbols/, action: { cases: { '@operators': {"token":"operator"}, '@default': {"token":""} }} },
|