react-obsidian 2.16.0 → 2.16.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/transformers/babel-plugin-obsidian/helpers/index.d.ts +3 -2
- package/dist/transformers/babel-plugin-obsidian/helpers/index.d.ts.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/helpers/index.js +11 -4
- package/dist/transformers/babel-plugin-obsidian/helpers/index.js.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/unmagler/property.js +1 -1
- package/dist/transformers/babel-plugin-obsidian/unmagler/property.js.map +1 -1
- package/package.json +1 -1
- package/transformers/babel-plugin-obsidian/helpers/index.ts +11 -3
- package/transformers/babel-plugin-obsidian/unmagler/property.ts +2 -2
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { ClassMethod, ClassProperty, Decorator, Identifier, ObjectExpression, ObjectPattern, TSParameterProperty } from '@babel/types';
|
|
1
|
+
import { ClassMethod, ClassProperty, Decorator, Identifier, ObjectExpression, ObjectPattern, TSParameterProperty, type StringLiteral } from '@babel/types';
|
|
2
2
|
export type AcceptedNodeType = Identifier | TSParameterProperty | ClassProperty;
|
|
3
3
|
export declare function providerIsNotNamed(decorator: Decorator): boolean;
|
|
4
4
|
export declare function addNameToProviderArguments(node: ClassMethod, decorator: Decorator): void;
|
|
5
|
-
export declare function
|
|
5
|
+
export declare function getDecoratorObjectArgument(decorator: Decorator): ObjectExpression | undefined;
|
|
6
|
+
export declare function getDecoratorStringArgument(decorator: Decorator): StringLiteral | undefined;
|
|
6
7
|
export declare function getMethodName(node: ClassMethod): string;
|
|
7
8
|
export declare function getDecoratorByName(decorators: Array<Decorator> | undefined | null, decoratorName: string): Decorator | undefined;
|
|
8
9
|
export declare function getDecoratorName(decorator?: Decorator): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,WAAW,EACX,aAAa,EACb,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,WAAW,EACX,aAAa,EACb,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAEhF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAWhE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,QAOjF;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,CAK7F;AAED,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,GAAG,aAAa,GAAG,SAAS,CAK1F;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CAGvD;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,EAC/C,aAAa,EAAE,MAAM,GACpB,SAAS,GAAG,SAAS,CAEvB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,EAAE,GAAG,aAAa,CAI3F;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,SAAS,QAOrB"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.providerIsNotNamed = providerIsNotNamed;
|
|
4
4
|
exports.addNameToProviderArguments = addNameToProviderArguments;
|
|
5
|
-
exports.
|
|
5
|
+
exports.getDecoratorObjectArgument = getDecoratorObjectArgument;
|
|
6
|
+
exports.getDecoratorStringArgument = getDecoratorStringArgument;
|
|
6
7
|
exports.getMethodName = getMethodName;
|
|
7
8
|
exports.getDecoratorByName = getDecoratorByName;
|
|
8
9
|
exports.getDecoratorName = getDecoratorName;
|
|
@@ -12,7 +13,7 @@ exports.passParamNameAsInjectArgument = passParamNameAsInjectArgument;
|
|
|
12
13
|
const core_1 = require("@babel/core");
|
|
13
14
|
const never = '';
|
|
14
15
|
function providerIsNotNamed(decorator) {
|
|
15
|
-
const argument =
|
|
16
|
+
const argument = getDecoratorObjectArgument(decorator);
|
|
16
17
|
if (core_1.types.isObjectExpression(argument)) {
|
|
17
18
|
return argument.properties.find((p) => {
|
|
18
19
|
if (core_1.types.isObjectProperty(p)) {
|
|
@@ -25,16 +26,22 @@ function providerIsNotNamed(decorator) {
|
|
|
25
26
|
}
|
|
26
27
|
function addNameToProviderArguments(node, decorator) {
|
|
27
28
|
var _a;
|
|
28
|
-
const argument = (_a =
|
|
29
|
+
const argument = (_a = getDecoratorObjectArgument(decorator)) !== null && _a !== void 0 ? _a : core_1.types.objectExpression([]);
|
|
29
30
|
argument.properties.push(core_1.types.objectProperty(core_1.types.identifier('name'), core_1.types.stringLiteral(getMethodName(node))));
|
|
30
31
|
decorator.expression.arguments = [argument];
|
|
31
32
|
}
|
|
32
|
-
function
|
|
33
|
+
function getDecoratorObjectArgument(decorator) {
|
|
33
34
|
if (core_1.types.isCallExpression(decorator.expression)) {
|
|
34
35
|
return decorator.expression.arguments.find((a) => core_1.types.isObjectExpression(a));
|
|
35
36
|
}
|
|
36
37
|
return undefined;
|
|
37
38
|
}
|
|
39
|
+
function getDecoratorStringArgument(decorator) {
|
|
40
|
+
if (core_1.types.isCallExpression(decorator.expression)) {
|
|
41
|
+
return decorator.expression.arguments.find(a => core_1.types.isStringLiteral(a));
|
|
42
|
+
}
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
38
45
|
function getMethodName(node) {
|
|
39
46
|
if (core_1.types.isIdentifier(node.key))
|
|
40
47
|
return node.key.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ function savePropertyName(name, node) {
|
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
function injectIsNotNamed(decorator) {
|
|
11
|
-
return (0, helpers_1.
|
|
11
|
+
return (0, helpers_1.getDecoratorStringArgument)(decorator) === undefined;
|
|
12
12
|
}
|
|
13
13
|
exports.default = savePropertyName;
|
|
14
14
|
//# sourceMappingURL=property.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/property.ts"],"names":[],"mappings":";;AACA,wCAMoB;AAEpB,SAAS,gBAAgB,CAAC,IAAY,EAAE,IAAsB;IAC5D,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,EAAE,CAAC;QACzE,IAAA,uCAA6B,EAAC,IAAI,EAAE,SAAU,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,IAAA,
|
|
1
|
+
{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/property.ts"],"names":[],"mappings":";;AACA,wCAMoB;AAEpB,SAAS,gBAAgB,CAAC,IAAY,EAAE,IAAsB;IAC5D,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,EAAE,CAAC;QACzE,IAAA,uCAA6B,EAAC,IAAI,EAAE,SAAU,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,IAAA,oCAA0B,EAAC,SAAS,CAAC,KAAK,SAAS,CAAC;AAC7D,CAAC;AAED,kBAAe,gBAAgB,CAAC"}
|
package/package.json
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
ObjectExpression,
|
|
10
10
|
ObjectPattern,
|
|
11
11
|
TSParameterProperty,
|
|
12
|
+
type StringLiteral,
|
|
12
13
|
} from '@babel/types';
|
|
13
14
|
|
|
14
15
|
const never = '';
|
|
@@ -16,7 +17,7 @@ const never = '';
|
|
|
16
17
|
export type AcceptedNodeType = Identifier | TSParameterProperty | ClassProperty;
|
|
17
18
|
|
|
18
19
|
export function providerIsNotNamed(decorator: Decorator): boolean {
|
|
19
|
-
const argument =
|
|
20
|
+
const argument = getDecoratorObjectArgument(decorator);
|
|
20
21
|
if (t.isObjectExpression(argument)) {
|
|
21
22
|
return argument.properties.find((p) => {
|
|
22
23
|
if (t.isObjectProperty(p)) {
|
|
@@ -29,7 +30,7 @@ export function providerIsNotNamed(decorator: Decorator): boolean {
|
|
|
29
30
|
}
|
|
30
31
|
|
|
31
32
|
export function addNameToProviderArguments(node: ClassMethod, decorator: Decorator) {
|
|
32
|
-
const argument =
|
|
33
|
+
const argument = getDecoratorObjectArgument(decorator) ?? t.objectExpression([]);
|
|
33
34
|
argument.properties.push(t.objectProperty(
|
|
34
35
|
t.identifier('name'),
|
|
35
36
|
t.stringLiteral(getMethodName(node)),
|
|
@@ -37,13 +38,20 @@ export function addNameToProviderArguments(node: ClassMethod, decorator: Decorat
|
|
|
37
38
|
(decorator.expression as CallExpression).arguments = [argument];
|
|
38
39
|
}
|
|
39
40
|
|
|
40
|
-
export function
|
|
41
|
+
export function getDecoratorObjectArgument(decorator: Decorator): ObjectExpression | undefined {
|
|
41
42
|
if (t.isCallExpression(decorator.expression)) {
|
|
42
43
|
return decorator.expression.arguments.find((a) => t.isObjectExpression(a)) as ObjectExpression;
|
|
43
44
|
}
|
|
44
45
|
return undefined;
|
|
45
46
|
}
|
|
46
47
|
|
|
48
|
+
export function getDecoratorStringArgument(decorator: Decorator): StringLiteral | undefined {
|
|
49
|
+
if (t.isCallExpression(decorator.expression)) {
|
|
50
|
+
return decorator.expression.arguments.find(a => t.isStringLiteral(a)) as StringLiteral;
|
|
51
|
+
}
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
|
|
47
55
|
export function getMethodName(node: ClassMethod): string {
|
|
48
56
|
if (t.isIdentifier(node.key)) return node.key.name;
|
|
49
57
|
throw new Error(`Tried to get class name but encountered unexpected key of type: ${node.key.type}`);
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
getDecoratorName,
|
|
4
4
|
getDecoratorByName,
|
|
5
5
|
passParamNameAsInjectArgument,
|
|
6
|
-
|
|
6
|
+
getDecoratorStringArgument,
|
|
7
7
|
AcceptedNodeType,
|
|
8
8
|
} from '../helpers';
|
|
9
9
|
|
|
@@ -15,7 +15,7 @@ function savePropertyName(name: string, node: AcceptedNodeType) {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
function injectIsNotNamed(decorator: Decorator): boolean {
|
|
18
|
-
return
|
|
18
|
+
return getDecoratorStringArgument(decorator) === undefined;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
export default savePropertyName;
|