@redocly/client-generator 0.9.0 → 0.9.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/eject-assets/generators/cli/docs.ts +1 -1
- package/eject-assets/generators/cli/engine-source.ts +1 -1
- package/eject-assets/generators/cli/index.ts +2 -2
- package/eject-assets/generators/cli/render.ts +1 -1
- package/eject-assets/generators/go/client.ts +1 -1
- package/eject-assets/generators/go/descriptor.ts +1 -1
- package/eject-assets/generators/go/index.ts +2 -2
- package/eject-assets/generators/go/models.ts +1 -1
- package/eject-assets/generators/go/naming.ts +1 -1
- package/eject-assets/generators/go/operations.ts +1 -1
- package/eject-assets/generators/go/pagination.ts +1 -1
- package/eject-assets/generators/go/types.ts +1 -1
- package/eject-assets/generators/java/client.ts +1 -1
- package/eject-assets/generators/java/descriptor.ts +1 -1
- package/eject-assets/generators/java/index.ts +2 -2
- package/eject-assets/generators/java/models.ts +1 -1
- package/eject-assets/generators/java/naming.ts +1 -1
- package/eject-assets/generators/java/operations.ts +1 -1
- package/eject-assets/generators/java/pagination.ts +1 -1
- package/eject-assets/generators/java/types.ts +1 -1
- package/eject-assets/generators/mock/faker.ts +1 -1
- package/eject-assets/generators/mock/index.ts +2 -2
- package/eject-assets/generators/mock/render.ts +1 -1
- package/eject-assets/generators/mock/sample.ts +1 -1
- package/eject-assets/generators/mock/values.ts +1 -1
- package/eject-assets/generators/php/client.ts +1 -1
- package/eject-assets/generators/php/descriptor.ts +1 -1
- package/eject-assets/generators/php/index.ts +2 -2
- package/eject-assets/generators/php/models.ts +1 -1
- package/eject-assets/generators/php/naming.ts +1 -1
- package/eject-assets/generators/php/operations.ts +1 -1
- package/eject-assets/generators/php/pagination.ts +1 -1
- package/eject-assets/generators/php/types.ts +43 -20
- package/eject-assets/generators/python/client.ts +1 -1
- package/eject-assets/generators/python/descriptor.ts +1 -1
- package/eject-assets/generators/python/index.ts +2 -2
- package/eject-assets/generators/python/models.ts +1 -1
- package/eject-assets/generators/python/naming.ts +1 -1
- package/eject-assets/generators/python/operations.ts +1 -1
- package/eject-assets/generators/python/pagination.ts +1 -1
- package/eject-assets/generators/python/types.ts +1 -1
- package/eject-assets/generators/swr/index.ts +2 -2
- package/eject-assets/generators/swr/render.ts +1 -1
- package/eject-assets/generators/tanstack-query/index.ts +2 -2
- package/eject-assets/generators/tanstack-query/render.ts +1 -1
- package/eject-assets/generators/transformers/index.ts +2 -2
- package/eject-assets/generators/transformers/render.ts +1 -1
- package/eject-assets/generators/typescript/banner.ts +1 -1
- package/eject-assets/generators/typescript/client.ts +1 -1
- package/eject-assets/generators/typescript/descriptor.ts +1 -1
- package/eject-assets/generators/typescript/index.ts +2 -2
- package/eject-assets/generators/typescript/inline-runtime.ts +1 -1
- package/eject-assets/generators/typescript/operation-signature.ts +1 -1
- package/eject-assets/generators/typescript/operation-types.ts +1 -1
- package/eject-assets/generators/typescript/operations.ts +1 -1
- package/eject-assets/generators/typescript/response-headers.ts +1 -1
- package/eject-assets/generators/typescript/type-guards.ts +1 -1
- package/eject-assets/generators/typescript/types.ts +1 -1
- package/eject-assets/generators/zod/index.ts +2 -2
- package/eject-assets/generators/zod/schemas.ts +1 -1
- package/eject-assets/skills/php-generator/SKILL.md +3 -2
- package/lib/generators/php/types.d.ts +2 -2
- package/lib/generators/php/types.d.ts.map +1 -1
- package/lib/generators/php/types.js +43 -22
- package/lib/generators/php/types.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "cli" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator cli --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "cli" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator cli --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "cli" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator cli --update`.
|
|
@@ -95,5 +95,5 @@ export default {
|
|
|
95
95
|
docs: cliDocs,
|
|
96
96
|
requires: ["typescript","zod"],
|
|
97
97
|
errorModes: ["throw"],
|
|
98
|
-
requiresGenerator: '^0.9.
|
|
98
|
+
requiresGenerator: '^0.9.2',
|
|
99
99
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "cli" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator cli --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -348,5 +348,5 @@ export default {
|
|
|
348
348
|
"argsStyle": "inputs follow the target language's own idiom",
|
|
349
349
|
"importExt": "the generated file has no relative imports"
|
|
350
350
|
},
|
|
351
|
-
requiresGenerator: '^0.9.
|
|
351
|
+
requiresGenerator: '^0.9.2',
|
|
352
352
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "go" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator go --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -249,5 +249,5 @@ export default {
|
|
|
249
249
|
"argsStyle": "inputs follow the target language's own idiom",
|
|
250
250
|
"importExt": "the generated file has no relative imports"
|
|
251
251
|
},
|
|
252
|
-
requiresGenerator: '^0.9.
|
|
252
|
+
requiresGenerator: '^0.9.2',
|
|
253
253
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "java" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator java --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "mock" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator mock --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "mock" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator mock --update`.
|
|
@@ -32,5 +32,5 @@ export default {
|
|
|
32
32
|
name: 'mock',
|
|
33
33
|
run: mockGenerator,
|
|
34
34
|
requires: ["typescript"],
|
|
35
|
-
requiresGenerator: '^0.9.
|
|
35
|
+
requiresGenerator: '^0.9.2',
|
|
36
36
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "mock" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator mock --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "mock" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator mock --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "mock" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator mock --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -252,5 +252,5 @@ export default {
|
|
|
252
252
|
"argsStyle": "inputs follow the target language's own idiom",
|
|
253
253
|
"importExt": "the generated file has no relative imports"
|
|
254
254
|
},
|
|
255
|
-
requiresGenerator: '^0.9.
|
|
255
|
+
requiresGenerator: '^0.9.2',
|
|
256
256
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "php" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator php --update`.
|
|
@@ -63,15 +63,17 @@ export function phpType(
|
|
|
63
63
|
if (kind === 'class' || kind === 'enum') return className(schema.name);
|
|
64
64
|
const target = deref(schema, model);
|
|
65
65
|
if (target === undefined) return 'mixed';
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// A
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
66
|
+
if (target.kind !== 'union' || discriminatorCases(target, model) === undefined) {
|
|
67
|
+
return phpType(target, model, dateType);
|
|
68
|
+
}
|
|
69
|
+
// A discriminated union hydrates through `unmarshalX`, so its members keep their own
|
|
70
|
+
// types, and a value with an unknown discriminator stays the raw array.
|
|
71
|
+
const members: SchemaModel[] = [
|
|
72
|
+
...target.members,
|
|
73
|
+
{ kind: 'array', items: { kind: 'unknown' } },
|
|
74
|
+
];
|
|
75
|
+
const type = phpUnionType(members, (member) => phpType(member, model, dateType));
|
|
76
|
+
return isNullable(target) ? phpNullable(type) : type;
|
|
75
77
|
}
|
|
76
78
|
case 'enum':
|
|
77
79
|
// Anonymous (inline) enums keep the wire scalar; only NAMED enums get types.
|
|
@@ -86,7 +88,7 @@ export function phpType(
|
|
|
86
88
|
// PHP has no Omit; the base class is the honest annotation.
|
|
87
89
|
return className(schema.base);
|
|
88
90
|
case 'union':
|
|
89
|
-
return phpUnionType(schema.members,
|
|
91
|
+
return phpUnionType(schema.members, (member) => decodedType(member, model));
|
|
90
92
|
case 'null':
|
|
91
93
|
case 'object':
|
|
92
94
|
case 'intersection':
|
|
@@ -111,26 +113,47 @@ export function phpNullable(type: string): string {
|
|
|
111
113
|
}
|
|
112
114
|
|
|
113
115
|
/**
|
|
114
|
-
*
|
|
116
|
+
* The PHP type of a schema's decoded JSON, before any hydration: a class is an `array`, an
|
|
117
|
+
* enum is its backing scalar, and a date is a `string`. Only a named discriminated union
|
|
118
|
+
* hydrates, so a value of any other union keeps this type.
|
|
119
|
+
*/
|
|
120
|
+
function decodedType(schema: SchemaModel, model: ApiModel): string {
|
|
121
|
+
if (isNullable(schema)) return phpNullable(decodedType(unwrapNullable(schema), model));
|
|
122
|
+
if (schema.kind === 'omit') return 'array';
|
|
123
|
+
if (schema.kind !== 'ref') return phpType(schema, model);
|
|
124
|
+
if (classify(schema.name, model) === 'class') return 'array';
|
|
125
|
+
const target = deref(schema, model);
|
|
126
|
+
return target === undefined ? 'mixed' : decodedType(target, model);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* A union as a native PHP 8.1 union type (`int|string`, `string|array`). Rich list
|
|
115
131
|
* filters are usually unions, and collapsing them to `mixed` throws away the typing that
|
|
116
132
|
* makes the SDK worth generating. `mixed` cannot be a union member, so a member without a
|
|
117
133
|
* PHP type of its own (inline object, intersection, unknown) forces the whole union to
|
|
118
134
|
* `mixed`. Members that map to the same PHP type collapse to one.
|
|
119
135
|
*/
|
|
120
|
-
export function phpUnionType(
|
|
136
|
+
export function phpUnionType(
|
|
137
|
+
members: SchemaModel[],
|
|
138
|
+
memberType: (member: SchemaModel) => string
|
|
139
|
+
): string {
|
|
121
140
|
const rendered: string[] = [];
|
|
122
141
|
for (const member of members) {
|
|
123
142
|
// `null` is handled by the caller's nullability check, never as a member here.
|
|
124
143
|
if (member.kind === 'null') continue;
|
|
125
|
-
const type =
|
|
144
|
+
const type = memberType(member);
|
|
126
145
|
if (type === 'mixed') return 'mixed';
|
|
127
|
-
// A nullable member
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
146
|
+
// A nullable member contributes its bare type plus null, and a union member each of its
|
|
147
|
+
// types, because PHP rejects a union that names a type twice.
|
|
148
|
+
const parts = type.startsWith('?') ? [type.slice(1), 'null'] : type.split('|');
|
|
149
|
+
for (const part of parts) {
|
|
150
|
+
if (!rendered.includes(part)) rendered.push(part);
|
|
151
|
+
}
|
|
131
152
|
}
|
|
132
|
-
|
|
133
|
-
return
|
|
153
|
+
const bare = rendered.filter((part) => part !== 'null');
|
|
154
|
+
if (bare.length === 0) return 'mixed';
|
|
155
|
+
// `null` goes last, so a caller's `phpNullable` sees it and does not add it twice.
|
|
156
|
+
return rendered.includes('null') ? phpNullable(bare.join('|')) : bare.join('|');
|
|
134
157
|
}
|
|
135
158
|
|
|
136
159
|
/**
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -266,5 +266,5 @@ export default {
|
|
|
266
266
|
"argsStyle": "inputs follow the target language's own idiom",
|
|
267
267
|
"importExt": "the generated file has no relative imports"
|
|
268
268
|
},
|
|
269
|
-
requiresGenerator: '^0.9.
|
|
269
|
+
requiresGenerator: '^0.9.2',
|
|
270
270
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "python" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator python --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "swr" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator swr --update`.
|
|
@@ -34,5 +34,5 @@ export default {
|
|
|
34
34
|
run: swrGenerator,
|
|
35
35
|
requires: ["typescript"],
|
|
36
36
|
errorModes: ["throw"],
|
|
37
|
-
requiresGenerator: '^0.9.
|
|
37
|
+
requiresGenerator: '^0.9.2',
|
|
38
38
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "swr" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator swr --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "tanstack-query" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator tanstack-query --update`.
|
|
@@ -45,5 +45,5 @@ export default {
|
|
|
45
45
|
run: tanstackQueryGenerator('react'),
|
|
46
46
|
requires: ["typescript"],
|
|
47
47
|
errorModes: ["throw"],
|
|
48
|
-
requiresGenerator: '^0.9.
|
|
48
|
+
requiresGenerator: '^0.9.2',
|
|
49
49
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "tanstack-query" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator tanstack-query --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "transformers" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator transformers --update`.
|
|
@@ -42,5 +42,5 @@ export default {
|
|
|
42
42
|
run: transformersGenerator,
|
|
43
43
|
requires: ["typescript"],
|
|
44
44
|
dateTypes: ["Date"],
|
|
45
|
-
requiresGenerator: '^0.9.
|
|
45
|
+
requiresGenerator: '^0.9.2',
|
|
46
46
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "transformers" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator transformers --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -123,5 +123,5 @@ export default {
|
|
|
123
123
|
run: typescriptGenerator,
|
|
124
124
|
sample: typescriptSample,
|
|
125
125
|
docs: typescriptDocs,
|
|
126
|
-
requiresGenerator: '^0.9.
|
|
126
|
+
requiresGenerator: '^0.9.2',
|
|
127
127
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "typescript" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator typescript --update`.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "zod" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator zod --update`.
|
|
@@ -28,5 +28,5 @@ export const zodGenerator: Generator = ({ model, output, banner }) => {
|
|
|
28
28
|
export default {
|
|
29
29
|
name: 'zod',
|
|
30
30
|
run: zodGenerator,
|
|
31
|
-
requiresGenerator: '^0.9.
|
|
31
|
+
requiresGenerator: '^0.9.2',
|
|
32
32
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
// Ejected from @redocly/client-generator@0.9.
|
|
1
|
+
// Ejected from @redocly/client-generator@0.9.2 — the built-in "zod" generator.
|
|
2
2
|
// This file is yours: edit freely; the generated client stays machine-owned and is
|
|
3
3
|
// rebuilt by `redocly generate-client`. Newer generator versions merge in with
|
|
4
4
|
// `redocly eject-generator zod --update`.
|
|
@@ -25,7 +25,8 @@ extension — zero Composer dependencies. The namespace derives from the API tit
|
|
|
25
25
|
base class. A property or response typed as a DISCRIMINATED union hydrates through the
|
|
26
26
|
union's `unmarshalX` dispatcher, so consumers can narrow with `instanceof`; its type
|
|
27
27
|
includes `array`, because a value with an unknown discriminator stays the raw array.
|
|
28
|
-
|
|
28
|
+
Any other union stays the decoded JSON, so its type is that of the JSON: a class member
|
|
29
|
+
is `array`, an enum member is its backing scalar, and a date member is `string`.
|
|
29
30
|
- **The file passes PHPStan level 5.** It lands in the user's own project, so their
|
|
30
31
|
analyser reads it. The operations table is a constant PHPStan knows exactly, so a method
|
|
31
32
|
reads `$op['security']` only when the table has that entry, and passes `[]` otherwise.
|
|
@@ -53,7 +54,7 @@ extension — zero Composer dependencies. The namespace derives from the API tit
|
|
|
53
54
|
target with no class of its own (a plain `oneOf`) stays a raw array;
|
|
54
55
|
**allOf** is flattened.
|
|
55
56
|
- **Unions keep their types where PHP 8.1 can express them.** A union of scalars, enums,
|
|
56
|
-
classes, or arrays becomes a native union type (`int|string`, `
|
|
57
|
+
classes, or arrays becomes a native union type (`int|string`, `string|array`)
|
|
57
58
|
rather than collapsing to `mixed` — rich list filters are the common case and losing
|
|
58
59
|
their types loses the point of a typed SDK. It falls back to `mixed` only when a member
|
|
59
60
|
has no PHP type of its own (an inline object, an intersection, `unknown`), because
|
|
@@ -11,13 +11,13 @@ export declare function isDateFormat(schema: SchemaModel): boolean;
|
|
|
11
11
|
*/
|
|
12
12
|
export declare function phpNullable(type: string): string;
|
|
13
13
|
/**
|
|
14
|
-
* A union as a native PHP 8.1 union type (`int|string`, `
|
|
14
|
+
* A union as a native PHP 8.1 union type (`int|string`, `string|array`). Rich list
|
|
15
15
|
* filters are usually unions, and collapsing them to `mixed` throws away the typing that
|
|
16
16
|
* makes the SDK worth generating. `mixed` cannot be a union member, so a member without a
|
|
17
17
|
* PHP type of its own (inline object, intersection, unknown) forces the whole union to
|
|
18
18
|
* `mixed`. Members that map to the same PHP type collapse to one.
|
|
19
19
|
*/
|
|
20
|
-
export declare function phpUnionType(members: SchemaModel[],
|
|
20
|
+
export declare function phpUnionType(members: SchemaModel[], memberType: (member: SchemaModel) => string): string;
|
|
21
21
|
/**
|
|
22
22
|
* The element type behind a PHP type that erases it. `array` and `\Generator` are as
|
|
23
23
|
* specific as PHP's syntax gets, so the docblock carries what they hold — that is what
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generators/php/types.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,QAAQ,EAMb,KAAK,WAAW,EAEjB,MAAM,2BAA2B,CAAC;AAInC,kFAAkF;AAClF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAelF;AAED,sFAAsF;AACtF,wBAAgB,OAAO,CACrB,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,QAAQ,EACf,QAAQ,GAAE,QAAmB,GAC5B,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generators/php/types.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,QAAQ,EAMb,KAAK,WAAW,EAEjB,MAAM,2BAA2B,CAAC;AAInC,kFAAkF;AAClF,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAelF;AAED,sFAAsF;AACtF,wBAAgB,OAAO,CACrB,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,QAAQ,EACf,QAAQ,GAAE,QAAmB,GAC5B,MAAM,CAqDR;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAGzD;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGhD;AAgBD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,WAAW,EAAE,EACtB,UAAU,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,MAAM,GAC1C,MAAM,CAkBR;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,SAAS,CAapB"}
|
|
@@ -42,16 +42,17 @@ export function phpType(schema, model, dateType = 'string') {
|
|
|
42
42
|
const target = deref(schema, model);
|
|
43
43
|
if (target === undefined)
|
|
44
44
|
return 'mixed';
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
// A
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
45
|
+
if (target.kind !== 'union' || discriminatorCases(target, model) === undefined) {
|
|
46
|
+
return phpType(target, model, dateType);
|
|
47
|
+
}
|
|
48
|
+
// A discriminated union hydrates through `unmarshalX`, so its members keep their own
|
|
49
|
+
// types, and a value with an unknown discriminator stays the raw array.
|
|
50
|
+
const members = [
|
|
51
|
+
...target.members,
|
|
52
|
+
{ kind: 'array', items: { kind: 'unknown' } },
|
|
53
|
+
];
|
|
54
|
+
const type = phpUnionType(members, (member) => phpType(member, model, dateType));
|
|
55
|
+
return isNullable(target) ? phpNullable(type) : type;
|
|
55
56
|
}
|
|
56
57
|
case 'enum':
|
|
57
58
|
// Anonymous (inline) enums keep the wire scalar; only NAMED enums get types.
|
|
@@ -66,7 +67,7 @@ export function phpType(schema, model, dateType = 'string') {
|
|
|
66
67
|
// PHP has no Omit; the base class is the honest annotation.
|
|
67
68
|
return className(schema.base);
|
|
68
69
|
case 'union':
|
|
69
|
-
return phpUnionType(schema.members,
|
|
70
|
+
return phpUnionType(schema.members, (member) => decodedType(member, model));
|
|
70
71
|
case 'null':
|
|
71
72
|
case 'object':
|
|
72
73
|
case 'intersection':
|
|
@@ -89,31 +90,51 @@ export function phpNullable(type) {
|
|
|
89
90
|
return type.includes('|') ? `${type}|null` : `?${type}`;
|
|
90
91
|
}
|
|
91
92
|
/**
|
|
92
|
-
*
|
|
93
|
+
* The PHP type of a schema's decoded JSON, before any hydration: a class is an `array`, an
|
|
94
|
+
* enum is its backing scalar, and a date is a `string`. Only a named discriminated union
|
|
95
|
+
* hydrates, so a value of any other union keeps this type.
|
|
96
|
+
*/
|
|
97
|
+
function decodedType(schema, model) {
|
|
98
|
+
if (isNullable(schema))
|
|
99
|
+
return phpNullable(decodedType(unwrapNullable(schema), model));
|
|
100
|
+
if (schema.kind === 'omit')
|
|
101
|
+
return 'array';
|
|
102
|
+
if (schema.kind !== 'ref')
|
|
103
|
+
return phpType(schema, model);
|
|
104
|
+
if (classify(schema.name, model) === 'class')
|
|
105
|
+
return 'array';
|
|
106
|
+
const target = deref(schema, model);
|
|
107
|
+
return target === undefined ? 'mixed' : decodedType(target, model);
|
|
108
|
+
}
|
|
109
|
+
/**
|
|
110
|
+
* A union as a native PHP 8.1 union type (`int|string`, `string|array`). Rich list
|
|
93
111
|
* filters are usually unions, and collapsing them to `mixed` throws away the typing that
|
|
94
112
|
* makes the SDK worth generating. `mixed` cannot be a union member, so a member without a
|
|
95
113
|
* PHP type of its own (inline object, intersection, unknown) forces the whole union to
|
|
96
114
|
* `mixed`. Members that map to the same PHP type collapse to one.
|
|
97
115
|
*/
|
|
98
|
-
export function phpUnionType(members,
|
|
116
|
+
export function phpUnionType(members, memberType) {
|
|
99
117
|
const rendered = [];
|
|
100
118
|
for (const member of members) {
|
|
101
119
|
// `null` is handled by the caller's nullability check, never as a member here.
|
|
102
120
|
if (member.kind === 'null')
|
|
103
121
|
continue;
|
|
104
|
-
const type =
|
|
122
|
+
const type = memberType(member);
|
|
105
123
|
if (type === 'mixed')
|
|
106
124
|
return 'mixed';
|
|
107
|
-
// A nullable member
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
125
|
+
// A nullable member contributes its bare type plus null, and a union member each of its
|
|
126
|
+
// types, because PHP rejects a union that names a type twice.
|
|
127
|
+
const parts = type.startsWith('?') ? [type.slice(1), 'null'] : type.split('|');
|
|
128
|
+
for (const part of parts) {
|
|
129
|
+
if (!rendered.includes(part))
|
|
130
|
+
rendered.push(part);
|
|
131
|
+
}
|
|
113
132
|
}
|
|
114
|
-
|
|
133
|
+
const bare = rendered.filter((part) => part !== 'null');
|
|
134
|
+
if (bare.length === 0)
|
|
115
135
|
return 'mixed';
|
|
116
|
-
|
|
136
|
+
// `null` goes last, so a caller's `phpNullable` sees it and does not add it twice.
|
|
137
|
+
return rendered.includes('null') ? phpNullable(bare.join('|')) : bare.join('|');
|
|
117
138
|
}
|
|
118
139
|
/**
|
|
119
140
|
* The element type behind a PHP type that erases it. `array` and `\Generator` are as
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generators/php/types.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,6DAA6D;AAE7D,OAAO,EAGL,KAAK,EACL,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,UAAU,EAEV,cAAc,GACf,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,kFAAkF;AAClF,MAAM,UAAU,QAAQ,CAAC,IAAY,EAAE,KAAe;IACpD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACzE,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,EAAE,CAAC;QACxF,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IACE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC;QAC5D,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,SAAS,EACzC,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,OAAO,CACrB,MAAmB,EACnB,KAAe,EACf,WAAqB,QAAQ;IAE7B,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC/D,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,QAAQ;YACX,8EAA8E;YAC9E,6DAA6D;YAC7D,IAAI,QAAQ,KAAK,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9E,OAAO,qBAAqB,CAAC;YAC/B,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/F,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC;QACjB,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1C,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM;gBAAE,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACpC,IAAI,MAAM,KAAK,SAAS;gBAAE,OAAO,OAAO,CAAC;YACzC,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generators/php/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/client-generator",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.2",
|
|
4
4
|
"description": "Generate typed, zero-dependency TypeScript clients (fetch, auth, retries, middleware, SSE) from OpenAPI descriptions.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"Roman Marshevskyi <roman.marshevskyy@redocly.com> (https://redocly.com/)"
|
|
88
88
|
],
|
|
89
89
|
"dependencies": {
|
|
90
|
-
"@redocly/openapi-core": "2.
|
|
90
|
+
"@redocly/openapi-core": "2.75.0"
|
|
91
91
|
},
|
|
92
92
|
"peerDependencies": {
|
|
93
93
|
"typescript": ">=5.5.0"
|