Skip to content

Commit dbb8140

Browse files
committed
Fix some lint
1 parent 18bef4f commit dbb8140

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

packages/model/src/-private/debug/assert-polymorphic-type.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { DEPRECATE_NON_EXPLICIT_POLYMORPHISM } from '@warp-drive/build-config/de
77
import { DEBUG } from '@warp-drive/build-config/env';
88
import { assert } from '@warp-drive/build-config/macros';
99
import type { StableRecordIdentifier } from '@warp-drive/core-types';
10-
import type { FieldSchema, LegacyRelationshipSchema } from '@warp-drive/core-types/schema/fields';
10+
import type { FieldSchema, LegacyRelationshipField } from '@warp-drive/core-types/schema/fields';
1111

1212
import { Model } from '../model';
1313

@@ -63,7 +63,7 @@ if (DEBUG) {
6363
return addedModelClass.prototype instanceof modelClass || modelClass.detect(addedModelClass);
6464
};
6565

66-
const isRelationshipField = function isRelationshipField(meta: FieldSchema): meta is LegacyRelationshipSchema {
66+
const isRelationshipField = function isRelationshipField(meta: FieldSchema): meta is LegacyRelationshipField {
6767
return meta.kind === 'hasMany' || meta.kind === 'belongsTo';
6868
};
6969

packages/model/src/-private/relationship-meta.ts

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { dasherize, singularize } from '@ember-data/request-utils/string';
22
import type Store from '@ember-data/store';
33
import { DEBUG } from '@warp-drive/build-config/env';
4-
import type { LegacyRelationshipSchema } from '@warp-drive/core-types/schema/fields';
4+
import type { LegacyRelationshipField } from '@warp-drive/core-types/schema/fields';
55

66
import type { Model } from './model';
77

8-
function typeForRelationshipMeta(meta: LegacyRelationshipSchema): string {
8+
function typeForRelationshipMeta(meta: LegacyRelationshipField): string {
99
let modelName = dasherize(meta.type || meta.name);
1010

1111
if (meta.kind === 'hasMany') {
@@ -15,7 +15,7 @@ function typeForRelationshipMeta(meta: LegacyRelationshipSchema): string {
1515
return modelName;
1616
}
1717

18-
function shouldFindInverse(relationshipMeta: LegacyRelationshipSchema): boolean {
18+
function shouldFindInverse(relationshipMeta: LegacyRelationshipField): boolean {
1919
const options = relationshipMeta.options;
2020
return !(options && options.inverse === null);
2121
}
@@ -26,9 +26,9 @@ class RelationshipDefinition {
2626
declare __hasCalculatedInverse: boolean;
2727
declare parentModelName: string;
2828
declare inverseIsAsync: string | null;
29-
declare meta: LegacyRelationshipSchema;
29+
declare meta: LegacyRelationshipField;
3030

31-
constructor(meta: LegacyRelationshipSchema, parentModelName: string) {
31+
constructor(meta: LegacyRelationshipField, parentModelName: string) {
3232
this._type = '';
3333
this.__inverseKey = '';
3434
this.__hasCalculatedInverse = false;
@@ -63,7 +63,7 @@ class RelationshipDefinition {
6363
_calculateInverse(store: Store, modelClass: typeof Model): void {
6464
this.__hasCalculatedInverse = true;
6565
let inverseKey: string | null = null;
66-
let inverse: LegacyRelationshipSchema | null = null;
66+
let inverse: LegacyRelationshipField | null = null;
6767

6868
if (shouldFindInverse(this.meta)) {
6969
inverse = modelClass.inverseFor(this.name, store);
@@ -85,9 +85,6 @@ class RelationshipDefinition {
8585
}
8686
export type { RelationshipDefinition };
8787

88-
export function relationshipFromMeta(
89-
meta: LegacyRelationshipSchema,
90-
parentModelName: string
91-
): LegacyRelationshipSchema {
92-
return new RelationshipDefinition(meta, parentModelName) as unknown as LegacyRelationshipSchema;
88+
export function relationshipFromMeta(meta: LegacyRelationshipField, parentModelName: string): LegacyRelationshipField {
89+
return new RelationshipDefinition(meta, parentModelName) as unknown as LegacyRelationshipField;
9390
}

0 commit comments

Comments
 (0)