Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions packages/sdk/src/ts-schema-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1359,18 +1359,18 @@ export class TsSchemaGenerator {
ts.factory.createImportDeclaration(
undefined,
ts.factory.createImportClause(
false,
true,
undefined,
ts.factory.createNamedImports([
ts.factory.createImportSpecifier(
true,
false,
undefined,
ts.factory.createIdentifier(`ModelResult as $ModelResult`),
),
...(model.declarations.some(isTypeDef)
? [
ts.factory.createImportSpecifier(
true,
false,
undefined,
ts.factory.createIdentifier(`TypeDefResult as $TypeDefResult`),
),
Expand Down
2 changes: 1 addition & 1 deletion samples/orm/zenstack/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
/**
* User model
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/apps/rally/zenstack/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type Account = $ModelResult<$Schema, "Account">;
export type User = $ModelResult<$Schema, "User">;
export type VerificationToken = $ModelResult<$Schema, "VerificationToken">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/github-repos/cal.com/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type Host = $ModelResult<$Schema, "Host">;
export type CalVideoSettings = $ModelResult<$Schema, "CalVideoSettings">;
export type EventType = $ModelResult<$Schema, "EventType">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/github-repos/formbricks/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
/**
* Represents a webhook endpoint for receiving survey-related events.
* Webhooks can be configured to receive notifications about response creation, updates, and completion.
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/github-repos/trigger.dev/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type InvitationCode = $ModelResult<$Schema, "InvitationCode">;
/**
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/plugin-infra/ext-query-args/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/auth-type/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
export type Foo = $ModelResult<$Schema, "Foo">;
export type Permission = $TypeDefResult<$Schema, "Permission">;
export type Auth = $TypeDefResult<$Schema, "Auth">;
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/basic/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Post = $ModelResult<$Schema, "Post">;
export type Comment = $ModelResult<$Schema, "Comment">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/default-auth/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Profile = $ModelResult<$Schema, "Profile">;
export type Address = $ModelResult<$Schema, "Address">;
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/delegate/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Comment = $ModelResult<$Schema, "Comment">;
export type Asset = $ModelResult<$Schema, "Asset">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/json/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type Foo = $ModelResult<$Schema, "Foo">;
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/name-mapping/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Post = $ModelResult<$Schema, "Post">;
export const Role = $schema.enums.Role.values;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/omit/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Post = $ModelResult<$Schema, "Post">;
export type Base = $ModelResult<$Schema, "Base">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/petstore/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Pet = $ModelResult<$Schema, "Pet">;
export type Order = $ModelResult<$Schema, "Order">;
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/procedures/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Overview = $TypeDefResult<$Schema, "Overview">;
export const Role = $schema.enums.Role.values;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/todo/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type Space = $ModelResult<$Schema, "Space">;
export type SpaceUser = $ModelResult<$Schema, "SpaceUser">;
export type User = $ModelResult<$Schema, "User">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/typed-json/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Profile = $TypeDefResult<$Schema, "Profile">;
export type Address = $TypeDefResult<$Schema, "Address">;
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/orm/schemas/typing/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Post = $ModelResult<$Schema, "Post">;
export type Profile = $ModelResult<$Schema, "Profile">;
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/test/issue-204/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { schema as $schema, type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult, TypeDefResult as $TypeDefResult } from "@zenstackhq/orm";
export type Foo = $ModelResult<$Schema, "Foo">;
export type Configuration = $TypeDefResult<$Schema, "Configuration">;
export const ShirtColor = $schema.enums.ShirtColor.values;
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/test/issue-422/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type Session = $ModelResult<$Schema, "Session">;
export type User = $ModelResult<$Schema, "User">;
export type Profile = $ModelResult<$Schema, "Profile">;
2 changes: 1 addition & 1 deletion tests/regression/test/issue-503/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type InternalChat = $ModelResult<$Schema, "InternalChat">;
export type Message = $ModelResult<$Schema, "Message">;
export type Media = $ModelResult<$Schema, "Media">;
2 changes: 1 addition & 1 deletion tests/runtimes/bun/schemas/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Post = $ModelResult<$Schema, "Post">;
2 changes: 1 addition & 1 deletion tests/runtimes/edge-runtime/schemas/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
/* eslint-disable */

import { type SchemaType as $Schema } from "./schema";
import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
import type { ModelResult as $ModelResult } from "@zenstackhq/orm";
export type User = $ModelResult<$Schema, "User">;
export type Post = $ModelResult<$Schema, "Post">;
Loading