@rxap/workspace-open-api 19.1.0-dev.4 → 19.1.0-dev.6

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/CHANGELOG.md CHANGED
@@ -3,6 +3,16 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [19.1.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@19.1.0-dev.5...@rxap/workspace-open-api@19.1.0-dev.6) (2025-05-08)
7
+
8
+ ### Features
9
+
10
+ - **open-api:** add support for handling response additional properties ([6952b5f](https://gitlab.com/rxap/packages/commit/6952b5f9dceab7c071a4d113c1275b338f6a75b4))
11
+
12
+ # [19.1.0-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@19.1.0-dev.4...@rxap/workspace-open-api@19.1.0-dev.5) (2025-04-14)
13
+
14
+ **Note:** Version bump only for package @rxap/workspace-open-api
15
+
6
16
  # [19.1.0-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@19.1.0-dev.3...@rxap/workspace-open-api@19.1.0-dev.4) (2025-04-02)
7
17
 
8
18
  ### Features
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "19.1.0-dev.4",
2
+ "version": "19.1.0-dev.6",
3
3
  "name": "@rxap/workspace-open-api",
4
4
  "description": "This package provides utilities and generators for working with OpenAPI specifications in a workspace. It includes functionality for generating TypeScript interfaces, data sources, directives, remote methods, and operation commands based on an OpenAPI schema. The package also offers tools for loading OpenAPI configurations and resolving references within the schema.\n",
5
5
  "license": "GPL-3.0-or-later",
@@ -7,7 +7,7 @@
7
7
  "@nx/devkit": "20.5.0",
8
8
  "@rxap/json-schema-to-typescript": "^16.1.2-dev.0",
9
9
  "@rxap/utilities": "^16.4.4-dev.0",
10
- "@rxap/workspace-utilities": "^19.8.0-dev.3",
10
+ "@rxap/workspace-utilities": "^19.8.0-dev.4",
11
11
  "openapi-types": "^10.0.0",
12
12
  "ts-morph": "^18.0.0",
13
13
  "tslib": "2.6.2",
@@ -41,7 +41,7 @@
41
41
  },
42
42
  "schematics": "./generators.json",
43
43
  "type": "commonjs",
44
- "gitHead": "e056d48f758592c4129d2cdedf9fa885cd53d8b6",
44
+ "gitHead": "72e563ca048323619ae76af75e2c218fb4154cbb",
45
45
  "types": "./src/index.d.ts",
46
46
  "main": "./src/index.js"
47
47
  }
package/src/index.d.ts CHANGED
@@ -8,6 +8,7 @@ export * from './lib/utilities/get-response';
8
8
  export * from './lib/utilities/get-type-parameters';
9
9
  export * from './lib/utilities/has-operation-paramters';
10
10
  export * from './lib/utilities/has-operation-request-body';
11
+ export * from './lib/utilities/has-response-additional-properties';
11
12
  export * from './lib/utilities/http-request';
12
13
  export * from './lib/utilities/ignore-operation';
13
14
  export * from './lib/utilities/is-collection-response';
package/src/index.js CHANGED
@@ -12,6 +12,7 @@ tslib_1.__exportStar(require("./lib/utilities/get-response"), exports);
12
12
  tslib_1.__exportStar(require("./lib/utilities/get-type-parameters"), exports);
13
13
  tslib_1.__exportStar(require("./lib/utilities/has-operation-paramters"), exports);
14
14
  tslib_1.__exportStar(require("./lib/utilities/has-operation-request-body"), exports);
15
+ tslib_1.__exportStar(require("./lib/utilities/has-response-additional-properties"), exports);
15
16
  tslib_1.__exportStar(require("./lib/utilities/http-request"), exports);
16
17
  tslib_1.__exportStar(require("./lib/utilities/ignore-operation"), exports);
