@seamapi/nextlove-sdk-generator 1.15.3 → 1.15.5
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/lib/generate-php-sdk/generate-php-sdk.js +2 -1
- package/lib/generate-php-sdk/generate-php-sdk.js.map +1 -1
- package/lib/generate-php-sdk/utils/php-client.js +1 -1
- package/lib/generate-php-sdk/utils/php-client.js.map +1 -1
- package/lib/generate-php-sdk/utils/schema-modifications.d.ts +2 -0
- package/lib/generate-php-sdk/utils/schema-modifications.js +28 -0
- package/lib/generate-php-sdk/utils/schema-modifications.js.map +1 -0
- package/lib/openapi/deep-flatten-one-of-and-all-of-schema.d.ts +1 -1
- package/lib/types.d.ts +1 -11
- package/package.json +1 -1
- package/src/lib/generate-php-sdk/generate-php-sdk.ts +2 -1
- package/src/lib/generate-php-sdk/utils/php-client.ts +1 -1
- package/src/lib/generate-php-sdk/utils/schema-modifications.ts +38 -0
- package/src/lib/types.ts +1 -17
|
@@ -16,6 +16,7 @@ import PackageVersionTemplate from "./templates/PackageVersion.php.template.js";
|
|
|
16
16
|
import mapParentToChildResources from "../../lib/openapi/map-parent-to-children-resource.js";
|
|
17
17
|
import resolveOpenapiSpec from "../../lib/openapi/resolve-openapi-spec.js";
|
|
18
18
|
import { loadExceptionTemplates } from "./utils/load-exception-templates.js";
|
|
19
|
+
import { modifySchemaForSpecialCases } from "./utils/schema-modifications.js";
|
|
19
20
|
export const generatePhpSDK = async (options = {}) => {
|
|
20
21
|
const openapi = await resolveOpenapiSpec(options);
|
|
21
22
|
const routes = Object.entries(openapi.paths).map(([path, v]) => ({
|
|
@@ -40,7 +41,7 @@ export const generatePhpSDK = async (options = {}) => {
|
|
|
40
41
|
base_resource_object_names.push(pascalCase(schema_name));
|
|
41
42
|
const base_resource_schema_with_sub_schemas = deepExtractResourceObjectSchemas({
|
|
42
43
|
schema_name,
|
|
43
|
-
schema_body: schema,
|
|
44
|
+
schema_body: modifySchemaForSpecialCases(schema_name, schema),
|
|
44
45
|
});
|
|
45
46
|
for (const { name, properties, required_property_names } of Object.values(base_resource_schema_with_sub_schemas)) {
|
|
46
47
|
fs[`src/Objects/${name}.php`] = generateResourceObjectClass({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-php-sdk.js","sourceRoot":"","sources":["../../src/lib/generate-php-sdk/generate-php-sdk.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAA;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,SAAS,EAA4B,MAAM,uBAAuB,CAAA;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAA;AACpE,OAAO,EAAE,gCAAgC,EAAE,MAAM,iDAAiD,CAAA;AAClG,OAAO,gBAAgB,MAAM,mCAAmC,CAAA;AAChE,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,oBAAoB,MAAM,uCAAuC,CAAA;AACxE,OAAO,iBAAiB,MAAM,mCAAmC,CAAA;AACjE,OAAO,kBAAkB,MAAM,qCAAqC,CAAA;AACpE,OAAO,mBAAmB,MAAM,sCAAsC,CAAA;AACtE,OAAO,iBAAiB,MAAM,oCAAoC,CAAA;AAClE,OAAO,sBAAsB,MAAM,4CAA4C,CAAA;AAC/E,OAAO,yBAAyB,MAAM,gDAAgD,CAAA;AACtF,OAAO,kBAAkB,MAAM,qCAAqC,CAAA;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAA;
|
|
1
|
+
{"version":3,"file":"generate-php-sdk.js","sourceRoot":"","sources":["../../src/lib/generate-php-sdk/generate-php-sdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ export class PhpClient {
|
|
|
64
64
|
` ${return_resource ? "$res = " : ""}$this->seam->request(`,
|
|
65
65
|
` "POST",`,
|
|
66
66
|
` "${path}",`,
|
|
67
|
-
` json: $request_payload,`,
|
|
67
|
+
` json: (object)$request_payload,`,
|
|
68
68
|
` ${return_path ? `inner_object: "${return_path}",` : ""}`,
|
|
69
69
|
` );`,
|
|
70
70
|
``,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"php-client.js","sourceRoot":"","sources":["../../../src/lib/generate-php-sdk/utils/php-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"php-client.js","sourceRoot":"","sources":["../../../src/lib/generate-php-sdk/utils/php-client.ts"],"names":[],"mappings":"AAuBA,MAAM,OAAO,SAAS;IAGpB,YACS,WAAuB,EACvB,SAAoB,EACpB,gBAAyB,EACzB,wBAA+C;QAH/C,gBAAW,GAAX,WAAW,CAAY;QACvB,cAAS,GAAT,SAAS,CAAW;QACpB,qBAAgB,GAAhB,gBAAgB,CAAS;QACzB,6BAAwB,GAAxB,wBAAwB,CAAuB;QANxD,YAAO,GAAsB,EAAE,CAAA;QAQ7B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAA;IACnB,CAAC;IAED,SAAS,CAAC,MAAuB;QAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3B,CAAC;IAED,SAAS;QACP,MAAM,iBAAiB,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,GAAG,CAAC,CAAA;QAElE,OAAO;YACL,SAAS,IAAI,CAAC,WAAW,QAAQ;YACjC,GAAG;YACH,6BAA6B;YAC7B,KACE,iBAAiB;gBACf,CAAC,CAAC,IAAI,CAAC,wBAAwB;qBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,WAAW,WAAW,CAAC,CAAC,SAAS,GAAG,CAAC;qBAC9D,IAAI,CAAC,IAAI,CAAC;gBACf,CAAC,CAAC,EACN,EAAE;YACF,iDAAiD;YACjD,KAAK;YACL,0BAA0B;YAC1B,OACE,iBAAiB;gBACf,CAAC,CAAC,IAAI,CAAC,wBAAwB;qBAC1B,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,UAAU,CAAC,CAAC,SAAS,UAAU,CAAC,CAAC,WAAW,gBAAgB,CAC/D;qBACA,IAAI,CAAC,IAAI,CAAC;gBACf,CAAC,CAAC,EACN,EAAE;YACF,KAAK;YACL,EAAE;YACF,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CACjB,CAAC,EACC,WAAW,EACX,IAAI,EACJ,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,GAClB,EAAE,EAAE;gBACH,MAAM,8BAA8B,GAClC,eAAe,KAAK,eAAe;oBACnC,IAAI,CAAC,WAAW,KAAK,gBAAgB,CAAA;gBACvC,MAAM,kBAAkB,GAAG,iBAAiB;oBAC1C,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,eAAe;wBACjB,CAAC,CAAC,eAAe;wBACjB,CAAC,CAAC,MAAM,CAAA;gBAEV,OAAO;oBACL,EAAE;oBACF,qBAAqB,WAAW,GAAG;oBACnC,OAAO,UAAU;yBACd,IAAI,CACH,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACP,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;wBACxC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAC3C;yBACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;yBAChE,MAAM,CACL,8BAA8B;wBAC5B,CAAC,CAAC,CAAC,sCAAsC,CAAC;wBAC1C,CAAC,CAAC,EAAE,CACP;yBACA,IAAI,CAAC,SAAS,CAAC,EAAE;oBACpB,QAAQ,kBAAkB,IAAI;oBAE9B,4BAA4B;oBAC5B,EAAE;oBAEF,GAAG,UAAU;yBACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT;wBACE,YAAY,CAAC,CAAC,IAAI,cAAc;wBAChC,2BAA2B,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,IAAI,GAAG;wBACnD,OAAO;qBACR,CAAC,IAAI,CAAC,IAAI,CAAC,CACb;yBACA,IAAI,CAAC,IAAI,CAAC,EAAE;oBACf,EAAE;oBAEF,OAAO,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,uBAAuB;oBAC9D,eAAe;oBACf,UAAU,IAAI,IAAI;oBAClB,uCAAuC;oBACvC,SAAS,WAAW,CAAC,CAAC,CAAC,kBAAkB,WAAW,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC/D,QAAQ;oBACR,EAAE;oBAEF,8BAA8B;wBAC5B,CAAC,CAAC;4BACE,sCAAsC;4BACtC,gBAAgB,eAAe,oBAAoB;4BACnD,OAAO;yBACR,CAAC,IAAI,CAAC,IAAI,CAAC;wBACd,CAAC,CAAC,EAAE;oBACN,EAAE;oBACF,8BAA8B;wBAC5B,CAAC,CAAC;4BACE,uEAAuE;4BACvE,+BAA+B;4BAC/B,QAAQ;4BACR,EAAE;4BACF,6BAA6B;yBAC9B,CAAC,IAAI,CAAC,IAAI,CAAC;wBACd,CAAC,CAAC,EAAE;oBACN,EAAE;oBAEF,eAAe,IAAI,CAAC,8BAA8B;wBAChD,CAAC,CAAC,cACE,iBAAiB;4BACf,CAAC,CAAC,wBAAwB,eAAe,yBAAyB;4BAClE,CAAC,CAAC,GAAG,eAAe,oBACxB,EAAE;wBACJ,CAAC,CAAC,EAAE;oBACN,KAAK;iBACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACd,CAAC,CACF;YACD,IAAI,CAAC,WAAW,KAAK,gBAAgB;gBACnC,CAAC,CAAC;oBACE,qGAAqG;oBACrG,KAAK;oBACL,0BAA0B;oBAC1B,0BAA0B;oBAC1B,8BAA8B;oBAC9B,wEAAwE;oBACxE,EAAE;oBACF,oDAAoD;oBACpD,sDAAsD;oBACtD,4CAA4C;oBAC5C,UAAU;oBACV,uCAAuC;oBACvC,yEAAyE;oBACzE,SAAS;oBACT,2CAA2C;oBAC3C,4CAA4C;oBAC5C,OAAO;oBACP,EAAE;oBACF,+CAA+C;oBAC/C,4DAA4D;oBAC5D,OAAO;oBACP,EAAE;oBACF,6BAA6B;oBAC7B,KAAK;iBACN,CAAC,IAAI,CAAC,IAAI,CAAC;gBACd,CAAC,CAAC,EAAE;YACN,GAAG;SACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACd,CAAC;CACF"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import type { OpenAPISchema } from "../../../lib/types.js";
|
|
2
|
+
export declare const modifySchemaForSpecialCases: (schemaName: string, schema: OpenAPISchema["components"]["schemas"][string]) => import("../../../lib/types.js").ObjSchema | import("../../../lib/types.js").OneOfSchema | import("../../../lib/types.js").AllOfSchema;
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export const modifySchemaForSpecialCases = (schemaName, schema) => {
|
|
2
|
+
if (schemaName === "acs_user" &&
|
|
3
|
+
"properties" in schema &&
|
|
4
|
+
"warnings" in schema.properties &&
|
|
5
|
+
"items" in schema.properties["warnings"] &&
|
|
6
|
+
"oneOf" in schema.properties["warnings"].items) {
|
|
7
|
+
return {
|
|
8
|
+
...schema,
|
|
9
|
+
properties: {
|
|
10
|
+
...schema.properties,
|
|
11
|
+
warnings: {
|
|
12
|
+
...schema.properties["warnings"],
|
|
13
|
+
items: {
|
|
14
|
+
...schema.properties["warnings"].items,
|
|
15
|
+
oneOf: schema.properties["warnings"].items.oneOf.map((oneOfSchema) => ({
|
|
16
|
+
...oneOfSchema,
|
|
17
|
+
required: "required" in oneOfSchema
|
|
18
|
+
? oneOfSchema.required.filter((prop) => prop !== "message")
|
|
19
|
+
: [],
|
|
20
|
+
})),
|
|
21
|
+
},
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
return schema;
|
|
27
|
+
};
|
|
28
|
+
//# sourceMappingURL=schema-modifications.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema-modifications.js","sourceRoot":"","sources":["../../../src/lib/generate-php-sdk/utils/schema-modifications.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,UAAkB,EAClB,MAAsD,EACtD,EAAE;IACF,IACE,UAAU,KAAK,UAAU;QACzB,YAAY,IAAI,MAAM;QACtB,UAAU,IAAI,MAAM,CAAC,UAAU;QAC/B,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;QACxC,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,EAC9C;QACA,OAAO;YACL,GAAG,MAAM;YACT,UAAU,EAAE;gBACV,GAAG,MAAM,CAAC,UAAU;gBACpB,QAAQ,EAAE;oBACR,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;oBAChC,KAAK,EAAE;wBACL,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK;wBACtC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAClD,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;4BAChB,GAAG,WAAW;4BACd,QAAQ,EACN,UAAU,IAAI,WAAW;gCACvB,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC;gCAC3D,CAAC,CAAC,EAAE;yBACT,CAAC,CACH;qBACF;iBACF;aACF;SACF,CAAA;KACF;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { ArraySchema, ObjSchema, PrimitiveSchema, PropertySchema } from "../../lib/types.js";
|
|
2
|
-
export declare function deepFlattenOneOfAndAllOfSchema(schema: PropertySchema): PrimitiveSchema | import("../../lib/types.js").RefSchema |
|
|
2
|
+
export declare function deepFlattenOneOfAndAllOfSchema(schema: PropertySchema): ObjSchema | PrimitiveSchema | import("../../lib/types.js").RefSchema | ArraySchema;
|
package/lib/types.d.ts
CHANGED
|
@@ -17,17 +17,7 @@ export type OpenAPISchema = {
|
|
|
17
17
|
scheme: "bearer";
|
|
18
18
|
bearerFormat: "API Token";
|
|
19
19
|
}>;
|
|
20
|
-
schemas: Record<string,
|
|
21
|
-
type: "object";
|
|
22
|
-
properties: Record<string, {
|
|
23
|
-
type: "string" | "integer" | "boolean" | "array" | "number";
|
|
24
|
-
items?: {
|
|
25
|
-
$ref: string;
|
|
26
|
-
};
|
|
27
|
-
$ref?: string;
|
|
28
|
-
}>;
|
|
29
|
-
required?: string[];
|
|
30
|
-
} | OneOfSchema | AllOfSchema>;
|
|
20
|
+
schemas: Record<string, ObjSchema | OneOfSchema | AllOfSchema>;
|
|
31
21
|
};
|
|
32
22
|
};
|
|
33
23
|
export type PropertySchema = PrimitiveSchema | AllOfSchema | OneOfSchema | RefSchema | ObjSchema | ArraySchema;
|
package/package.json
CHANGED
|
@@ -17,6 +17,7 @@ import PackageVersionTemplate from "./templates/PackageVersion.php.template.js"
|
|
|
17
17
|
import mapParentToChildResources from "lib/openapi/map-parent-to-children-resource.js"
|
|
18
18
|
import resolveOpenapiSpec from "lib/openapi/resolve-openapi-spec.js"
|
|
19
19
|
import { loadExceptionTemplates } from "./utils/load-exception-templates.js"
|
|
20
|
+
import { modifySchemaForSpecialCases } from "./utils/schema-modifications.js"
|
|
20
21
|
|
|
21
22
|
export const generatePhpSDK = async (options: SdkGeneratorOptions = {}) => {
|
|
22
23
|
const openapi = await resolveOpenapiSpec(options)
|
|
@@ -50,7 +51,7 @@ export const generatePhpSDK = async (options: SdkGeneratorOptions = {}) => {
|
|
|
50
51
|
const base_resource_schema_with_sub_schemas =
|
|
51
52
|
deepExtractResourceObjectSchemas({
|
|
52
53
|
schema_name,
|
|
53
|
-
schema_body: schema,
|
|
54
|
+
schema_body: modifySchemaForSpecialCases(schema_name, schema),
|
|
54
55
|
})
|
|
55
56
|
|
|
56
57
|
for (const { name, properties, required_property_names } of Object.values(
|
|
@@ -119,7 +119,7 @@ export class PhpClient {
|
|
|
119
119
|
` ${return_resource ? "$res = " : ""}$this->seam->request(`,
|
|
120
120
|
` "POST",`,
|
|
121
121
|
` "${path}",`,
|
|
122
|
-
` json: $request_payload,`,
|
|
122
|
+
` json: (object)$request_payload,`,
|
|
123
123
|
` ${return_path ? `inner_object: "${return_path}",` : ""}`,
|
|
124
124
|
` );`,
|
|
125
125
|
``,
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { OpenAPISchema } from "lib/types.js"
|
|
2
|
+
|
|
3
|
+
export const modifySchemaForSpecialCases = (
|
|
4
|
+
schemaName: string,
|
|
5
|
+
schema: OpenAPISchema["components"]["schemas"][string]
|
|
6
|
+
) => {
|
|
7
|
+
if (
|
|
8
|
+
schemaName === "acs_user" &&
|
|
9
|
+
"properties" in schema &&
|
|
10
|
+
"warnings" in schema.properties &&
|
|
11
|
+
"items" in schema.properties["warnings"] &&
|
|
12
|
+
"oneOf" in schema.properties["warnings"].items
|
|
13
|
+
) {
|
|
14
|
+
return {
|
|
15
|
+
...schema,
|
|
16
|
+
properties: {
|
|
17
|
+
...schema.properties,
|
|
18
|
+
warnings: {
|
|
19
|
+
...schema.properties["warnings"],
|
|
20
|
+
items: {
|
|
21
|
+
...schema.properties["warnings"].items,
|
|
22
|
+
oneOf: schema.properties["warnings"].items.oneOf.map(
|
|
23
|
+
(oneOfSchema) => ({
|
|
24
|
+
...oneOfSchema,
|
|
25
|
+
required:
|
|
26
|
+
"required" in oneOfSchema
|
|
27
|
+
? oneOfSchema.required.filter((prop) => prop !== "message")
|
|
28
|
+
: [],
|
|
29
|
+
})
|
|
30
|
+
),
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
return schema
|
|
38
|
+
}
|
package/src/lib/types.ts
CHANGED
|
@@ -8,23 +8,7 @@ export type OpenAPISchema = {
|
|
|
8
8
|
| { type: "apiKey"; in: "header"; name: string }
|
|
9
9
|
| { type: "http"; scheme: "bearer"; bearerFormat: "API Token" }
|
|
10
10
|
>
|
|
11
|
-
schemas: Record<
|
|
12
|
-
string,
|
|
13
|
-
| {
|
|
14
|
-
type: "object"
|
|
15
|
-
properties: Record<
|
|
16
|
-
string,
|
|
17
|
-
{
|
|
18
|
-
type: "string" | "integer" | "boolean" | "array" | "number"
|
|
19
|
-
items?: { $ref: string }
|
|
20
|
-
$ref?: string
|
|
21
|
-
}
|
|
22
|
-
>
|
|
23
|
-
required?: string[]
|
|
24
|
-
}
|
|
25
|
-
| OneOfSchema
|
|
26
|
-
| AllOfSchema
|
|
27
|
-
>
|
|
11
|
+
schemas: Record<string, ObjSchema | OneOfSchema | AllOfSchema>
|
|
28
12
|
}
|
|
29
13
|
}
|
|
30
14
|
|