Skip to content

fix: ts compilation issue with generated model meta #2259

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
Sep 30, 2025
Merged

fix: ts compilation issue with generated model meta #2259

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
bccdc2e
fix: ts compilation issue with generated model meta
ymc9 Sep 30, 2025
21546c6
update
ymc9 Sep 30, 2025
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
2 changes: 1 addition & 1 deletion packages/runtime/src/cross/model-meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export type RuntimeAttribute = {
/**
* Attribute arguments
*/
args: Array<{ name?: string; value: unknown }>;
args: Array<{ name?: string; value?: unknown }>;
};

/**
Expand Down
11 changes: 9 additions & 2 deletions packages/sdk/src/model-meta-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,20 @@ export function generate(
) {
const sf = project.createSourceFile(options.output, undefined, { overwrite: true });

// generate: import type { ModelMeta } from '@zenstackhq/runtime';
sf.addImportDeclaration({
isTypeOnly: true,
namedImports: ['ModelMeta'],
moduleSpecifier: '@zenstackhq/runtime',
});

const writer = new FastWriter();
const extraFunctions: OptionalKind<FunctionDeclarationStructure>[] = [];
generateModelMetadata(models, typeDefs, writer, options, extraFunctions);

sf.addVariableStatement({
declarationKind: VariableDeclarationKind.Const,
declarations: [{ name: 'metadata', initializer: writer.result }],
declarations: [{ name: 'metadata', type: 'ModelMeta', initializer: writer.result }],
});

if (extraFunctions.length > 0) {
Expand Down Expand Up @@ -364,7 +371,7 @@ function writeFields(
function getAttributes(target: DataModelField | DataModel | TypeDefField): RuntimeAttribute[] {
return target.attributes
.map((attr) => {
const args: Array<{ name?: string; value: unknown }> = [];
const args: Array<{ name?: string; value?: unknown }> = [];
for (const arg of attr.args) {
const argName = arg.$resolvedParam?.name ?? arg.name;
const argValue = exprToValue(arg.value);
Expand Down
Loading