17
18
  tslib_1.__exportStar(require("./lib/utilities/is-collection-response"), exports);
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/workspace/open-api/src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,4EAAkD;AAClD,kGAAwE;AACxE,6EAAmD;AACnD,2EAAiD;AACjD,gFAAsD;AACtD,4EAAkD;AAClD,uEAA6C;AAC7C,8EAAoD;AACpD,kFAAwD;AACxD,qFAA2D;AAC3D,uEAA6C;AAC7C,2EAAiD;AACjD,iFAAuD;AACvD,yEAA+C;AAC/C,uFAA6D;AAC7D,8EAAoD;AACpD,8EAAoD;AACpD,gFAAsD;AACtD,4EAAkD;AAClD,YAAY;AAEZ,UAAU;AACV,uDAA6B;AAC7B,sDAA4B;AAC5B,iEAAuC;AACvC,oEAA0C;AAC1C,qEAA2C;AAC3C,oEAA0C;AAC1C,uEAA6C;AAC7C,uEAA6C;AAC7C,oEAA0C;AAC1C,2EAAiD;AACjD,mEAAyC;AACzC,oEAA0C;AAC1C,uEAA6C;AAC7C,sEAA4C;AAC5C,kEAAwC;AACxC,qEAA2C;AAC3C,wDAA8B;AAC9B,4DAAkC;AAClC,sDAA4B;AAC5B,YAAY"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/workspace/open-api/src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,4EAAkD;AAClD,kGAAwE;AACxE,6EAAmD;AACnD,2EAAiD;AACjD,gFAAsD;AACtD,4EAAkD;AAClD,uEAA6C;AAC7C,8EAAoD;AACpD,kFAAwD;AACxD,qFAA2D;AAC3D,6FAAmE;AACnE,uEAA6C;AAC7C,2EAAiD;AACjD,iFAAuD;AACvD,yEAA+C;AAC/C,uFAA6D;AAC7D,8EAAoD;AACpD,8EAAoD;AACpD,gFAAsD;AACtD,4EAAkD;AAClD,YAAY;AAEZ,UAAU;AACV,uDAA6B;AAC7B,sDAA4B;AAC5B,iEAAuC;AACvC,oEAA0C;AAC1C,qEAA2C;AAC3C,oEAA0C;AAC1C,uEAA6C;AAC7C,uEAA6C;AAC7C,oEAA0C;AAC1C,2EAAiD;AACjD,mEAAyC;AACzC,oEAA0C;AAC1C,uEAA6C;AAC7C,sEAA4C;AAC5C,kEAAwC;AACxC,qEAA2C;AAC3C,wDAA8B;AAC9B,4DAAkC;AAClC,sDAA4B;AAC5B,YAAY"}
@@ -6,6 +6,7 @@ const workspace_open_api_1 = require("@rxap/workspace-open-api");
6
6
  const path_1 = require("path");
7
7
  const ts_morph_1 = require("ts-morph");
8
8
  const const_1 = require("./const");
