@rxap/ts-morph 1.1.0-dev.5 → 1.1.0-dev.6
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/CHANGELOG.md +10 -0
- package/README.md +1 -1
- package/package.json +4 -4
- package/src/lib/data-property.d.ts +3 -0
- package/src/lib/data-property.js +13 -1
- package/src/lib/data-property.js.map +1 -1
- package/src/lib/find-function.js +1 -1
- package/src/lib/find-function.js.map +1 -1
- package/src/lib/upstream-options.d.ts +1 -0
- package/src/lib/upstream-options.js +4 -3
- package/src/lib/upstream-options.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.1.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.5...@rxap/ts-morph@1.1.0-dev.6) (2024-02-29)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- improve operation naming and return types ([16ea0b3](https://gitlab.com/rxap/packages/commit/16ea0b3eb2f7679c101d034e72f8013f5513ecb6))
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
- generate table select resolve method ([5db6649](https://gitlab.com/rxap/packages/commit/5db6649cac0ff8dd36170679fc726057fa5d57d1))
|
|
15
|
+
|
|
6
16
|
# [1.1.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.4...@rxap/ts-morph@1.1.0-dev.5) (2024-02-28)
|
|
7
17
|
|
|
8
18
|
### Bug Fixes
|
package/README.md
CHANGED
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.1.0-dev.
|
|
2
|
+
"version": "1.1.0-dev.6",
|
|
3
3
|
"name": "@rxap/ts-morph",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"tslib": "2.6.2"
|
|
7
7
|
},
|
|
8
8
|
"peerDependencies": {
|
|
9
|
-
"@rxap/utilities": "^16.1.0-dev.
|
|
9
|
+
"@rxap/utilities": "^16.1.0-dev.3",
|
|
10
10
|
"ts-morph": "^18.0.0",
|
|
11
11
|
"tslib": "2.6.2"
|
|
12
12
|
},
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"packageGroup": [
|
|
29
29
|
{
|
|
30
30
|
"package": "@rxap/utilities",
|
|
31
|
-
"version": "16.1.0-dev.
|
|
31
|
+
"version": "16.1.0-dev.3"
|
|
32
32
|
}
|
|
33
33
|
]
|
|
34
34
|
},
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"directory": "packages/ts-morph"
|
|
43
43
|
},
|
|
44
44
|
"type": "commonjs",
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "0d3940b8abf393b323e584a418c6fe19ec214da5",
|
|
46
46
|
"main": "./src/index.js",
|
|
47
47
|
"types": "./src/index.d.ts"
|
|
48
48
|
}
|
|
@@ -6,9 +6,12 @@ export interface DataProperty {
|
|
|
6
6
|
name: string;
|
|
7
7
|
type?: string | TypeImport;
|
|
8
8
|
isArray?: boolean;
|
|
9
|
+
isOptional?: boolean;
|
|
10
|
+
source?: string | null;
|
|
9
11
|
}
|
|
10
12
|
export interface NormalizedDataProperty extends Readonly<Normalized<DataProperty>> {
|
|
11
13
|
type: NormalizedTypeImport;
|
|
14
|
+
source: string | null;
|
|
12
15
|
}
|
|
13
16
|
export declare function NormalizeDataProperty(property: string | Readonly<DataProperty>, defaultType?: string): NormalizedDataProperty;
|
|
14
17
|
export declare function NormalizeDataPropertyList(propertyList?: Array<string | DataProperty>, defaultType?: string): Array<NormalizedDataProperty>;
|
package/src/lib/data-property.js
CHANGED
|
@@ -9,16 +9,21 @@ function guessType(name) {
|
|
|
9
9
|
case 'name':
|
|
10
10
|
return 'string';
|
|
11
11
|
}
|
|
12
|
+
if (name.match(/Name$/)) {
|
|
13
|
+
return 'string';
|
|
14
|
+
}
|
|
12
15
|
if (name.match(/^(is|has)[A-Z]/)) {
|
|
13
16
|
return 'boolean';
|
|
14
17
|
}
|
|
15
18
|
return 'unknown';
|
|
16
19
|
}
|
|
17
20
|
function NormalizeDataProperty(property, defaultType = 'unknown') {
|
|
18
|
-
var _a, _b;
|
|
21
|
+
var _a, _b, _c, _d;
|
|
19
22
|
let name;
|
|
20
23
|
let type = 'unknown';
|
|
21
24
|
let isArray = false;
|
|
25
|
+
let isOptional = false;
|
|
26
|
+
let source = null;
|
|
22
27
|
if (typeof property === 'string') {
|
|
23
28
|
// name:type
|
|
24
29
|
// username:string
|
|
@@ -30,6 +35,8 @@ function NormalizeDataProperty(property, defaultType = 'unknown') {
|
|
|
30
35
|
name = property.name;
|
|
31
36
|
type = (_a = property.type) !== null && _a !== void 0 ? _a : guessType(name);
|
|
32
37
|
isArray = (_b = property.isArray) !== null && _b !== void 0 ? _b : isArray;
|
|
38
|
+
isOptional = (_c = property.isOptional) !== null && _c !== void 0 ? _c : isOptional;
|
|
39
|
+
source = (_d = property.source) !== null && _d !== void 0 ? _d : source;
|
|
33
40
|
}
|
|
34
41
|
if (name.endsWith('[]')) {
|
|
35
42
|
isArray = true;
|
|
@@ -40,11 +47,16 @@ function NormalizeDataProperty(property, defaultType = 'unknown') {
|
|
|
40
47
|
name = name.slice(6, -1);
|
|
41
48
|
}
|
|
42
49
|
type !== null && type !== void 0 ? type : (type = defaultType);
|
|
50
|
+
if (type === 'unknown') {
|
|
51
|
+
type = guessType(name);
|
|
52
|
+
}
|
|
43
53
|
name = name.replace(/\.\?/g, '.').split('.').join('.?');
|
|
44
54
|
return Object.freeze({
|
|
45
55
|
name,
|
|
46
56
|
type: (0, type_import_1.NormalizeTypeImport)(type),
|
|
47
57
|
isArray,
|
|
58
|
+
isOptional,
|
|
59
|
+
source,
|
|
48
60
|
});
|
|
49
61
|
}
|
|
50
62
|
exports.NormalizeDataProperty = NormalizeDataProperty;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/data-property.ts"],"names":[],"mappings":";;;AAOA,+CAGuB;AACvB,6CAAyC;
|
|
1
|
+
{"version":3,"file":"data-property.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/data-property.ts"],"names":[],"mappings":"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"}
|
package/src/lib/find-function.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FindByNameFunction = void 0;
|
|
4
4
|
function FindByNameFunction(compareTo) {
|
|
5
|
-
return node => node.getName() === compareTo.name;
|
|
5
|
+
return node => { var _a; return ((_a = node.getName()) === null || _a === void 0 ? void 0 : _a.trim().replace(/<[^>]+>$/, '')) === compareTo.name.replace(/<[^>]+>$/, ''); };
|
|
6
6
|
}
|
|
7
7
|
exports.FindByNameFunction = FindByNameFunction;
|
|
8
8
|
//# sourceMappingURL=find-function.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-function.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/find-function.ts"],"names":[],"mappings":";;;AAIA,SAAgB,kBAAkB,CAGhC,SAAoB;IACpB,OAAO,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"find-function.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/find-function.ts"],"names":[],"mappings":";;;AAIA,SAAgB,kBAAkB,CAGhC,SAAoB;IACpB,OAAO,IAAI,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,OAAO,EAAE,0CAAE,IAAI,GAAG,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,MAAK,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA,EAAA,CAAC;AAC3G,CAAC;AALD,gDAKC"}
|
|
@@ -12,7 +12,7 @@ function NormalizeBaseUpstreamOptions(options) {
|
|
|
12
12
|
}
|
|
13
13
|
exports.NormalizeBaseUpstreamOptions = NormalizeBaseUpstreamOptions;
|
|
14
14
|
function NormalizeCommandMapper(mapper) {
|
|
15
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
15
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
16
16
|
if (!mapper || Object.keys(mapper).length === 0) {
|
|
17
17
|
return null;
|
|
18
18
|
}
|
|
@@ -22,8 +22,9 @@ function NormalizeCommandMapper(mapper) {
|
|
|
22
22
|
sortBy: (_c = mapper.sortBy) !== null && _c !== void 0 ? _c : null,
|
|
23
23
|
list: (_d = mapper.list) !== null && _d !== void 0 ? _d : null,
|
|
24
24
|
total: (_e = mapper.total) !== null && _e !== void 0 ? _e : null,
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
value: (_f = mapper.value) !== null && _f !== void 0 ? _f : null,
|
|
26
|
+
sortDirection: (_g = mapper.sortDirection) !== null && _g !== void 0 ? _g : null,
|
|
27
|
+
filter: mapper.filter && Object.keys((_h = mapper.filter) !== null && _h !== void 0 ? _h : {}).length ? {
|
|
27
28
|
eq: mapper.filter.eq,
|
|
28
29
|
join: mapper.filter.join,
|
|
29
30
|
} : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upstream-options.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/upstream-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;AACvB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B;AAgBD,SAAgB,4BAA4B,CAAC,OAA4B;IACvE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAJD,oEAIC;
|
|
1
|
+
{"version":3,"file":"upstream-options.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/upstream-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;AACvB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B;AAgBD,SAAgB,4BAA4B,CAAC,OAA4B;IACvE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;AACL,CAAC;AAJD,oEAIC;AA2BD,SAAgB,sBAAsB,CAAC,MAA6B;;IAClE,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,MAAA,MAAM,CAAC,SAAS,mCAAI,IAAI;QACnC,QAAQ,EAAE,MAAA,MAAM,CAAC,QAAQ,mCAAI,IAAI;QACjC,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,IAAI;QAC7B,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,mCAAI,IAAI;QACzB,KAAK,EAAE,MAAA,MAAM,CAAC,KAAK,mCAAI,IAAI;QAC3B,KAAK,EAAE,MAAA,MAAM,CAAC,KAAK,mCAAI,IAAI;QAC3B,aAAa,EAAE,MAAA,MAAM,CAAC,aAAa,mCAAI,IAAI;QAC3C,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAA,MAAM,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACjE,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE;YACpB,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;SACzB,CAAC,CAAC,CAAC,IAAI;KACT,CAAC,CAAC;AACL,CAAC;AAjBD,wDAiBC;AAiBD,SAAgB,+BAA+B,CAAC,OAA+B;;IAC7E,OAAO,MAAM,CAAC,MAAM,iCACf,4BAA4B,CAAC,OAAO,CAAC,KACxC,IAAI,EAAE,oBAAoB,CAAC,QAAQ,EACnC,WAAW,EAAE,OAAO,CAAC,WAAW,EAChC,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,EAC9C,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,EAC5B,SAAS,EAAE,MAAA,OAAO,CAAC,SAAS,mCAAI,KAAK,IACrC,CAAC;AACL,CAAC;AATD,0EASC;AAED,SAAgB,kCAAkC,CAAC,OAAkC;IACnF,OAAO,OAAO,CAAC,IAAI,KAAK,oBAAoB,CAAC,QAAQ,CAAC;AACxD,CAAC;AAFD,gFAEC;AAED,YAAY;AAEZ,SAAgB,wBAAwB,CAAC,OAAyB;IAChE,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,OAAO,IAAI,CAAC;KACb;IACD,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,oBAAoB,CAAC,QAAQ;YAChC,OAAO,+BAA+B,CAAC,OAAiC,CAAC,CAAC;KAC7E;AACH,CAAC;AARD,4DAQC"}
|