@abp/ng.schematics 5.2.1 → 5.2.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.
@@ -39,6 +39,15 @@
39
39
  "index": 3
40
40
  },
41
41
  "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
42
+ },
43
+ "url": {
44
+ "description": "Url for API definition",
45
+ "type": "string",
46
+ "$default": {
47
+ "$source": "argv",
48
+ "index": 4
49
+ },
50
+ "x-prompt": "Please enter URL for API definition (default: API Name's url in environment file)"
42
51
  }
43
52
  },
44
53
  "required": []
@@ -39,6 +39,15 @@
39
39
  "index": 3
40
40
  },
41
41
  "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
42
+ },
43
+ "url": {
44
+ "description": "API definition URL from",
45
+ "type": "string",
46
+ "$default": {
47
+ "$source": "argv",
48
+ "index": 4
49
+ },
50
+ "x-prompt": "Please enter URL for api definition (default: API Name's url in environment file)"
42
51
  }
43
52
  },
44
53
  "required": []
@@ -39,6 +39,15 @@
39
39
  "index": 3
40
40
  },
41
41
  "x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")"
42
+ },
43
+ "url": {
44
+ "description": "Url for API definition",
45
+ "type": "string",
46
+ "$default": {
47
+ "$source": "argv",
48
+ "index": 4
49
+ },
50
+ "x-prompt": "Please enter URL for API definition (default: API Name's url in environment file)"
42
51
  }
43
52
  },
44
53
  "required": []
@@ -15,4 +15,8 @@ export interface GenerateProxySchema {
15
15
  * Target Angular project to place the generated code
16
16
  */
17
17
  target?: string;
18
+ /**
19
+ * Url to API definition
20
+ */
21
+ url?: string;
18
22
  }
package/models/method.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Body = exports.Signature = exports.Method = void 0;
4
4
  const enums_1 = require("../enums");
5
5
  const text_1 = require("../utils/text");
6
+ const methods_1 = require("../utils/methods");
6
7
  // eslint-disable-next-line @typescript-eslint/no-var-requires
7
8
  const shouldQuote = require('should-quote');
