@danielx/civet 0.6.10 → 0.6.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/dist/browser.js +22 -10
- package/dist/main.js +22 -10
- package/dist/main.mjs +22 -10
- package/package.json +1 -1
package/dist/browser.js
CHANGED
|
@@ -431,7 +431,7 @@ var Civet = (() => {
|
|
|
431
431
|
if (glob?.type === "PropertyGlob") {
|
|
432
432
|
let prefix = children.slice(0, i);
|
|
433
433
|
const parts = [];
|
|
434
|
-
let hoistDec, refAssignment
|
|
434
|
+
let hoistDec, refAssignment;
|
|
435
435
|
if (prefix.length > 1) {
|
|
436
436
|
const ref = {
|
|
437
437
|
type: "Ref",
|
|
@@ -488,10 +488,9 @@ var Civet = (() => {
|
|
|
488
488
|
});
|
|
489
489
|
}
|
|
490
490
|
}
|
|
491
|
-
|
|
491
|
+
let object = {
|
|
492
492
|
type: "ObjectExpression",
|
|
493
493
|
children: [
|
|
494
|
-
...refAssignment,
|
|
495
494
|
glob.object.children[0],
|
|
496
495
|
...parts,
|
|
497
496
|
glob.object.children.at(-1)
|
|
@@ -499,6 +498,13 @@ var Civet = (() => {
|
|
|
499
498
|
properties: parts,
|
|
500
499
|
hoistDec
|
|
501
500
|
};
|
|
501
|
+
if (refAssignment) {
|
|
502
|
+
object = {
|
|
503
|
+
type: "ParenthesizedExpression",
|
|
504
|
+
children: ["(", ...refAssignment, object, ")"],
|
|
505
|
+
expression: object
|
|
506
|
+
};
|
|
507
|
+
}
|
|
502
508
|
if (i === children.length - 1)
|
|
503
509
|
return object;
|
|
504
510
|
return processCallMemberExpression({
|
|
@@ -1172,7 +1178,9 @@ var Civet = (() => {
|
|
|
1172
1178
|
}
|
|
1173
1179
|
function convertMethodToFunction(method) {
|
|
1174
1180
|
const { signature, block } = method;
|
|
1175
|
-
let { modifier } = signature;
|
|
1181
|
+
let { modifier, optional } = signature;
|
|
1182
|
+
if (optional)
|
|
1183
|
+
return;
|
|
1176
1184
|
if (modifier) {
|
|
1177
1185
|
if (modifier.get || modifier.set) {
|
|
1178
1186
|
return;
|
|
@@ -1337,7 +1345,7 @@ var Civet = (() => {
|
|
|
1337
1345
|
};
|
|
1338
1346
|
}
|
|
1339
1347
|
function implicitFunctionBlock(f) {
|
|
1340
|
-
if (f.abstract || f.block)
|
|
1348
|
+
if (f.abstract || f.block || f.signature?.optional)
|
|
1341
1349
|
return;
|
|
1342
1350
|
const { name, parent } = f;
|
|
1343
1351
|
const expressions = parent?.expressions ?? parent?.elements;
|
|
@@ -10276,20 +10284,24 @@ ${input.slice(result.pos)}
|
|
|
10276
10284
|
parameters
|
|
10277
10285
|
};
|
|
10278
10286
|
});
|
|
10279
|
-
var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
|
|
10287
|
+
var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), $E(QuestionMark), $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
|
|
10280
10288
|
var modifier = $1;
|
|
10281
10289
|
var name = $2;
|
|
10282
|
-
var
|
|
10283
|
-
var
|
|
10290
|
+
var optional = $4;
|
|
10291
|
+
var parameters = $6;
|
|
10292
|
+
var returnType = $7;
|
|
10284
10293
|
if (name.name) {
|
|
10285
10294
|
name = name.name;
|
|
10286
10295
|
} else if (name.token) {
|
|
10287
10296
|
name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
|
|
10288
10297
|
}
|
|
10298
|
+
if (optional)
|
|
10299
|
+
$0[3] = optional = { ...optional, ts: true };
|
|
10289
10300
|
return {
|
|
10290
10301
|
type: "MethodSignature",
|
|
10291
10302
|
children: $0,
|
|
10292
10303
|
name,
|
|
10304
|
+
optional,
|
|
10293
10305
|
modifier,
|
|
10294
10306
|
returnType,
|
|
10295
10307
|
parameters
|
|
@@ -21692,8 +21704,8 @@ ${input.slice(result.pos)}
|
|
|
21692
21704
|
return result;
|
|
21693
21705
|
}
|
|
21694
21706
|
}
|
|
21695
|
-
var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
|
|
21696
|
-
var type = $
|
|
21707
|
+
var FunctionType$0 = $TS($S($E($S(New, $E(_))), Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
|
|
21708
|
+
var type = $5;
|
|
21697
21709
|
if (type) {
|
|
21698
21710
|
return $0;
|
|
21699
21711
|
}
|
package/dist/main.js
CHANGED
|
@@ -430,7 +430,7 @@ var require_lib = __commonJS({
|
|
|
430
430
|
if (glob?.type === "PropertyGlob") {
|
|
431
431
|
let prefix = children.slice(0, i);
|
|
432
432
|
const parts = [];
|
|
433
|
-
let hoistDec, refAssignment
|
|
433
|
+
let hoistDec, refAssignment;
|
|
434
434
|
if (prefix.length > 1) {
|
|
435
435
|
const ref = {
|
|
436
436
|
type: "Ref",
|
|
@@ -487,10 +487,9 @@ var require_lib = __commonJS({
|
|
|
487
487
|
});
|
|
488
488
|
}
|
|
489
489
|
}
|
|
490
|
-
|
|
490
|
+
let object = {
|
|
491
491
|
type: "ObjectExpression",
|
|
492
492
|
children: [
|
|
493
|
-
...refAssignment,
|
|
494
493
|
glob.object.children[0],
|
|
495
494
|
...parts,
|
|
496
495
|
glob.object.children.at(-1)
|
|
@@ -498,6 +497,13 @@ var require_lib = __commonJS({
|
|
|
498
497
|
properties: parts,
|
|
499
498
|
hoistDec
|
|
500
499
|
};
|
|
500
|
+
if (refAssignment) {
|
|
501
|
+
object = {
|
|
502
|
+
type: "ParenthesizedExpression",
|
|
503
|
+
children: ["(", ...refAssignment, object, ")"],
|
|
504
|
+
expression: object
|
|
505
|
+
};
|
|
506
|
+
}
|
|
501
507
|
if (i === children.length - 1)
|
|
502
508
|
return object;
|
|
503
509
|
return processCallMemberExpression({
|
|
@@ -1171,7 +1177,9 @@ var require_lib = __commonJS({
|
|
|
1171
1177
|
}
|
|
1172
1178
|
function convertMethodToFunction(method) {
|
|
1173
1179
|
const { signature, block } = method;
|
|
1174
|
-
let { modifier } = signature;
|
|
1180
|
+
let { modifier, optional } = signature;
|
|
1181
|
+
if (optional)
|
|
1182
|
+
return;
|
|
1175
1183
|
if (modifier) {
|
|
1176
1184
|
if (modifier.get || modifier.set) {
|
|
1177
1185
|
return;
|
|
@@ -1336,7 +1344,7 @@ var require_lib = __commonJS({
|
|
|
1336
1344
|
};
|
|
1337
1345
|
}
|
|
1338
1346
|
function implicitFunctionBlock(f) {
|
|
1339
|
-
if (f.abstract || f.block)
|
|
1347
|
+
if (f.abstract || f.block || f.signature?.optional)
|
|
1340
1348
|
return;
|
|
1341
1349
|
const { name, parent } = f;
|
|
1342
1350
|
const expressions = parent?.expressions ?? parent?.elements;
|
|
@@ -10275,20 +10283,24 @@ ${input.slice(result.pos)}
|
|
|
10275
10283
|
parameters
|
|
10276
10284
|
};
|
|
10277
10285
|
});
|
|
10278
|
-
var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
|
|
10286
|
+
var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), $E(QuestionMark), $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
|
|
10279
10287
|
var modifier = $1;
|
|
10280
10288
|
var name = $2;
|
|
10281
|
-
var
|
|
10282
|
-
var
|
|
10289
|
+
var optional = $4;
|
|
10290
|
+
var parameters = $6;
|
|
10291
|
+
var returnType = $7;
|
|
10283
10292
|
if (name.name) {
|
|
10284
10293
|
name = name.name;
|
|
10285
10294
|
} else if (name.token) {
|
|
10286
10295
|
name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
|
|
10287
10296
|
}
|
|
10297
|
+
if (optional)
|
|
10298
|
+
$0[3] = optional = { ...optional, ts: true };
|
|
10288
10299
|
return {
|
|
10289
10300
|
type: "MethodSignature",
|
|
10290
10301
|
children: $0,
|
|
10291
10302
|
name,
|
|
10303
|
+
optional,
|
|
10292
10304
|
modifier,
|
|
10293
10305
|
returnType,
|
|
10294
10306
|
parameters
|
|
@@ -21691,8 +21703,8 @@ ${input.slice(result.pos)}
|
|
|
21691
21703
|
return result;
|
|
21692
21704
|
}
|
|
21693
21705
|
}
|
|
21694
|
-
var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
|
|
21695
|
-
var type = $
|
|
21706
|
+
var FunctionType$0 = $TS($S($E($S(New, $E(_))), Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
|
|
21707
|
+
var type = $5;
|
|
21696
21708
|
if (type) {
|
|
21697
21709
|
return $0;
|
|
21698
21710
|
}
|
package/dist/main.mjs
CHANGED
|
@@ -428,7 +428,7 @@ var require_lib = __commonJS({
|
|
|
428
428
|
if (glob?.type === "PropertyGlob") {
|
|
429
429
|
let prefix = children.slice(0, i);
|
|
430
430
|
const parts = [];
|
|
431
|
-
let hoistDec, refAssignment
|
|
431
|
+
let hoistDec, refAssignment;
|
|
432
432
|
if (prefix.length > 1) {
|
|
433
433
|
const ref = {
|
|
434
434
|
type: "Ref",
|
|
@@ -485,10 +485,9 @@ var require_lib = __commonJS({
|
|
|
485
485
|
});
|
|
486
486
|
}
|
|
487
487
|
}
|
|
488
|
-
|
|
488
|
+
let object = {
|
|
489
489
|
type: "ObjectExpression",
|
|
490
490
|
children: [
|
|
491
|
-
...refAssignment,
|
|
492
491
|
glob.object.children[0],
|
|
493
492
|
...parts,
|
|
494
493
|
glob.object.children.at(-1)
|
|
@@ -496,6 +495,13 @@ var require_lib = __commonJS({
|
|
|
496
495
|
properties: parts,
|
|
497
496
|
hoistDec
|
|
498
497
|
};
|
|
498
|
+
if (refAssignment) {
|
|
499
|
+
object = {
|
|
500
|
+
type: "ParenthesizedExpression",
|
|
501
|
+
children: ["(", ...refAssignment, object, ")"],
|
|
502
|
+
expression: object
|
|
503
|
+
};
|
|
504
|
+
}
|
|
499
505
|
if (i === children.length - 1)
|
|
500
506
|
return object;
|
|
501
507
|
return processCallMemberExpression({
|
|
@@ -1169,7 +1175,9 @@ var require_lib = __commonJS({
|
|
|
1169
1175
|
}
|
|
1170
1176
|
function convertMethodToFunction(method) {
|
|
1171
1177
|
const { signature, block } = method;
|
|
1172
|
-
let { modifier } = signature;
|
|
1178
|
+
let { modifier, optional } = signature;
|
|
1179
|
+
if (optional)
|
|
1180
|
+
return;
|
|
1173
1181
|
if (modifier) {
|
|
1174
1182
|
if (modifier.get || modifier.set) {
|
|
1175
1183
|
return;
|
|
@@ -1334,7 +1342,7 @@ var require_lib = __commonJS({
|
|
|
1334
1342
|
};
|
|
1335
1343
|
}
|
|
1336
1344
|
function implicitFunctionBlock(f) {
|
|
1337
|
-
if (f.abstract || f.block)
|
|
1345
|
+
if (f.abstract || f.block || f.signature?.optional)
|
|
1338
1346
|
return;
|
|
1339
1347
|
const { name, parent } = f;
|
|
1340
1348
|
const expressions = parent?.expressions ?? parent?.elements;
|
|
@@ -10273,20 +10281,24 @@ ${input.slice(result.pos)}
|
|
|
10273
10281
|
parameters
|
|
10274
10282
|
};
|
|
10275
10283
|
});
|
|
10276
|
-
var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
|
|
10284
|
+
var MethodSignature$1 = $TS($S($E(MethodModifier), ClassElementName, $E(_), $E(QuestionMark), $E(_), NonEmptyParameters, $E(ReturnTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
|
|
10277
10285
|
var modifier = $1;
|
|
10278
10286
|
var name = $2;
|
|
10279
|
-
var
|
|
10280
|
-
var
|
|
10287
|
+
var optional = $4;
|
|
10288
|
+
var parameters = $6;
|
|
10289
|
+
var returnType = $7;
|
|
10281
10290
|
if (name.name) {
|
|
10282
10291
|
name = name.name;
|
|
10283
10292
|
} else if (name.token) {
|
|
10284
10293
|
name = name.token.match(/^(?:"|')/) ? name.token.slice(1, -1) : name.token;
|
|
10285
10294
|
}
|
|
10295
|
+
if (optional)
|
|
10296
|
+
$0[3] = optional = { ...optional, ts: true };
|
|
10286
10297
|
return {
|
|
10287
10298
|
type: "MethodSignature",
|
|
10288
10299
|
children: $0,
|
|
10289
10300
|
name,
|
|
10301
|
+
optional,
|
|
10290
10302
|
modifier,
|
|
10291
10303
|
returnType,
|
|
10292
10304
|
parameters
|
|
@@ -21689,8 +21701,8 @@ ${input.slice(result.pos)}
|
|
|
21689
21701
|
return result;
|
|
21690
21702
|
}
|
|
21691
21703
|
}
|
|
21692
|
-
var FunctionType$0 = $TS($S(Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4) {
|
|
21693
|
-
var type = $
|
|
21704
|
+
var FunctionType$0 = $TS($S($E($S(New, $E(_))), Parameters, __, TypeArrowFunction, $E(Type)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
|
|
21705
|
+
var type = $5;
|
|
21694
21706
|
if (type) {
|
|
21695
21707
|
return $0;
|
|
21696
21708
|
}
|