bunsane 0.3.0 → 0.3.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude/scheduled_tasks.lock +1 -0
- package/CHANGELOG.md +104 -0
- package/CLAUDE.md +20 -0
- package/config/cache.config.ts +35 -1
- package/core/App.ts +24 -1060
- package/core/ArcheType.ts +78 -2110
- package/core/Entity.ts +136 -41
- package/core/RequestContext.ts +85 -36
- package/core/RequestLoaders.ts +89 -31
- package/core/SchedulerManager.ts +13 -13
- package/core/app/bootstrap.ts +133 -0
- package/core/app/cors.ts +94 -0
- package/core/app/graphqlSetup.ts +56 -0
- package/core/app/healthEndpoints.ts +31 -0
- package/core/app/metricsCollector.ts +27 -0
- package/core/app/preparedStatementWarmup.ts +55 -0
- package/core/app/processHandlers.ts +43 -0
- package/core/app/requestRouter.ts +309 -0
- package/core/app/restRegistry.ts +72 -0
- package/core/app/shutdown.ts +97 -0
- package/core/app/studioRouter.ts +83 -0
- package/core/archetype/customTypes.ts +100 -0
- package/core/archetype/decorators.ts +171 -0
- package/core/archetype/fieldResolvers.ts +621 -0
- package/core/archetype/helpers.ts +29 -0
- package/core/archetype/relationLoader.ts +118 -0
- package/core/archetype/schemaBuilder.ts +141 -0
- package/core/archetype/weaver.ts +218 -0
- package/core/archetype/zodSchemaBuilder.ts +527 -0
- package/core/cache/CacheManager.ts +144 -9
- package/core/components/BaseComponent.ts +12 -2
- package/core/middleware/AccessLog.ts +8 -1
- package/database/PreparedStatementCache.ts +17 -16
- package/database/cancellable.ts +22 -0
- package/database/instrumentedDb.ts +141 -0
- package/docs/RFC_APP_REFACTOR.md +248 -0
- package/docs/RFC_REFACTOR_TARGETS.md +251 -0
- package/package.json +1 -1
- package/query/ComponentInclusionNode.ts +5 -5
- package/query/Query.ts +65 -48
- package/service/ServiceRegistry.ts +7 -1
- package/service/index.ts +4 -2
- package/tests/integration/loaders/RequestLoaders.abort.test.ts +82 -0
- package/tests/integration/query/Query.abort.test.ts +66 -0
- package/tests/unit/cache/CacheManager.test.ts +152 -1
- package/tests/unit/database/cancellable.test.ts +81 -0
- package/tests/unit/database/instrumentedDb.test.ts +160 -0
- package/tests/unit/entity/Entity.components.test.ts +73 -0
- package/tests/unit/entity/Entity.drainSideEffects.test.ts +51 -0
- package/tests/unit/entity/Entity.reload.test.ts +63 -0
- package/tests/unit/entity/Entity.requireComponents.test.ts +72 -0
- package/tests/unit/query/Query.emptyString.test.ts +69 -0
- package/tests/unit/query/Query.test.ts +6 -4
- package/tests/unit/scheduler/SchedulerManager.timeBased.test.ts +95 -0
|
@@ -0,0 +1,527 @@
|
|
|
1
|
+
import { z, ZodObject } from "zod";
|
|
2
|
+
import { weave } from "@gqloom/core";
|
|
3
|
+
import { ZodWeaver, asObjectType, asUnionType } from "@gqloom/zod";
|
|
4
|
+
import { printSchema } from "graphql";
|
|
5
|
+
import "reflect-metadata";
|
|
6
|
+
import { getMetadataStorage } from "../metadata";
|
|
7
|
+
import { compNameToFieldName, shouldUnwrapComponent } from "./helpers";
|
|
8
|
+
import { getOrCreateComponentSchema } from "./schemaBuilder";
|
|
9
|
+
import {
|
|
10
|
+
customTypeRegistry,
|
|
11
|
+
customTypeNameRegistry,
|
|
12
|
+
registeredCustomTypes,
|
|
13
|
+
inputTypeRegistry,
|
|
14
|
+
} from "./customTypes";
|
|
15
|
+
import { archetypeSchemaCache, allArchetypeZodObjects } from "./weaver";
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Build the Zod object schema for an archetype, register it in caches, and return it.
|
|
19
|
+
* Extracted from BaseArcheType.getZodObjectSchema().
|
|
20
|
+
*/
|
|
21
|
+
export function buildZodObjectSchema(
|
|
22
|
+
archetype: any,
|
|
23
|
+
options?: { excludeRelations?: boolean; excludeFunctions?: boolean }
|
|
24
|
+
): ZodObject<any> {
|
|
25
|
+
const excludeRelations = options?.excludeRelations ?? false;
|
|
26
|
+
const excludeFunctions = options?.excludeFunctions ?? false;
|
|
27
|
+
const zodShapes: Record<string, any> = {};
|
|
28
|
+
const storage = getMetadataStorage();
|
|
29
|
+
const unionSchemas: Array<{
|
|
30
|
+
fieldName: string;
|
|
31
|
+
schema: any;
|
|
32
|
+
components: any[];
|
|
33
|
+
}> = [];
|
|
34
|
+
|
|
35
|
+
for (const [field, ctor] of Object.entries(archetype.componentMap)) {
|
|
36
|
+
if (field.startsWith("union_")) {
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const componentCtor = ctor as any;
|
|
41
|
+
const type = archetype.fieldTypes[field];
|
|
42
|
+
const typeId = storage.getComponentId(componentCtor.name);
|
|
43
|
+
const componentProps = storage.getComponentProperties(typeId);
|
|
44
|
+
|
|
45
|
+
if (shouldUnwrapComponent(componentProps, type)) {
|
|
46
|
+
if (type === String) {
|
|
47
|
+
zodShapes[field] = z.string();
|
|
48
|
+
} else if (type === Number) {
|
|
49
|
+
zodShapes[field] = z.number();
|
|
50
|
+
} else if (type === Boolean) {
|
|
51
|
+
zodShapes[field] = z.boolean();
|
|
52
|
+
} else if (type === Date) {
|
|
53
|
+
zodShapes[field] = z.date();
|
|
54
|
+
}
|
|
55
|
+
} else {
|
|
56
|
+
const componentSchema = getOrCreateComponentSchema(
|
|
57
|
+
componentCtor,
|
|
58
|
+
typeId,
|
|
59
|
+
archetype.fieldOptions[field]
|
|
60
|
+
);
|
|
61
|
+
if (componentSchema) {
|
|
62
|
+
zodShapes[field] = componentSchema;
|
|
63
|
+
} else {
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
if (
|
|
69
|
+
archetype.fieldOptions[field]?.nullable &&
|
|
70
|
+
zodShapes[field] &&
|
|
71
|
+
!(zodShapes[field] instanceof ZodObject)
|
|
72
|
+
) {
|
|
73
|
+
zodShapes[field] = zodShapes[field].nullish();
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
for (const [fieldName, components] of Object.entries(archetype.unionMap)) {
|
|
78
|
+
const componentList = components as any[];
|
|
79
|
+
const unionComponentSchemas: any[] = [];
|
|
80
|
+
const unionComponentCtors: any[] = [];
|
|
81
|
+
|
|
82
|
+
for (const component of componentList) {
|
|
83
|
+
const typeId = storage.getComponentId(component.name);
|
|
84
|
+
const componentSchema = getOrCreateComponentSchema(
|
|
85
|
+
component,
|
|
86
|
+
typeId,
|
|
87
|
+
archetype.unionOptions[fieldName]
|
|
88
|
+
);
|
|
89
|
+
|
|
90
|
+
if (componentSchema) {
|
|
91
|
+
unionComponentSchemas.push(componentSchema);
|
|
92
|
+
unionComponentCtors.push(component);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (unionComponentSchemas.length > 0) {
|
|
97
|
+
const unionSchema = z
|
|
98
|
+
.union(unionComponentSchemas)
|
|
99
|
+
.register(asUnionType, {
|
|
100
|
+
name:
|
|
101
|
+
fieldName.charAt(0).toUpperCase() +
|
|
102
|
+
fieldName.slice(1),
|
|
103
|
+
resolveType: (it: any) => {
|
|
104
|
+
if (it.__typename) {
|
|
105
|
+
return it.__typename;
|
|
106
|
+
}
|
|
107
|
+
for (
|
|
108
|
+
let i = 0;
|
|
109
|
+
i < unionComponentCtors.length;
|
|
110
|
+
i++
|
|
111
|
+
) {
|
|
112
|
+
const componentProps =
|
|
113
|
+
storage.getComponentProperties(
|
|
114
|
+
storage.getComponentId(
|
|
115
|
+
unionComponentCtors[i].name
|
|
116
|
+
)
|
|
117
|
+
);
|
|
118
|
+
const hasUniqueProps = componentProps.some(
|
|
119
|
+
(prop) =>
|
|
120
|
+
it.hasOwnProperty(prop.propertyKey)
|
|
121
|
+
);
|
|
122
|
+
if (hasUniqueProps) {
|
|
123
|
+
return compNameToFieldName(
|
|
124
|
+
unionComponentCtors[i].name
|
|
125
|
+
);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
return compNameToFieldName(
|
|
129
|
+
unionComponentCtors[0].name
|
|
130
|
+
);
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
zodShapes[fieldName] = unionSchema;
|
|
135
|
+
unionSchemas.push({
|
|
136
|
+
fieldName,
|
|
137
|
+
schema: unionSchema,
|
|
138
|
+
components: unionComponentSchemas,
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
if (archetype.unionOptions[fieldName]?.nullable) {
|
|
142
|
+
zodShapes[fieldName] = zodShapes[fieldName].nullish();
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
if (!excludeRelations) {
|
|
148
|
+
for (const [field, relatedArcheType] of Object.entries(archetype.relationMap)) {
|
|
149
|
+
const relationType = archetype.relationTypes[field];
|
|
150
|
+
const isArray =
|
|
151
|
+
relationType === "hasMany" || relationType === "belongsToMany";
|
|
152
|
+
|
|
153
|
+
let relatedTypeName: string;
|
|
154
|
+
if (typeof relatedArcheType === "string") {
|
|
155
|
+
relatedTypeName = relatedArcheType;
|
|
156
|
+
} else {
|
|
157
|
+
const relatedArchetypeId = storage.getComponentId(
|
|
158
|
+
(relatedArcheType as any).name
|
|
159
|
+
);
|
|
160
|
+
const relatedArchetypeMetadata = storage.archetypes.find(
|
|
161
|
+
(a) => a.typeId === relatedArchetypeId
|
|
162
|
+
);
|
|
163
|
+
relatedTypeName =
|
|
164
|
+
relatedArchetypeMetadata?.name ||
|
|
165
|
+
(relatedArcheType as any).name.replace(/ArcheType$/, "");
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
const relatedTypeSchema = z
|
|
169
|
+
.string()
|
|
170
|
+
.describe(`Reference to ${relatedTypeName} type`);
|
|
171
|
+
|
|
172
|
+
if (isArray) {
|
|
173
|
+
const shouldBeRequired = archetype.relationOptions[field]?.nullable === false;
|
|
174
|
+
zodShapes[field] = shouldBeRequired
|
|
175
|
+
? z.array(relatedTypeSchema)
|
|
176
|
+
: z.array(relatedTypeSchema).optional();
|
|
177
|
+
} else {
|
|
178
|
+
zodShapes[field] = relatedTypeSchema;
|
|
179
|
+
|
|
180
|
+
if (archetype.relationOptions[field]?.nullable) {
|
|
181
|
+
zodShapes[field] = zodShapes[field].nullish();
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
const functionInputTypes = new Map<string, string>();
|
|
188
|
+
|
|
189
|
+
if (!excludeFunctions) {
|
|
190
|
+
for (const { propertyKey, options } of archetype.functions) {
|
|
191
|
+
let zodType;
|
|
192
|
+
if (options?.returnType === 'number') {
|
|
193
|
+
zodType = z.number();
|
|
194
|
+
} else if (options?.returnType === 'string') {
|
|
195
|
+
zodType = z.string();
|
|
196
|
+
} else if (options?.returnType === 'boolean') {
|
|
197
|
+
zodType = z.boolean();
|
|
198
|
+
} else if (options?.returnType) {
|
|
199
|
+
zodType = z.string().describe(`Reference to ${options.returnType} type`);
|
|
200
|
+
} else {
|
|
201
|
+
const returnType = Reflect.getMetadata("design:returntype", archetype.constructor.prototype, propertyKey);
|
|
202
|
+
if (returnType === String) {
|
|
203
|
+
zodType = z.string();
|
|
204
|
+
} else if (returnType === Number) {
|
|
205
|
+
zodType = z.number();
|
|
206
|
+
} else if (returnType === Boolean) {
|
|
207
|
+
zodType = z.boolean();
|
|
208
|
+
} else {
|
|
209
|
+
zodType = z.any();
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
if (options?.args && options.args.length > 0) {
|
|
214
|
+
const archetypeId = storage.getComponentId(archetype.constructor.name);
|
|
215
|
+
const archetypeName =
|
|
216
|
+
storage.archetypes.find((a) => a.typeId === archetypeId)?.name ||
|
|
217
|
+
archetype.constructor.name;
|
|
218
|
+
const inputTypeName = `${archetypeName}_${propertyKey}Args`;
|
|
219
|
+
|
|
220
|
+
const inputFields: Record<string, any> = {};
|
|
221
|
+
for (const arg of options.args) {
|
|
222
|
+
let argZodType: any;
|
|
223
|
+
|
|
224
|
+
if (customTypeRegistry.has(arg.type)) {
|
|
225
|
+
argZodType = customTypeRegistry.get(arg.type)!;
|
|
226
|
+
} else if (arg.type === String || arg.type === String) {
|
|
227
|
+
argZodType = z.string();
|
|
228
|
+
} else if (arg.type === Number) {
|
|
229
|
+
argZodType = z.number();
|
|
230
|
+
} else if (arg.type === Boolean) {
|
|
231
|
+
argZodType = z.boolean();
|
|
232
|
+
} else if (arg.type === Date) {
|
|
233
|
+
argZodType = z.date();
|
|
234
|
+
} else if (registeredCustomTypes.has(arg.type?.name || '')) {
|
|
235
|
+
argZodType = registeredCustomTypes.get(arg.type.name);
|
|
236
|
+
} else {
|
|
237
|
+
const typeName = customTypeNameRegistry.get(arg.type);
|
|
238
|
+
if (typeName && registeredCustomTypes.has(typeName)) {
|
|
239
|
+
argZodType = registeredCustomTypes.get(typeName);
|
|
240
|
+
} else {
|
|
241
|
+
console.warn(`[ArcheType] Unknown argument type for ${archetypeName}.${propertyKey}.${arg.name}: ${arg.type?.name || arg.type}. Falling back to z.any()`);
|
|
242
|
+
argZodType = z.any();
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
if (arg.nullable) {
|
|
247
|
+
argZodType = argZodType.optional();
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
inputFields[arg.name] = argZodType;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
const inputSchema = z.object(inputFields).register(asObjectType, { name: inputTypeName });
|
|
254
|
+
registeredCustomTypes.set(inputTypeName, inputSchema);
|
|
255
|
+
functionInputTypes.set(propertyKey, inputTypeName);
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
zodShapes[propertyKey] = zodType.optional();
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
const archetypeId = storage.getComponentId(archetype.constructor.name);
|
|
263
|
+
const nameFromStorage =
|
|
264
|
+
storage.archetypes.find((a) => a.typeId === archetypeId)?.name ||
|
|
265
|
+
archetype.constructor.name;
|
|
266
|
+
const shape: Record<string, any> = {
|
|
267
|
+
__typename: z.literal(nameFromStorage).nullish(),
|
|
268
|
+
id: z.string().nullish(),
|
|
269
|
+
};
|
|
270
|
+
for (const [field, zodType] of Object.entries(zodShapes)) {
|
|
271
|
+
const isNullable =
|
|
272
|
+
archetype.fieldOptions[field]?.nullable ||
|
|
273
|
+
archetype.unionOptions[field]?.nullable;
|
|
274
|
+
if (isNullable) {
|
|
275
|
+
shape[field] = zodType.optional();
|
|
276
|
+
} else {
|
|
277
|
+
shape[field] = zodType;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
const r = z.object(shape);
|
|
281
|
+
|
|
282
|
+
const componentSchemasToWeave: any[] = [];
|
|
283
|
+
for (const [field, zodType] of Object.entries(zodShapes)) {
|
|
284
|
+
if (zodType instanceof ZodObject) {
|
|
285
|
+
componentSchemasToWeave.push(zodType);
|
|
286
|
+
} else if (
|
|
287
|
+
Array.isArray(zodType) ||
|
|
288
|
+
(zodType &&
|
|
289
|
+
typeof zodType === "object" &&
|
|
290
|
+
zodType._def?.typeName === "ZodUnion")
|
|
291
|
+
) {
|
|
292
|
+
if (zodType._def?.typeName === "ZodUnion") {
|
|
293
|
+
componentSchemasToWeave.push(zodType);
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
const schemasToWeave = [r];
|
|
299
|
+
const schema = weave(ZodWeaver, ...schemasToWeave);
|
|
300
|
+
let graphqlSchemaString = printSchema(schema);
|
|
301
|
+
|
|
302
|
+
graphqlSchemaString = graphqlSchemaString.replace(
|
|
303
|
+
/\bid:\s*String\b/g,
|
|
304
|
+
"id: ID"
|
|
305
|
+
);
|
|
306
|
+
|
|
307
|
+
for (const [field, relatedArcheType] of Object.entries(archetype.relationMap)) {
|
|
308
|
+
const relationType = archetype.relationTypes[field];
|
|
309
|
+
const isArray =
|
|
310
|
+
relationType === "hasMany" || relationType === "belongsToMany";
|
|
311
|
+
|
|
312
|
+
let relatedTypeName: string;
|
|
313
|
+
if (typeof relatedArcheType === "string") {
|
|
314
|
+
relatedTypeName = relatedArcheType;
|
|
315
|
+
} else {
|
|
316
|
+
const relatedArchetypeId = storage.getComponentId(
|
|
317
|
+
(relatedArcheType as any).name
|
|
318
|
+
);
|
|
319
|
+
const relatedArchetypeMetadata = storage.archetypes.find(
|
|
320
|
+
(a) => a.typeId === relatedArchetypeId
|
|
321
|
+
);
|
|
322
|
+
relatedTypeName =
|
|
323
|
+
relatedArchetypeMetadata?.name ||
|
|
324
|
+
(relatedArcheType as any).name.replace(/ArcheType$/, "");
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
if (isArray) {
|
|
328
|
+
const shouldBeRequired = archetype.relationOptions[field]?.nullable === false;
|
|
329
|
+
const suffix = shouldBeRequired ? "!" : "";
|
|
330
|
+
|
|
331
|
+
const descriptionPattern = new RegExp(`"""Reference to ${relatedTypeName} type"""[\\s\\S]*?${field}:`);
|
|
332
|
+
if (!descriptionPattern.test(graphqlSchemaString)) {
|
|
333
|
+
const addDescriptionPattern = new RegExp(
|
|
334
|
+
`(\\n\\s+)(${field}:\\s*\\[String!?\\]!?)`,
|
|
335
|
+
"g"
|
|
336
|
+
);
|
|
337
|
+
graphqlSchemaString = graphqlSchemaString.replace(
|
|
338
|
+
addDescriptionPattern,
|
|
339
|
+
`$1"""Reference to ${relatedTypeName} type"""\n$1$2`
|
|
340
|
+
);
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
const replaceTypePattern = new RegExp(
|
|
344
|
+
`(${field}:\\s*)\\[String!?\\](!?)`,
|
|
345
|
+
"g"
|
|
346
|
+
);
|
|
347
|
+
graphqlSchemaString = graphqlSchemaString.replace(
|
|
348
|
+
replaceTypePattern,
|
|
349
|
+
`$1[${relatedTypeName}!]${suffix}`
|
|
350
|
+
);
|
|
351
|
+
} else {
|
|
352
|
+
const isNullable = archetype.relationOptions[field]?.nullable;
|
|
353
|
+
const suffix = isNullable ? "" : "!";
|
|
354
|
+
const pattern = new RegExp(`${field}:\\s*String!?`, "g");
|
|
355
|
+
graphqlSchemaString = graphqlSchemaString.replace(
|
|
356
|
+
pattern,
|
|
357
|
+
`${field}: ${relatedTypeName}${suffix}`
|
|
358
|
+
);
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
if (!excludeFunctions) {
|
|
363
|
+
for (const { propertyKey, options } of archetype.functions) {
|
|
364
|
+
if (options?.args && options.args.length > 0) {
|
|
365
|
+
const argDefs: string[] = [];
|
|
366
|
+
for (const arg of options.args) {
|
|
367
|
+
let argTypeName: string;
|
|
368
|
+
|
|
369
|
+
const inputTypeName = inputTypeRegistry.get(arg.type);
|
|
370
|
+
if (inputTypeName) {
|
|
371
|
+
argTypeName = inputTypeName;
|
|
372
|
+
} else {
|
|
373
|
+
const registeredTypeName = customTypeNameRegistry.get(arg.type);
|
|
374
|
+
if (registeredTypeName) {
|
|
375
|
+
argTypeName = registeredTypeName;
|
|
376
|
+
} else if (customTypeRegistry.has(arg.type)) {
|
|
377
|
+
const registeredName = Array.from(registeredCustomTypes.entries())
|
|
378
|
+
.find(([name, schema]) => schema === customTypeRegistry.get(arg.type))?.[0];
|
|
379
|
+
argTypeName = registeredName || 'String';
|
|
380
|
+
} else if (arg.type === String) {
|
|
381
|
+
argTypeName = 'String';
|
|
382
|
+
} else if (arg.type === Number) {
|
|
383
|
+
argTypeName = 'Float';
|
|
384
|
+
} else if (arg.type === Boolean) {
|
|
385
|
+
argTypeName = 'Boolean';
|
|
386
|
+
} else if (arg.type === Date) {
|
|
387
|
+
argTypeName = 'Date';
|
|
388
|
+
} else if (arg.type?.name && registeredCustomTypes.has(arg.type.name)) {
|
|
389
|
+
argTypeName = arg.type.name;
|
|
390
|
+
} else if (arg.type?.name) {
|
|
391
|
+
argTypeName = arg.type.name;
|
|
392
|
+
} else {
|
|
393
|
+
argTypeName = 'String';
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
const nullable = arg.nullable ? '' : '!';
|
|
398
|
+
argDefs.push(`${arg.name}: ${argTypeName}${nullable}`);
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
const escapedKey = propertyKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
402
|
+
const escapedTypeName = nameFromStorage.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
403
|
+
|
|
404
|
+
const argsString = argDefs.join(', ');
|
|
405
|
+
|
|
406
|
+
console.log(`[ArcheType] Adding arguments to ${nameFromStorage}.${propertyKey}: ${argsString}`);
|
|
407
|
+
|
|
408
|
+
const typeStartPattern = new RegExp(`type\\s+${escapedTypeName}\\s*\\{`, 'i');
|
|
409
|
+
let typeStartMatch = graphqlSchemaString.match(typeStartPattern);
|
|
410
|
+
|
|
411
|
+
if (!typeStartMatch) {
|
|
412
|
+
const caseInsensitivePattern = new RegExp(`type\\s+([^\\s{]+)\\s*\\{`, 'gi');
|
|
413
|
+
const allTypes = [...graphqlSchemaString.matchAll(caseInsensitivePattern)];
|
|
414
|
+
const matchingType = allTypes.find(match =>
|
|
415
|
+
match[1]!.toLowerCase() === nameFromStorage.toLowerCase()
|
|
416
|
+
);
|
|
417
|
+
if (matchingType && matchingType.index !== undefined) {
|
|
418
|
+
typeStartMatch = [matchingType[0], matchingType[1]] as RegExpMatchArray;
|
|
419
|
+
typeStartMatch.index = matchingType.index;
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
|
|
423
|
+
if (typeStartMatch) {
|
|
424
|
+
const typeStartIndex = typeStartMatch.index! + typeStartMatch[0].length;
|
|
425
|
+
let braceCount = 1;
|
|
426
|
+
let typeEndIndex = typeStartIndex;
|
|
427
|
+
for (let i = typeStartIndex; i < graphqlSchemaString.length && braceCount > 0; i++) {
|
|
428
|
+
if (graphqlSchemaString[i] === '{') braceCount++;
|
|
429
|
+
if (graphqlSchemaString[i] === '}') braceCount--;
|
|
430
|
+
if (braceCount === 0) {
|
|
431
|
+
typeEndIndex = i;
|
|
432
|
+
break;
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
const typeDefinition = graphqlSchemaString.substring(typeStartIndex, typeEndIndex);
|
|
437
|
+
|
|
438
|
+
console.log(`[ArcheType] Type definition for ${nameFromStorage}:`, typeDefinition.substring(0, 200));
|
|
439
|
+
|
|
440
|
+
const fieldPattern = new RegExp(
|
|
441
|
+
`(\\n\\s+)(${escapedKey}\\??\\s*:\\s*)([^\\n]+)`,
|
|
442
|
+
'g'
|
|
443
|
+
);
|
|
444
|
+
|
|
445
|
+
const fieldMatch = fieldPattern.exec(typeDefinition);
|
|
446
|
+
if (fieldMatch) {
|
|
447
|
+
const returnType = fieldMatch[3]!.trim();
|
|
448
|
+
const indent = fieldMatch[1];
|
|
449
|
+
const replacement = `${indent}${propertyKey}(${argsString}): ${returnType}`;
|
|
450
|
+
|
|
451
|
+
console.log(`[ArcheType] Found field match: "${fieldMatch[0]}" -> "${replacement}"`);
|
|
452
|
+
|
|
453
|
+
const fullMatchStart = typeStartIndex + fieldMatch.index!;
|
|
454
|
+
const fullMatchEnd = fullMatchStart + fieldMatch[0].length;
|
|
455
|
+
graphqlSchemaString =
|
|
456
|
+
graphqlSchemaString.substring(0, fullMatchStart) +
|
|
457
|
+
replacement +
|
|
458
|
+
graphqlSchemaString.substring(fullMatchEnd);
|
|
459
|
+
|
|
460
|
+
console.log(`[ArcheType] Replacement successful for ${nameFromStorage}.${propertyKey}`);
|
|
461
|
+
} else {
|
|
462
|
+
console.warn(`[ArcheType] Field pattern not found in type definition. Looking for: ${escapedKey}`);
|
|
463
|
+
const simplePattern = new RegExp(
|
|
464
|
+
`(${escapedKey}\\??\\s*:\\s*)([^\\n]+)`,
|
|
465
|
+
'g'
|
|
466
|
+
);
|
|
467
|
+
const beforeReplace = graphqlSchemaString;
|
|
468
|
+
graphqlSchemaString = graphqlSchemaString.replace(
|
|
469
|
+
simplePattern,
|
|
470
|
+
(match, fieldDef, returnType) => {
|
|
471
|
+
console.log(`[ArcheType] Fallback replacement: "${match}" -> "${propertyKey}(${argsString}): ${returnType.trim()}"`);
|
|
472
|
+
return `${propertyKey}(${argsString}): ${returnType.trim()}`;
|
|
473
|
+
}
|
|
474
|
+
);
|
|
475
|
+
if (beforeReplace === graphqlSchemaString) {
|
|
476
|
+
console.warn(`[ArcheType] Fallback replacement also failed for ${nameFromStorage}.${propertyKey}`);
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
} else {
|
|
480
|
+
console.warn(`[ArcheType] Type pattern not found for ${nameFromStorage}. Schema snippet:`, graphqlSchemaString.substring(0, 300));
|
|
481
|
+
const simplePattern = new RegExp(
|
|
482
|
+
`(${escapedKey}\\??\\s*:\\s*)([^\\n]+)`,
|
|
483
|
+
'g'
|
|
484
|
+
);
|
|
485
|
+
const beforeReplace = graphqlSchemaString;
|
|
486
|
+
graphqlSchemaString = graphqlSchemaString.replace(
|
|
487
|
+
simplePattern,
|
|
488
|
+
(match, fieldDef, returnType) => {
|
|
489
|
+
console.log(`[ArcheType] Final fallback replacement: "${match}" -> "${propertyKey}(${argsString}): ${returnType.trim()}"`);
|
|
490
|
+
return `${propertyKey}(${argsString}): ${returnType.trim()}`;
|
|
491
|
+
}
|
|
492
|
+
);
|
|
493
|
+
if (beforeReplace === graphqlSchemaString) {
|
|
494
|
+
console.warn(`[ArcheType] All replacement attempts failed for ${nameFromStorage}.${propertyKey}`);
|
|
495
|
+
}
|
|
496
|
+
}
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
if (options?.returnType && !['string', 'number', 'boolean'].includes(options.returnType)) {
|
|
500
|
+
const fieldIndex = graphqlSchemaString.indexOf(` ${propertyKey}`);
|
|
501
|
+
if (fieldIndex !== -1) {
|
|
502
|
+
const lineStart = fieldIndex;
|
|
503
|
+
const lineEnd = graphqlSchemaString.indexOf('\n', fieldIndex);
|
|
504
|
+
const fieldLine = graphqlSchemaString.substring(lineStart, lineEnd !== -1 ? lineEnd : graphqlSchemaString.length);
|
|
505
|
+
|
|
506
|
+
const updatedLine = fieldLine.replace(/:\s*String(\??)(\s*)$/, `: ${options.returnType}$1$2`);
|
|
507
|
+
|
|
508
|
+
if (updatedLine !== fieldLine) {
|
|
509
|
+
graphqlSchemaString = graphqlSchemaString.substring(0, lineStart) +
|
|
510
|
+
updatedLine +
|
|
511
|
+
graphqlSchemaString.substring(lineEnd !== -1 ? lineEnd : graphqlSchemaString.length);
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
const cacheKey = `${nameFromStorage}_${excludeRelations}_${excludeFunctions}`;
|
|
519
|
+
archetypeSchemaCache.set(cacheKey, {
|
|
520
|
+
zodSchema: r,
|
|
521
|
+
graphqlSchema: graphqlSchemaString,
|
|
522
|
+
});
|
|
523
|
+
|
|
524
|
+
allArchetypeZodObjects.set(nameFromStorage, r);
|
|
525
|
+
|
|
526
|
+
return r;
|
|
527
|
+
}
|