Skip to content

fix: enable auto completion inside attribute #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2024
Merged

fix: enable auto completion inside attribute #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5732e2
fix: enable auto completion inside attribute
ymc9 Jan 15, 2024
2a04608
update
ymc9 Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<a href="https://www.npmjs.com/package/zenstack">
<img src="https://img.shields.io/npm/v/zenstack">
</a>
<a href="https://www.npmjs.com/package/zenstack">
<img src="https://img.shields.io/npm/dm/zenstack">
</a>
<img src="https://github.com/zenstackhq/zenstack/actions/workflows/build-test.yml/badge.svg">
<a href="https://twitter.com/zenstackhq">
<img src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Fhub.490633.xyz%2Fzenstackhq%2Fzenstack">
Expand Down
44 changes: 10 additions & 34 deletions packages/language/src/generated/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ export function isAbstractDeclaration(item: unknown): item is AbstractDeclaratio
return reflection.isInstance(item, AbstractDeclaration);
}

export type AttributeName = DataModelAttributeName | DataModelFieldAttributeName | InternalAttributeName;

export function isAttributeName(item: unknown): item is AttributeName {
return isDataModelAttributeName(item) || isDataModelFieldAttributeName(item) || isInternalAttributeName(item);
}

export type Boolean = boolean;

export function isBoolean(item: unknown): item is Boolean {
Expand All @@ -40,18 +34,6 @@ export function isConfigExpr(item: unknown): item is ConfigExpr {
return reflection.isInstance(item, ConfigExpr);
}

export type DataModelAttributeName = string;

export function isDataModelAttributeName(item: unknown): item is DataModelAttributeName {
return typeof item === 'string';
}

export type DataModelFieldAttributeName = string;

export function isDataModelFieldAttributeName(item: unknown): item is DataModelFieldAttributeName {
return typeof item === 'string';
}

export type Expression = ArrayExpr | BinaryExpr | InvocationExpr | LiteralExpr | MemberAccessExpr | NullExpr | ObjectExpr | ReferenceExpr | ThisExpr | UnaryExpr;

export const Expression = 'Expression';
Expand All @@ -66,12 +48,6 @@ export function isExpressionType(item: unknown): item is ExpressionType {
return item === 'String' || item === 'Int' || item === 'Float' || item === 'Boolean' || item === 'DateTime' || item === 'Null' || item === 'Object' || item === 'Any' || item === 'Unsupported';
}

export type InternalAttributeName = string;

export function isInternalAttributeName(item: unknown): item is InternalAttributeName {
return typeof item === 'string';
}

export type LiteralExpr = BooleanLiteral | NumberLiteral | StringLiteral;

export const LiteralExpr = 'LiteralExpr';
Expand All @@ -80,12 +56,6 @@ export function isLiteralExpr(item: unknown): item is LiteralExpr {
return reflection.isInstance(item, LiteralExpr);
}

export type QualifiedName = string;

export function isQualifiedName(item: unknown): item is QualifiedName {
return typeof item === 'string';
}

export type ReferenceTarget = DataModelField | EnumField | FunctionParam;

export const ReferenceTarget = 'ReferenceTarget';
Expand Down Expand Up @@ -137,7 +107,8 @@ export interface Attribute extends AstNode {
readonly $container: Model;
readonly $type: 'Attribute';
attributes: Array<InternalAttribute>
name: AttributeName
comments: Array<string>
name: string
params: Array<AttributeParam>
}

Expand All @@ -163,6 +134,8 @@ export function isAttributeArg(item: unknown): item is AttributeArg {
export interface AttributeParam extends AstNode {
readonly $container: Attribute;
readonly $type: 'AttributeParam';
attributes: Array<InternalAttribute>
comments: Array<string>
default: boolean
name: RegularID
type: AttributeParamType
Expand Down Expand Up @@ -454,7 +427,7 @@ export function isGeneratorDecl(item: unknown): item is GeneratorDecl {
}

export interface InternalAttribute extends AstNode {
readonly $container: Attribute | FunctionDecl;
readonly $container: Attribute | AttributeParam | FunctionDecl;
readonly $type: 'InternalAttribute';
args: Array<AttributeArg>
decl: Reference<Attribute>
Expand Down Expand Up @@ -519,7 +492,7 @@ export function isModelImport(item: unknown): item is ModelImport {
export interface NullExpr extends AstNode {
readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
readonly $type: 'NullExpr';
value: string
value: 'null'
}

export const NullExpr = 'NullExpr';
Expand Down Expand Up @@ -619,7 +592,7 @@ export function isStringLiteral(item: unknown): item is StringLiteral {
export interface ThisExpr extends AstNode {
readonly $container: Argument | ArrayExpr | AttributeArg | BinaryExpr | ConfigArrayExpr | ConfigField | ConfigInvocationArg | FieldInitializer | FunctionDecl | MemberAccessExpr | PluginField | UnaryExpr | UnsupportedFieldType;
readonly $type: 'ThisExpr';
value: string
value: 'this'
}

export const ThisExpr = 'ThisExpr';
Expand Down Expand Up @@ -801,6 +774,7 @@ export class ZModelAstReflection extends AbstractAstReflection {
name: 'Attribute',
mandatory: [
{ name: 'attributes', type: 'array' },
{ name: 'comments', type: 'array' },
{ name: 'params', type: 'array' }
]
};
Expand All @@ -809,6 +783,8 @@ export class ZModelAstReflection extends AbstractAstReflection {
return {
name: 'AttributeParam',
mandatory: [
{ name: 'attributes', type: 'array' },
{ name: 'comments', type: 'array' },
{ name: 'default', type: 'boolean' }
]
};
Expand Down
Loading