zenstack 2.9.2 → 2.9.4
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.
|
@@ -35,8 +35,8 @@ class ZModelFormatter extends langium_1.AbstractFormatter {
|
|
|
35
35
|
}
|
|
36
36
|
format(node) {
|
|
37
37
|
const formatter = this.getNodeFormatter(node);
|
|
38
|
-
if (ast.isDataModelField(node)) {
|
|
39
|
-
if (this.isPrismaStyle && ast.isDataModel(node.$container)) {
|
|
38
|
+
if (ast.isDataModelField(node) || ast.isTypeDefField(node)) {
|
|
39
|
+
if (this.isPrismaStyle && (ast.isDataModel(node.$container) || ast.isTypeDef(node.$container))) {
|
|
40
40
|
const dataModel = node.$container;
|
|
41
41
|
const compareFn = (a, b) => b - a;
|
|
42
42
|
const maxNameLength = dataModel.fields.map((x) => x.name.length).sort(compareFn)[0];
|
|
@@ -114,7 +114,7 @@ class ZModelFormatter extends langium_1.AbstractFormatter {
|
|
|
114
114
|
else if (field.type.reference) {
|
|
115
115
|
length = field.type.reference.$refText.length;
|
|
116
116
|
}
|
|
117
|
-
else if (field.type.unsupported) {
|
|
117
|
+
else if (ast.isDataModelField(field) && field.type.unsupported) {
|
|
118
118
|
const name = `Unsupported("${field.type.unsupported.value.value}")`;
|
|
119
119
|
length = name.length;
|
|
120
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zmodel-formatter.js","sourceRoot":"","sources":["../../src/language-server/zmodel-formatter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAQiB;AAEjB,8DAAgD;AAEhD,kEAA+E;AAE/E,MAAa,eAAgB,SAAQ,2BAAiB;IAMlD,YAAY,QAAyB;QACjC,KAAK,EAAE,CAAC;QALJ,kBAAa,GAAG,IAAI,CAAC;QAMzB,IAAI,CAAC,qBAAqB,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC;IACjF,CAAC;IAES,MAAM,CAAC,IAAa;QAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE9C,IAAI,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"zmodel-formatter.js","sourceRoot":"","sources":["../../src/language-server/zmodel-formatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ class ZModelSemanticTokenProvider extends langium_1.AbstractSemanticTokenProvide
|
|
|
18
18
|
type: vscode_languageserver_1.SemanticTokenTypes.type,
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
|
-
else if ((0, ast_1.isDataSource)(node) || (0, ast_1.isGeneratorDecl)(node) || (0, ast_1.isPlugin)(node) || (0, ast_1.isEnum)(node)) {
|
|
21
|
+
else if ((0, ast_1.isDataSource)(node) || (0, ast_1.isGeneratorDecl)(node) || (0, ast_1.isPlugin)(node) || (0, ast_1.isEnum)(node) || (0, ast_1.isTypeDef)(node)) {
|
|
22
22
|
acceptor({
|
|
23
23
|
node,
|
|
24
24
|
property: 'name',
|
|
@@ -26,6 +26,7 @@ class ZModelSemanticTokenProvider extends langium_1.AbstractSemanticTokenProvide
|
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
else if ((0, ast_1.isDataModelField)(node) ||
|
|
29
|
+
(0, ast_1.isTypeDefField)(node) ||
|
|
29
30
|
(0, ast_1.isConfigField)(node) ||
|
|
30
31
|
(0, ast_1.isAttributeArg)(node) ||
|
|
31
32
|
(0, ast_1.isPluginField)(node) ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zmodel-semantic.js","sourceRoot":"","sources":["../../src/language-server/zmodel-semantic.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"zmodel-semantic.js","sourceRoot":"","sources":["../../src/language-server/zmodel-semantic.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publisher": "zenstack",
|
|
4
4
|
"displayName": "ZenStack Language Tools",
|
|
5
5
|
"description": "FullStack enhancement for Prisma ORM: seamless integration from database to UI",
|
|
6
|
-
"version": "2.9.
|
|
6
|
+
"version": "2.9.4",
|
|
7
7
|
"author": {
|
|
8
8
|
"name": "ZenStack Team"
|
|
9
9
|
},
|
|
@@ -105,8 +105,8 @@
|
|
|
105
105
|
"vscode-uri": "^3.0.6",
|
|
106
106
|
"zod": "^3.22.4",
|
|
107
107
|
"zod-validation-error": "^1.5.0",
|
|
108
|
-
"@zenstackhq/language": "2.9.
|
|
109
|
-
"@zenstackhq/sdk": "2.9.
|
|
108
|
+
"@zenstackhq/language": "2.9.4",
|
|
109
|
+
"@zenstackhq/sdk": "2.9.4"
|
|
110
110
|
},
|
|
111
111
|
"peerDependencies": {
|
|
112
112
|
"prisma": "5.0.0 - 5.22.x"
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
"tmp": "^0.2.1",
|
|
128
128
|
"tsc-alias": "^1.7.0",
|
|
129
129
|
"vitest": "^0.29.7",
|
|
130
|
-
"@zenstackhq/runtime": "2.9.
|
|
130
|
+
"@zenstackhq/runtime": "2.9.4"
|
|
131
131
|
},
|
|
132
132
|
"scripts": {
|
|
133
133
|
"vscode:publish": "vsce publish --no-dependencies",
|