Skip to content

Commit d1e5367

Browse files
glennmichael123glennmichael123
committed
chore: wip
1 parent fa01ccd commit d1e5367

File tree

19 files changed

+359
-360
lines changed

19 files changed

+359
-360
lines changed

‎app/Models/User.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ export default {
112112

113113
return nameParts[0]
114114
},
115+
salutationName: (attributes: Attributes) => {
116+
return `Mr. ${attributes.name}`
117+
},
115118
},
116119

117120
set: {

‎storage/framework/core/orm/src/generate.ts

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,23 @@ import type {
66
import { camelCase, pascalCase, plural, singular, snakeCase } from '@stacksjs/strings'
77
import { fetchOtherModelRelations, getFillableAttributes, getGuardedAttributes, getHiddenAttributes, getRelationCount, getRelations, getRelationType, mapEntity } from './utils'
88

9-
function generateCustomAccessors(model: Model): { output: string, loopString: string, loopStringPlural: string } {
9+
function generateCustomAccessors(model: Model): { output: string, loopString: string } {
1010
let output = ''
1111
let loopString = ''
12-
let loopStringPlural = ''
1312

1413
if (model.get) {
1514
for (const [methodName, getter] of Object.entries(model.get)) {
1615
const getterStr = getter.toString()
17-
output += `${methodName}: ${getterStr}, \n`
16+
output += removeAttrString(`${methodName}: ${getterStr}, \n`)
1817
}
1918

2019
loopString += `
2120
for (const [key, fn] of Object.entries(customGetter)) {
2221
model[key] = fn()
2322
}`
24-
25-
loopStringPlural += `
26-
for (const [key, fn] of Object.entries(customGetter)) {
27-
models[key] = fn()
28-
}`
2923
}
3024

31-
return { output, loopString, loopStringPlural }
25+
return { output, loopString }
3226
}
3327

3428
function removeAttrString(getterFn: string): string {
@@ -910,22 +904,24 @@ export async function generateModelString(
910904
}
911905
912906
mapCustomGetters(models: ${modelName}JsonResponse | ${modelName}JsonResponse[]): void {
913-
if (Array.isArray(models)) {
914-
models.map((model: ${modelName}JsonResponse) => {
915-
const customGetter = {
916-
${removeAttrString(getterOutput.output)}
917-
}
907+
const data = models
908+
909+
const customGetter = {
910+
${getterOutput.output}
911+
}
912+
913+
if (Array.isArray(data)) {
914+
data.map((model: ${modelName}JsonResponse) => {
915+
918916
919917
${getterOutput.loopString}
920918
921919
return model
922920
})
923921
} else {
924-
const customGetter = {
925-
${removeAttrString(getterOutput.output)}
926-
}
922+
const model = data
927923
928-
${getterOutput.loopStringPlural}
924+
${getterOutput.loopString}
929925
}
930926
}
931927
@@ -998,7 +994,7 @@ export async function generateModelString(
998994
if (!model)
999995
return undefined
1000996
1001-
await this.mapCustomGetters(model)
997+
this.mapCustomGetters(model)
1002998
await this.loadRelations(model)
1003999
10041000
const data = new ${modelName}Model(model as ${modelName}Type)
@@ -1030,7 +1026,7 @@ export async function generateModelString(
10301026
}
10311027
10321028
if (model) {
1033-
await this.mapCustomGetters(model)
1029+
this.mapCustomGetters(model)
10341030
await this.loadRelations(model)
10351031
}
10361032
@@ -1046,7 +1042,7 @@ export async function generateModelString(
10461042
.selectAll()
10471043
.executeTakeFirst()
10481044
1049-
await instance.mapCustomGetters(model)
1045+
instance.mapCustomGetters(model)
10501046
10511047
const data = new ${modelName}Model(model as ${modelName}Type)
10521048
@@ -1060,7 +1056,7 @@ export async function generateModelString(
10601056
throw new ModelNotFoundException(404, 'No ${modelName}Model results found for query')
10611057
10621058
if (model) {
1063-
await this.mapCustomGetters(model)
1059+
this.mapCustomGetters(model)
10641060
await this.loadRelations(model)
10651061
}
10661062
@@ -1084,7 +1080,7 @@ export async function generateModelString(
10841080
10851081
const models = await DB.instance.selectFrom('${tableName}').selectAll().execute()
10861082
1087-
await instance.mapCustomGetters(model)
1083+
instance.mapCustomGetters(model)
10881084
10891085
const data = await Promise.all(models.map(async (model: ${modelName}Type) => {
10901086
return new ${modelName}Model(model)
@@ -1103,7 +1099,7 @@ export async function generateModelString(
11031099
11041100
cache.getOrSet(\`${formattedModelName}:\${id}\`, JSON.stringify(model))
11051101
1106-
await this.mapCustomGetters(model)
1102+
this.mapCustomGetters(model)
11071103
await this.loadRelations(model)
11081104
11091105
const data = new ${modelName}Model(model as ${modelName}Type)
@@ -1132,7 +1128,7 @@ export async function generateModelString(
11321128
11331129
const models = await query.execute()
11341130
1135-
await instance.mapCustomGetters(models)
1131+
instance.mapCustomGetters(models)
11361132
await instance.loadRelations(models)
11371133
11381134
return models.map((modelItem: ${modelName}Model) => instance.parseResult(new ${modelName}Model(modelItem)))
@@ -1328,7 +1324,7 @@ export async function generateModelString(
13281324
models = await this.selectFromQuery.selectAll().execute()
13291325
}
13301326
1331-
await this.mapCustomGetters(model)
1327+
this.mapCustomGetters(models)
13321328
await this.loadRelations(models)
13331329
13341330
const data = await Promise.all(models.map(async (model: ${modelName}Model) => {
@@ -1911,7 +1907,7 @@ export async function generateModelString(
19111907
if (!model)
19121908
return undefined
19131909
1914-
await instance.mapCustomGetters(model)
1910+
instance.mapCustomGetters(model)
19151911
19161912
const data = new ${modelName}Model(model as ${modelName}Type)
19171913
@@ -1929,7 +1925,7 @@ export async function generateModelString(
19291925
if (!model)
19301926
return undefined
19311927
1932-
await instance.mapCustomGetters(model)
1928+
instance.mapCustomGetters(model)
19331929
19341930
const data = new ${modelName}Model(model as ${modelName}Type)
19351931
@@ -1957,7 +1953,7 @@ export async function generateModelString(
19571953
.executeTakeFirst()
19581954
19591955
if (existing${modelName}) {
1960-
await instance.mapCustomGetters(model)
1956+
instance.mapCustomGetters(model)
19611957
await instance.loadRelations(model)
19621958
19631959
return new ${modelName}Model(existing${modelName} as ${modelName}Type)
@@ -2071,7 +2067,7 @@ export async function generateModelString(
20712067
}
20722068
20732069
if (model) {
2074-
await this.mapCustomGetters(model)
2070+
this.mapCustomGetters(model)
20752071
await this.loadRelations(model)
20762072
}
20772073

‎storage/framework/orm/src/models/AccessToken.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ export class AccessTokenModel {
8787
}
8888

8989
mapCustomGetters(models: AccessTokenJsonResponse | AccessTokenJsonResponse[]): void {
90-
if (Array.isArray(models)) {
91-
models.map((model: AccessTokenJsonResponse) => {
92-
const customGetter = {
90+
const data = models
9391

94-
}
92+
const customGetter = {
93+
94+
}
9595

96+
if (Array.isArray(data)) {
97+
data.map((model: AccessTokenJsonResponse) => {
9698
return model
9799
})
98100
}
99101
else {
100-
const customGetter = {
101-
102-
}
102+
const model = data
103103
}
104104
}
105105

@@ -225,7 +225,7 @@ export class AccessTokenModel {
225225
if (!model)
226226
return undefined
227227

228-
await this.mapCustomGetters(model)
228+
this.mapCustomGetters(model)
229229
await this.loadRelations(model)
230230

231231
const data = new AccessTokenModel(model as AccessTokenType)
@@ -257,7 +257,7 @@ export class AccessTokenModel {
257257
}
258258

259259
if (model) {
260-
await this.mapCustomGetters(model)
260+
this.mapCustomGetters(model)
261261
await this.loadRelations(model)
262262
}
263263

@@ -273,7 +273,7 @@ export class AccessTokenModel {
273273
.selectAll()
274274
.executeTakeFirst()
275275

276-
await instance.mapCustomGetters(model)
276+
instance.mapCustomGetters(model)
277277

278278
const data = new AccessTokenModel(model as AccessTokenType)
279279

@@ -287,7 +287,7 @@ export class AccessTokenModel {
287287
throw new ModelNotFoundException(404, 'No AccessTokenModel results found for query')
288288

289289
if (model) {
290-
await this.mapCustomGetters(model)
290+
this.mapCustomGetters(model)
291291
await this.loadRelations(model)
292292
}
293293

@@ -311,7 +311,7 @@ export class AccessTokenModel {
311311

312312
const models = await DB.instance.selectFrom('personal_access_tokens').selectAll().execute()
313313

314-
await instance.mapCustomGetters(model)
314+
instance.mapCustomGetters(model)
315315

316316
const data = await Promise.all(models.map(async (model: AccessTokenType) => {
317317
return new AccessTokenModel(model)
@@ -328,7 +328,7 @@ export class AccessTokenModel {
328328

329329
cache.getOrSet(`accesstoken:${id}`, JSON.stringify(model))
330330

331-
await this.mapCustomGetters(model)
331+
this.mapCustomGetters(model)
332332
await this.loadRelations(model)
333333

334334
const data = new AccessTokenModel(model as AccessTokenType)
@@ -355,7 +355,7 @@ export class AccessTokenModel {
355355

356356
const models = await query.execute()
357357

358-
await instance.mapCustomGetters(models)
358+
instance.mapCustomGetters(models)
359359
await instance.loadRelations(models)
360360

361361
return models.map((modelItem: AccessTokenModel) => instance.parseResult(new AccessTokenModel(modelItem)))
@@ -552,7 +552,7 @@ export class AccessTokenModel {
552552
models = await this.selectFromQuery.selectAll().execute()
553553
}
554554

555-
await this.mapCustomGetters(model)
555+
this.mapCustomGetters(models)
556556
await this.loadRelations(models)
557557

558558
const data = await Promise.all(models.map(async (model: AccessTokenModel) => {
@@ -1155,7 +1155,7 @@ export class AccessTokenModel {
11551155
if (!model)
11561156
return undefined
11571157

1158-
await instance.mapCustomGetters(model)
1158+
instance.mapCustomGetters(model)
11591159

11601160
const data = new AccessTokenModel(model as AccessTokenType)
11611161

@@ -1173,7 +1173,7 @@ export class AccessTokenModel {
11731173
if (!model)
11741174
return undefined
11751175

1176-
await instance.mapCustomGetters(model)
1176+
instance.mapCustomGetters(model)
11771177

11781178
const data = new AccessTokenModel(model as AccessTokenType)
11791179

@@ -1201,7 +1201,7 @@ export class AccessTokenModel {
12011201
.executeTakeFirst()
12021202

12031203
if (existingAccessToken) {
1204-
await instance.mapCustomGetters(model)
1204+
instance.mapCustomGetters(model)
12051205
await instance.loadRelations(model)
12061206

12071207
return new AccessTokenModel(existingAccessToken as AccessTokenType)
@@ -1318,7 +1318,7 @@ export class AccessTokenModel {
13181318
}
13191319

13201320
if (model) {
1321-
await this.mapCustomGetters(model)
1321+
this.mapCustomGetters(model)
13221322
await this.loadRelations(model)
13231323
}
13241324

0 commit comments

Comments
 (0)