9
+ const has_response_additional_properties_1 = require("./utilities/has-response-additional-properties");
9
10
  function GenerateHttpResource(parameter) {
10
11
  var _a, _b, _c, _d, _e;
11
12
  if (parameter.method.toUpperCase() !== 'GET') {
@@ -104,7 +105,7 @@ function GenerateHttpResource(parameter) {
104
105
  name: 'options',
105
106
  type: `HttpResourceOptions<${responseType}, unknown> & { defaultValue: NoInfer<${responseType}> }`,
106
107
  };
107
- sourceFile.addFunction({
108
+ const structure = {
108
109
  isExported: true,
109
110
  name: (0, utilities_1.camelize)([parameter.operationId, 'http-resource'].join('_')),
110
111
  parameters: [...parameters, optionsParameter],
@@ -129,7 +130,11 @@ function GenerateHttpResource(parameter) {
129
130
  returnType: `HttpResourceRef<${responseType} | undefined>`,
130
131
  }
131
132
  ]
132
- });
133
+ };
134
+ if ((0, has_response_additional_properties_1.hasResponseAdditionalProperties)(parameter)) {
135
+ structure.typeParameters = [{ name: 'TResponse' }];
136
+ }
137
+ sourceFile.addFunction(structure);
133
138
  sourceFile.addImportDeclarations(importStructures);
134
139
  sourceFile.organizeImports({
135
140
  ensureNewLineAtEndOfFile: true,
@@ -1 +1 @@
1
- {"version":3,"file":"generate-http-resource.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-http-resource.ts"],"names":[],"mappings":";;AAmBA,oDA4KC;AA/LD,+CAAsD;AACtD,iEAOkC;AAClC,+BAA4B;AAC5B,uCAMkB;AAClB,mCAA6E;AAE7E,SAAgB,oBAAoB,CAClC,SAA+C;;IAE/C,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;IAE1C,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,iCAAyB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,+BAAuB,EAAE,IAAA,qBAAS,EAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;IAExE,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAEhE,MAAM,gBAAgB,GAAoD;QACxE;YACE,eAAe,EAAE,8BAA8B;YAC/C,YAAY,EAAE;gBACZ,EAAE,IAAI,EAAE,uBAAuB,EAAE;gBACjC,EAAE,IAAI,EAAE,oBAAoB,EAAE;gBAC9B,EAAE,IAAI,EAAE,kBAAkB,EAAE;gBAC5B,EAAE,IAAI,EAAE,cAAc,EAAE;aACzB;SACF;QACD;YACE,eAAe,EAAE,sBAAsB;YACvC,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;SAChI;KACF,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,IAAA,oCAAe,EAAC,SAAS,CAAC,CAAC;IAC9E,MAAM,aAAa,GAAW,IAAA,qCAAgB,EAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,GACpD,IAAA,uCAAkB,EAAC,SAAS,CAAC,CAAC;IAEhC,IAAI,YAAY,EAAE,CAAC;QACjB,gBAAgB,CAAC,IAAI,CAAC;YACpB,eAAe,EACb,MAAA,SAAS,CAAC,OAAO,CAAC,WAAW,mCAC7B,gBAAgB,IAAA,qBAAS,EACvB,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CACtC,WAAW;YACd,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;SACvC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC7C,gBAAgB,CAAC,IAAI,CAAC;YACpB,eAAe,EACb,MAAA,SAAS,CAAC,OAAO,CAAC,WAAW,mCAC7B,iBAAiB,IAAA,qBAAS,EACxB,aAAa,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CACxC,YAAY;YACf,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,gBAAgB,CAAC,IAAI,CAAC;YACpB,eAAe,EACb,MAAA,SAAS,CAAC,OAAO,CAAC,WAAW,mCAC7B,qBAAqB,IAAA,qBAAS,EAC5B,eAAe,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAC5C,eAAe;YAClB,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,iBAAiB,GAAG,aAAa,KAAK,MAAM,CAAC;IACnD,MAAM,kBAAkB,GAAG,eAAe,KAAK,MAAM,CAAC;IACtD,MAAM,+BAA+B,GACnC,iBAAiB,IAAI,kBAAkB,CAAC;IAE1C,MAAM,WAAW,GAA4C,EAAE,CAAC;IAEhE,IACE,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,sCAAiB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAC3E,CAAC;QACD,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE;YACzB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACb,CAAC,CAAC,KAAK,CACL,SAAS,CAAC,IAAI,CAAC,OAAO,CACpB,cAAc,EACd,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,IAAI,KAAK,CACxC,CACF,CAAC;YACF,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IACvE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,WAAW,CAAC,QAAQ,CAAC,GAAG,6BAA6B,SAAS,CAAC,UAAW;aACvE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,sCAAiB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC;aACxD,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC;aAC9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,WAAW,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC;IACxC,CAAC;IAED,WAAW,CACT,SAAS,CACR,GAAG,iDAAiD,SAAS,CAAC,WAAW,+BAA+B,SAAS,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC;IAC1I,WAAW,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;IAExC,MAAM,UAAU,GAAkD,EAAE,CAAC;IAErE,IAAI,CAAC,+BAA+B,EAAE,CAAC;QACrC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,UAAU,eAAe,GAAG;aACnC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,oBAAoB,aAAa,GAAG;gBAC1C,WAAW,EAAE,CAAA,MAAA,SAAS,CAAC,UAAU,0CAAE,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,sCAAiB,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAC3C;oBACY,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,IAAI;aACpB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,uBAAuB,YAAY,YAAY;QACrD,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,MAAM,uBAAuB,GAAG;QAC9B,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,uBAAuB,YAAY,wCAAwC,YAAY,KAAK;KACnG,CAAC;IAEF,UAAU,CAAC,WAAW,CAAC;QACrB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,IAAA,oBAAQ,EAAC,CAAC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClE,UAAU,EAAE,CAAE,GAAG,UAAU,EAAE,gBAAgB,CAAE;QAC/C,UAAU,EAAE;YACV,uBAAuB,YAAY,IAAI;YACvC,CAAC,CAAC,EAAE,EAAE;gBACJ,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACnB,kBAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACd,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACzB,CAAC;YACD,IAAI;SACL;QACD,UAAU,EAAE,mBAAmB,YAAY,eAAe;QAC1D,SAAS,EAAE;YACT;gBACE,UAAU,EAAE,CAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iCAAM,CAAC,KAAE,WAAW,EAAE,SAAS,IAAG,CAAC,EAAE,uBAAuB,CAAE;gBACnG,UAAU,EAAE,mBAAmB,YAAY,GAAG;aAC/C;YACD;gBACE,UAAU,EAAE,CAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iCAAM,CAAC,KAAE,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,IAAG,CAAC,EAAE,gBAAgB,CAAE;gBAC/H,UAAU,EAAE,mBAAmB,YAAY,eAAe;aAC3D;SACF;KACF,CAAC,CAAC;IAEH,UAAU,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IAEnD,UAAU,CAAC,eAAe,CAAC;QACzB,wBAAwB,EAAE,IAAI;KAC/B,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"generate-http-resource.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-http-resource.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ const utilities_1 = require("@rxap/utilities");
5
5
  const config_1 = require("../config");
6
6
  const any_schema_object_1 = require("./any-schema-object");
7
7
  const get_response_1 = require("./get-response");
8
- const is_reference_object_1 = require("./is-reference-object");
8
+ const has_response_additional_properties_1 = require("./has-response-additional-properties");
9
9
  /**
10
10
  * Determines the response type and name for a given OpenAPI operation.
11
11
  *
@@ -29,10 +29,8 @@ function GetResponseType(operation) {
29
29
  // only generate the response interface if the type is not any
30
30
  if (response && !(0, any_schema_object_1.IsAnySchemaObject)(response)) {
31
31
  name = responseType = (0, utilities_1.classify)([operation.operationId, config_1.RESPONSE_FILE_SUFFIX].join('-'));
32
- if (!(0, is_reference_object_1.IsReferenceObject)(response)) {
33
- if (response.additionalProperties === true || response.type === undefined) {
34
- responseType += `<TResponse>`;
35
- }
32
+ if ((0, has_response_additional_properties_1.hasResponseAdditionalProperties)(operation)) {
33
+ responseType += `<TResponse>`;
36
34
  }
37
35
  }
38
36
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"get-response-type.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-response-type.ts"],"names":[],"mappings":";;AAsBA,0CA4BC;AAlDD,+CAA2C;AAE3C,sCAAiD;AACjD,2DAAwD;AACxD,iDAA6C;AAC7C,+DAA0D;AAE1D;;;;;;;;;;;;;;GAcG;AACH,SAAgB,eAAe,CAAC,SAAoC;IAElE,IAAI,YAAY,GAAG,MAAM,CAAC;IAC1B,IAAI,IAAI,GAAkB,IAAI,CAAC;IAE/B,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,SAAS,CAAC,CAAC;QAExC,8DAA8D;QAC9D,IAAI,QAAQ,IAAI,CAAC,IAAA,qCAAiB,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,IAAI,GAAG,YAAY,GAAG,IAAA,oBAAQ,EAAC,CAAE,SAAS,CAAC,WAAW,EAAE,6BAAoB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1F,IAAI,CAAC,IAAA,uCAAiB,EAAC,QAAQ,CAAC,EAAE,CAAC;gBACjC,IAAI,QAAQ,CAAC,oBAAoB,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC1E,YAAY,IAAI,aAAa,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,MAAM,CAAC;QACxB,CAAC;IAEH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,IAAI;KACL,CAAC;AAEJ,CAAC"}
1
+ {"version":3,"file":"get-response-type.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-response-type.ts"],"names":[],"mappings":";;AAuBA,0CA0BC;AAjDD,+CAA2C;AAE3C,sCAAiD;AACjD,2DAAwD;AACxD,iDAA6C;AAC7C,6FAAuF;AAGvF;;;;;;;;;;;;;;GAcG;AACH,SAAgB,eAAe,CAAC,SAAoC;IAElE,IAAI,YAAY,GAAG,MAAM,CAAC;IAC1B,IAAI,IAAI,GAAkB,IAAI,CAAC;IAE/B,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,SAAS,CAAC,CAAC;QAExC,8DAA8D;QAC9D,IAAI,QAAQ,IAAI,CAAC,IAAA,qCAAiB,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,IAAI,GAAG,YAAY,GAAG,IAAA,oBAAQ,EAAC,CAAE,SAAS,CAAC,WAAW,EAAE,6BAAoB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1F,IAAI,IAAA,oEAA+B,EAAC,SAAS,CAAC,EAAE,CAAC;gBAC/C,YAAY,IAAI,aAAa,CAAC;YAChC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAY,GAAG,MAAM,CAAC;QACxB,CAAC;IAEH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,IAAI;KACL,CAAC;AAEJ,CAAC"}
@@ -0,0 +1,2 @@
1
+ import { OpenAPIV3 } from 'openapi-types';
2
+ export declare function hasResponseAdditionalProperties(operation: OpenAPIV3.OperationObject): boolean;
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.hasResponseAdditionalProperties = hasResponseAdditionalProperties;
4
+ const workspace_open_api_1 = require("@rxap/workspace-open-api");
5
+ function hasResponseAdditionalProperties(operation) {
6
+ if (operation.operationId) {
7
+ const response = (0, workspace_open_api_1.GetResponse)(operation);
8
+ if (response && !(0, workspace_open_api_1.IsAnySchemaObject)(response)) {
9
+ if (!(0, workspace_open_api_1.IsReferenceObject)(response)) {
10
+ return response.additionalProperties === true || response.type === undefined;
11
+ }
12
+ }
13
+ }
14
+ return false;
15
+ }
16
+ //# sourceMappingURL=has-response-additional-properties.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"has-response-additional-properties.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/has-response-additional-properties.ts"],"names":[],"mappings":";;AAOA,0EAWC;AAlBD,iEAIkC;AAGlC,SAAgB,+BAA+B,CAAC,SAAoC;IAClF,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAA,gCAAW,EAAC,SAAS,CAAC,CAAC;QACxC,IAAI,QAAQ,IAAI,CAAC,IAAA,sCAAiB,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,IAAI,CAAC,IAAA,sCAAiB,EAAC,QAAQ,CAAC,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC,oBAAoB,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC;YAC/E,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}