@common-stack/server-core 7.2.1-alpha.39 → 7.2.1-alpha.41
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.
|
@@ -254,13 +254,23 @@ function generateZodType(paramType, isOptional, paramName = '') {
|
|
|
254
254
|
}
|
|
255
255
|
return zodType;
|
|
256
256
|
} else if (nonNullableTypes.length > 1) {
|
|
257
|
-
// Multiple types -
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
257
|
+
// Multiple types - generate z.union() for known types
|
|
258
|
+
// This handles cases like "IExtensionIdentifier | string"
|
|
259
|
+
const unionTypes = nonNullableTypes.map(type => {
|
|
260
|
+
// Check if it's a GraphQL type
|
|
261
|
+
if (GRAPHQL_ZOD_TYPES.has(type)) {
|
|
262
|
+
const schemaName = type.replace(/^I/, '') + 'Schema';
|
|
263
|
+
return `${schemaName}()`;
|
|
264
|
+
}
|
|
265
|
+
// Handle primitive types
|
|
266
|
+
if (type === 'string') return 'z.string()';
|
|
267
|
+
if (type === 'number') return 'z.number()';
|
|
268
|
+
if (type === 'boolean') return 'z.boolean()';
|
|
269
|
+
// Default to passthrough
|
|
270
|
+
return 'PassthroughObjectSchema';
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
return `z.union([${unionTypes.join(', ')}])`;
|
|
264
274
|
}
|
|
265
275
|
}
|
|
266
276
|
|
|
@@ -364,6 +374,16 @@ function generateServiceSchemas() {
|
|
|
364
374
|
allUsedGraphQLTypes.add(innerType);
|
|
365
375
|
}
|
|
366
376
|
}
|
|
377
|
+
// Check in union types (e.g., "IExtensionIdentifier | string")
|
|
378
|
+
if (param.type.includes('|')) {
|
|
379
|
+
const types = param.type.split('|').map(t => t.trim());
|
|
380
|
+
types.forEach(type => {
|
|
381
|
+
// Remove null and undefined
|
|
382
|
+
if (type !== 'null' && type !== 'undefined' && GRAPHQL_ZOD_TYPES.has(type)) {
|
|
383
|
+
allUsedGraphQLTypes.add(type);
|
|
384
|
+
}
|
|
385
|
+
});
|
|
386
|
+
}
|
|
367
387
|
});
|
|
368
388
|
});
|
|
369
389
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {isExcludedMethod,
|
|
1
|
+
import {getAllMethodNames,isExcludedMethod,getActionName,buildActionPath}from'./serviceGenerationUtils.js';// from package: store-mongo
|
|
2
2
|
/**
|
|
3
3
|
* @file typed-proxy-service.ts
|
|
4
4
|
* @description Provides utilities for auto-generating proxy service methods
|
|
@@ -94,11 +94,22 @@ function generateProxyMethods(proxyInstance, schemasOrConfig, broker, logger) {
|
|
|
94
94
|
}
|
|
95
95
|
// Add base proxy functionality (broker, logger, callAction)
|
|
96
96
|
addProxyBase(proxyInstance, broker, logger);
|
|
97
|
-
// Get all method names from
|
|
98
|
-
// This ensures
|
|
99
|
-
|
|
97
|
+
// Get all method names from BOTH schemas object AND service prototype chain
|
|
98
|
+
// This ensures we generate methods for:
|
|
99
|
+
// 1. Methods with explicit schemas (from schemas object)
|
|
100
|
+
// 2. Inherited methods from base classes (via prototype traversal)
|
|
101
|
+
const schemaMethodNames = new Set(Object.keys(schemas).filter((key) => key !== 'topic'));
|
|
102
|
+
// Also get methods from the prototype chain (for inherited methods)
|
|
103
|
+
// This handles cases where service extends BaseService but schemas might not have all base methods
|
|
104
|
+
const allMethodNames = getAllMethodNames(proxyInstance);
|
|
105
|
+
allMethodNames.forEach((methodName) => {
|
|
106
|
+
// Only add if not excluded and has a schema
|
|
107
|
+
if (!isExcludedMethod(methodName) && schemas[methodName]) {
|
|
108
|
+
schemaMethodNames.add(methodName);
|
|
109
|
+
}
|
|
110
|
+
});
|
|
100
111
|
// Filter methods
|
|
101
|
-
const methodsToGenerate = schemaMethodNames.filter((methodName) => {
|
|
112
|
+
const methodsToGenerate = Array.from(schemaMethodNames).filter((methodName) => {
|
|
102
113
|
// Skip excluded base methods
|
|
103
114
|
if (isExcludedMethod(methodName)) {
|
|
104
115
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typedProxyService.js","sources":["../../src/moleculer-generation/typedProxyService.ts"],"sourcesContent":[null],"names":[],"mappings":"2GAAA;AACA;;;;;;;AAOG;AAmEH;;AAEG;AACH,SAAS,8BAA8B,CAAC,MAAwB,EAAA;AAC5D,IAAA,IAAI;AACA,QAAA,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;AACzB,QAAA,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC7B;IAAC,OAAO,KAAK,EAAE;AACZ,QAAA,OAAO,EAAE,CAAC;KACb;AACL,CAAC;AAED;;;AAGG;AACH,SAAS,YAAY,CAAC,aAAkB,EAAE,MAAqB,EAAE,MAAyB,EAAA;;AAEtF,IAAA,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,QAAQ,EAAE;AAC3C,QAAA,KAAK,EAAE,MAAM;AACb,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,UAAU,EAAE,KAAK;AACjB,QAAA,YAAY,EAAE,KAAK;AACtB,KAAA,CAAC,CAAC;AAEH,IAAA,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,QAAQ,EAAE;AAC3C,QAAA,KAAK,EAAE,MAAM;AACb,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,UAAU,EAAE,KAAK;AACjB,QAAA,YAAY,EAAE,KAAK;AACtB,KAAA,CAAC,CAAC;;;IAIH,aAAa,CAAC,UAAU,GAAG,SAAS,UAAU,CAA4B,OAAe,EAAE,MAAU,EAAA;AACjG,QAAA,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;;QAEvB,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAEnD,QAAA,IAAI,CAAC,MAAM,EAAE,KAAK,GAAG,CAAA,+BAAA,EAAkC,UAAU,CAAA,CAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAEjF,OAAO,MAAM,CAAC,IAAI,CAAO,UAAU,EAAE,MAAW,CAAC,CAAC;AACtD,KAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;AAuBG;AACG,SAAU,oBAAoB,CAChC,aAAkB,EAClB,eAEsC,EACtC,MAAqB,EACrB,MAAyB,EAAA;;AAGzB,IAAA,MAAM,MAAM,GACR,SAAS,IAAI,eAAe;AACxB,UAAG,eAAoD;AACvD,UAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAEvC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAAC;;AAGlE,IAAA,MAAM,KAAK,GAAI,OAAe,CAAC,KAAK,CAAC;AACrC,IAAA,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;;AAEpC,QAAA,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,OAAO,EAAE;AAC1C,YAAA,KAAK,EAAE,KAAK;AACZ,YAAA,QAAQ,EAAE,KAAK;AACf,YAAA,UAAU,EAAE,KAAK;AACjB,YAAA,YAAY,EAAE,KAAK;AACtB,SAAA,CAAC,CAAC;KACN;AAAM,SAAA,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;;AAE7B,QAAA,MAAM,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;KAC1F;;AAGD,IAAA,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"typedProxyService.js","sources":["../../src/moleculer-generation/typedProxyService.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/server-core",
|
|
3
|
-
"version": "7.2.1-alpha.
|
|
3
|
+
"version": "7.2.1-alpha.41",
|
|
4
4
|
"description": "common core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"publishConfig": {
|
|
35
35
|
"access": "public"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "d7f8e5f4870ae7a67a23b93a34d93090e44c1511",
|
|
38
38
|
"typescript": {
|
|
39
39
|
"definition": "lib/index.d.ts"
|
|
40
40
|
}
|