8
9
  class Method {
@@ -29,15 +30,16 @@ class Body {
29
30
  const { bindingSourceId, descriptorName, jsonName, name, nameOnMethod } = param;
30
31
  const camelName = text_1.camel(name);
31
32
  const paramName = jsonName || camelName;
32
- const value = descriptorName
33
- ? shouldQuote(paramName)
33
+ let value = text_1.camelizeHyphen(nameOnMethod);
34
+ if (descriptorName) {
35
+ value = shouldQuote(paramName)
34
36
  ? `${descriptorName}['${paramName}']`
35
- : `${descriptorName}.${paramName}`
36
- : nameOnMethod;
37
+ : `${descriptorName}.${paramName}`;
38
+ }
37
39
  switch (bindingSourceId) {
38
40
  case enums_1.eBindingSourceId.Model:
39
41
  case enums_1.eBindingSourceId.Query:
40
- this.params.push(paramName === value ? value : `${paramName}: ${value}`);
42
+ this.params.push(paramName === value ? value : `${methods_1.getParamName(paramName)}: ${value}`);
41
43
  break;
42
44
  case enums_1.eBindingSourceId.Body:
43
45
  this.body = value;
@@ -1 +1 @@
1
- {"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":";;;AAAA,oCAA6D;AAC7D,wCAAsC;AAItC,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE5C,MAAa,MAAM;IAIjB,YAAY,OAAsB;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAPD,wBAOC;AAID,MAAa,SAAS;IAOpB,YAAY,OAAyB;QANrC,aAAQ,GAAG,EAAE,CAAC;QACd,aAAQ,GAAG,uBAAe,CAAC,MAAM,CAAC;QAElC,eAAU,GAAe,EAAE,CAAC;QAC5B,eAAU,GAAG,EAAE,CAAC;QAGd,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAVD,8BAUC;AAOD,MAAa,IAAI;IAoCf,YAAY,OAAoB;QAjChC,WAAM,GAAa,EAAE,CAAC;QACtB,gBAAW,GAAG,KAAK,CAAC;QAIpB,4BAAuB,GAAG,CAAC,KAAsB,EAAE,EAAE;YACnD,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;YAChF,MAAM,SAAS,GAAG,YAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,QAAQ,IAAI,SAAS,CAAC;YACxC,MAAM,KAAK,GAAG,cAAc;gBAC1B,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC;oBACtB,CAAC,CAAC,GAAG,cAAc,KAAK,SAAS,IAAI;oBACrC,CAAC,CAAC,GAAG,cAAc,IAAI,SAAS,EAAE;gBACpC,CAAC,CAAC,YAAY,CAAC;YAEjB,QAAQ,eAAe,EAAE;gBACvB,KAAK,wBAAgB,CAAC,KAAK,CAAC;gBAC5B,KAAK,wBAAgB,CAAC,KAAK;oBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,KAAK,EAAE,CAAC,CAAC;oBACzE,MAAM;gBACR,KAAK,wBAAgB,CAAC,IAAI;oBACxB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;oBAClB,MAAM;gBACR,KAAK,wBAAgB,CAAC,IAAI;oBACxB,gDAAgD;oBAChD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC;oBACvD,MAAM;gBACR;oBACE,MAAM;aACT;QACH,CAAC,CAAC;QAGA,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC;IACxE,CAAC;CACF;AA5CD,oBA4CC"}
1
+ {"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../packages/schematics/src/models/method.ts"],"names":[],"mappings":";;;AAAA,oCAA6D;AAC7D,wCAAsD;AACtD,8CAAgD;AAIhD,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE5C,MAAa,MAAM;IAIjB,YAAY,OAAsB;QAChC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAPD,wBAOC;AAID,MAAa,SAAS;IAOpB,YAAY,OAAyB;QANrC,aAAQ,GAAG,EAAE,CAAC;QACd,aAAQ,GAAG,uBAAe,CAAC,MAAM,CAAC;QAElC,eAAU,GAAe,EAAE,CAAC;QAC5B,eAAU,GAAG,EAAE,CAAC;QAGd,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;CACF;AAVD,8BAUC;AAOD,MAAa,IAAI;IAqCf,YAAY,OAAoB;QAlChC,WAAM,GAAa,EAAE,CAAC;QACtB,gBAAW,GAAG,KAAK,CAAC;QAIpB,4BAAuB,GAAG,CAAC,KAAsB,EAAE,EAAE;YACnD,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;YAChF,MAAM,SAAS,GAAG,YAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,QAAQ,IAAI,SAAS,CAAC;YACxC,IAAI,KAAK,GAAG,qBAAc,CAAC,YAAY,CAAC,CAAC;YACzC,IAAI,cAAc,EAAE;gBAClB,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC;oBAC5B,CAAC,CAAC,GAAG,cAAc,KAAK,SAAS,IAAI;oBACrC,CAAC,CAAC,GAAG,cAAc,IAAI,SAAS,EAAE,CAAC;aACtC;YAED,QAAQ,eAAe,EAAE;gBACvB,KAAK,wBAAgB,CAAC,KAAK,CAAC;gBAC5B,KAAK,wBAAgB,CAAC,KAAK;oBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,sBAAY,CAAC,SAAS,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;oBACvF,MAAM;gBACR,KAAK,wBAAgB,CAAC,IAAI;oBACxB,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;oBAClB,MAAM;gBACR,KAAK,wBAAgB,CAAC,IAAI;oBACxB,gDAAgD;oBAChD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC;oBACtF,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAC;oBACvD,MAAM;gBACR;oBACE,MAAM;aACT;QACH,CAAC,CAAC;QAGA,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC;IACxE,CAAC;CACF;AA7CD,oBA6CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abp/ng.schematics",
3
- "version": "5.2.1",
3
+ "version": "5.2.2",
4
4
  "description": "Schematics that works with ABP Backend",
5
5
  "keywords": [
6
6
  "schematics"
package/utils/index.d.ts CHANGED
@@ -7,6 +7,7 @@ export * from './enum';
7
7
  export * from './file';
8
8
  export * from './generics';
9
9
  export * from './import';
10
+ export * from './methods';
10
11
  export * from './model';
11
12
  export * from './namespace';
12
13
  export * from './path';
package/utils/index.js CHANGED
@@ -19,6 +19,7 @@ __exportStar(require("./enum"), exports);
19
19
  __exportStar(require("./file"), exports);
20
20
  __exportStar(require("./generics"), exports);
21
21
  __exportStar(require("./import"), exports);
22
+ __exportStar(require("./methods"), exports);
22
23
  __exportStar(require("./model"), exports);
23
24
  __exportStar(require("./namespace"), exports);
24
25
  __exportStar(require("./path"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B"}
@@ -0,0 +1 @@
1
+ export declare const getParamName: (paramName: string) => string;
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getParamName = void 0;
4
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
5
+ const shouldQuote = require('should-quote');
6
+ exports.getParamName = (paramName) => shouldQuote(paramName) ? `["${paramName}"]` : paramName;
7
+ //# sourceMappingURL=methods.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"methods.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/methods.ts"],"names":[],"mappings":";;;AAAA,8DAA8D;AAC9D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC/B,QAAA,YAAY,GAAG,CAAC,SAAiB,EAAE,EAAE,CAChD,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC"}
package/utils/service.js CHANGED
@@ -6,6 +6,8 @@ const import_1 = require("./import");
6
6
  const namespace_1 = require("./namespace");
7
7
  const tree_1 = require("./tree");
8
8
  const type_1 = require("./type");
9
+ const enums_1 = require("../enums");
10
+ const text_1 = require("./text");
9
11
  function serializeParameters(parameters) {
10
12
  return parameters.map(p => p.name + p.optional + ': ' + p.type + p.default, '').join(', ');
11
13
  }
@@ -53,7 +55,12 @@ function createActionToSignatureMapper() {
53
55
  const adaptType = type_1.createTypeAdapter();
54
56
  return (action) => {
55
57
  const signature = new models_1.Signature({ name: getMethodNameFromAction(action) });
56
- signature.parameters = action.parametersOnMethod.map(p => {
58
+ const versionParameter = getVersionParameter(action);
59
+ const parameters = [
60
+ ...action.parametersOnMethod,
61
+ ...(versionParameter ? [versionParameter] : []),
62
+ ];
63
+ signature.parameters = parameters.map(p => {
57
64
  const type = adaptType(p.typeSimple);
58
65
  const parameter = new models_1.Property({ name: p.name, type });
59
66
  parameter.setDefault(p.defaultValue);
@@ -67,6 +74,30 @@ exports.createActionToSignatureMapper = createActionToSignatureMapper;
67
74
  function getMethodNameFromAction(action) {
68
75
  return action.uniqueName.split('Async')[0];
69
76
  }
77
+ function getVersionParameter(action) {
78
+ const versionParameter = action.parameters.find(p => (p.name == 'apiVersion' && p.bindingSourceId == enums_1.eBindingSourceId.Path) ||
79
+ (p.name == 'api-version' && p.bindingSourceId == enums_1.eBindingSourceId.Query));
80
+ const bestVersion = findBestApiVersion(action);
81
+ return versionParameter && bestVersion
82
+ ? Object.assign(Object.assign({}, versionParameter), { name: text_1.camelizeHyphen(versionParameter.name), defaultValue: `"${bestVersion}"` }) : null;
83
+ }
84
+ // Implementation of https://github.com/abpframework/abp/commit/c3f77c1229508279015054a9b4f5586404a88a14#diff-a4dbf6be9a1aa21d8294f11047774949363ee6b601980bf3225e8046c0748c9eR101
85
+ function findBestApiVersion(action) {
86
+ /*
87
+ TODO: Implement configuredVersion when js proxies implemented
88
+ let configuredVersion = null;
89
+ if (action.supportedVersions.includes(configuredVersion)) {
90
+ return configuredVersion;
91
+ }
92
+ */
93
+ var _a;
94
+ if (!((_a = action.supportedVersions) === null || _a === void 0 ? void 0 : _a.length)) {
95
+ // TODO: return configuredVersion if exists or '1.0'
96
+ return '1.0';
97
+ }
98
+ //TODO: Ensure to get the latest version!
99
+ return action.supportedVersions[action.supportedVersions.length - 1];
100
+ }
70
101
  function createActionToImportsReducer(solution, types, namespace) {
71
102
  const mapTypesToImports = type_1.createTypesToImportsReducer(solution, namespace);
72
103
  const parseType = type_1.createTypeParser(type_1.removeTypeModifiers);
@@ -1 +1 @@
1
- {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/service.ts"],"names":[],"mappings":";;;AAAA,sCAYmB;AACnB,qCAAuC;AACvC,2CAA6C;AAC7C,iCAAuC;AACvC,iCAKgB;AAChB,oCAA4C;AAC5C,iCAAwC;AAExC,SAAgB,mBAAmB,CAAC,UAAsB;IACxD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7F,CAAC;AAFD,kDAEC;AAED,SAAgB,+BAA+B,CAAC,EAC9C,QAAQ,EACR,KAAK,EACL,OAAO,GACgB;IACvB,MAAM,iBAAiB,GAAG,0BAA0B,EAAE,CAAC;IAEvD,OAAO,CAAC,UAAsB,EAAE,EAAE;QAChC,MAAM,IAAI,GAAG,UAAU,CAAC,cAAc,CAAC;QACvC,MAAM,SAAS,GAAG,0BAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7F,OAAO,CAAC,IAAI,CAAC,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;QAChF,OAAO,CAAC,IAAI,CAAC,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;QAChF,oBAAW,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC/C,WAAW,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,IAAI,gBAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC;AAnBD,0EAmBC;AAED,SAAS,WAAW,CAAC,OAAiB;IACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAgB,0BAA0B;IACxC,MAAM,eAAe,GAAG,wBAAwB,EAAE,CAAC;IACnD,MAAM,oBAAoB,GAAG,6BAA6B,EAAE,CAAC;IAE7D,OAAO,CAAC,MAAc,EAAE,EAAE;QACxB,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,SAAS,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC/C,OAAO,IAAI,eAAM,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IACzC,CAAC,CAAC;AACJ,CAAC;AATD,gEASC;AAED,SAAgB,wBAAwB;IACtC,MAAM,SAAS,GAAG,wBAAiB,EAAE,CAAC;IAEtC,OAAO,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,EAAU,EAAE,EAAE;QAC9D,MAAM,YAAY,GAAG,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,aAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;QAEjE,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAXD,4DAWC;AAED,SAAgB,6BAA6B;IAC3C,MAAM,SAAS,GAAG,wBAAiB,EAAE,CAAC;IAEtC,OAAO,CAAC,MAAc,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,EAAE,IAAI,EAAE,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3E,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG;YACjB,GAAG,MAAM,CAAC,kBAAkB;YAC5B,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAChD,CAAC;QACF,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACxC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,IAAI,iBAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YACrC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YACpC,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC;AApBD,sEAoBC;AAED,SAAS,uBAAuB,CAAC,MAAc;IAC7C,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAc;IACzC,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAC7C,CAAC,CAAC,EAAE,CACF,CAAC,CAAC,CAAC,IAAI,IAAI,YAAY,IAAI,CAAC,CAAC,eAAe,IAAI,wBAAgB,CAAC,IAAI,CAAC;QACtE,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,IAAI,CAAC,CAAC,eAAe,IAAI,wBAAgB,CAAC,KAAK,CAAC,CAC3E,CAAC;IACF,MAAM,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,gBAAgB,IAAI,WAAW;QACpC,CAAC,iCACM,gBAAgB,KACnB,IAAI,EAAE,qBAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC3C,YAAY,EAAE,IAAI,WAAW,GAAG,IAEpC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,kLAAkL;AAClL,SAAS,kBAAkB,CAAC,MAAc;IACxC;;;;;;MAME;;IAEF,IAAI,QAAC,MAAM,CAAC,iBAAiB,0CAAE,MAAM,CAAA,EAAE;QACrC,oDAAoD;QACpD,OAAO,KAAK,CAAC;KACd;IACD,yCAAyC;IACzC,OAAO,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,4BAA4B,CACnC,QAAgB,EAChB,KAA2B,EAC3B,SAAiB;IAEjB,MAAM,iBAAiB,GAAG,kCAA2B,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,uBAAgB,CAAC,0BAAmB,CAAC,CAAC;IAExD,OAAO,CAAC,OAAiB,EAAE,EAAE,kBAAkB,EAAE,WAAW,EAAU,EAAE,EAAE,CACxE,iBAAiB,CACf,OAAO,EACP,CAAC,WAAW,EAAE,GAAG,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,KAAK,EAAE,EAAE;QACzE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CACxC,oBAAa,CAAC,SAAS,CAAC;aACrB,UAAU,EAAE;aACZ,OAAO,CAAC,IAAI,CAAC,EAAE;YACd,IAAI,KAAK,CAAC,IAAI,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CACL,CAAC;QAEF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;AACN,CAAC"}
package/utils/source.js CHANGED
@@ -10,9 +10,12 @@ const common_1 = require("./common");
10
10
  const workspace_1 = require("./workspace");
11
11
  function createApiDefinitionGetter(params) {
12
12
  const apiName = params.apiName || 'default';
13
+ let sourceUrl = params.url;
13
14
  return async (host) => {
14
15
  const source = await workspace_1.resolveProject(host, params.source);
15
- const sourceUrl = getSourceUrl(host, source, apiName);
16
+ if (!sourceUrl) {
17
+ sourceUrl = getSourceUrl(host, source, apiName);
18
+ }
16
19
  return await getApiDefinition(sourceUrl);
17
20
  };
18
21
  }
@@ -1 +1 @@
1
- {"version":3,"file":"source.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/source.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"source.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/source.ts"],"names":[],"mappings":"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"}
package/utils/text.d.ts CHANGED
@@ -7,3 +7,4 @@ export declare const snake: (text: string) => string;
7
7
  export declare const macro: (text: string) => string;
8
8
  export declare const dir: (text: string) => string;
9
9
  export declare const quote: (value: number | string) => string | number;
10
+ export declare function camelizeHyphen(str: string): string;
package/utils/text.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.quote = exports.dir = exports.macro = exports.snake = exports.kebab = exports.pascal = exports.camel = exports.upper = exports.lower = void 0;
3
+ exports.camelizeHyphen = exports.quote = exports.dir = exports.macro = exports.snake = exports.kebab = exports.pascal = exports.camel = exports.upper = exports.lower = void 0;
4
4
  /* eslint-disable no-useless-escape */
5
5
  const core_1 = require("@angular-devkit/core");
6
6
  exports.lower = (text) => text.toLowerCase();
@@ -44,4 +44,8 @@ function isUpperCase(str = '') {
44
44
  function toLowerCase(str = '') {
45
45
  return str.toLowerCase();
46
46
  }
47
+ function camelizeHyphen(str) {
48
+ return str.replace(/-([a-z])/g, g => g[1].toUpperCase());
49
+ }
50
+ exports.camelizeHyphen = camelizeHyphen;
47
51
  //# sourceMappingURL=text.js.map
package/utils/text.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/text.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/text.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,+CAA+C;AAElC,QAAA,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAC7C,QAAA,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAC7C,QAAA,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC/C,QAAA,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,cAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACrD,QAAA,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,cAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACrD,QAAA,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,cAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AACtD,QAAA,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,aAAK,CAAC,aAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7C,QAAA,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE,CAClC,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;AAEvD,QAAA,KAAK,GAAG,CAAC,KAAsB,EAAE,EAAE,CAC9C,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;AAExE,SAAS,CAAC,CAAC,IAAY;IACrB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,2GAA2G;AAC3G,SAAS,WAAW,CAAC,GAAW;IAC9B,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,GAAG,CAAC;IAE7C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;QAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,MAAM;QAE7C,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;QAE/B,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAClD,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC7B,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;aAClC;YAED,MAAM;SACP;QAED,KAAK,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KAClC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,WAAW,CAAC,GAAG,GAAG,EAAE;IAC3B,OAAO,sEAAsE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1F,CAAC;AAED,SAAS,WAAW,CAAC,GAAG,GAAG,EAAE;IAC3B,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,WAAW,CAAC,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;AAC3B,CAAC;AACD,SAAgB,cAAc,CAAC,GAAW;IACxC,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC3D,CAAC;AAFD,wCAEC"}