@loopback/cli 4.1.3 → 4.1.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.
Files changed (7) hide show
  1. package/generators/datasource/index.js +4 -0
  2. package/generators/discover/index.js +4 -1
  3. package/generators/openapi/spec-loader.js +9 -1
  4. package/generators/relation/utils.generator.js +1 -1
  5. package/generators/repository/index.js +1 -5
  6. package/lib/base-generator.js +1 -1
  7. package/package.json +91 -91
package/generators/datasource/index.js CHANGED
@@ -63,6 +63,10 @@ module.exports = class DataSourceGenerator extends ArtifactGenerator {
63
63
  }
64
64
 
65
65
  setOptions() {
66
+ // remove not needed .env property
67
+ if (this.options.config) {
68
+ delete this.options?.env;
69
+ }
66
70
  return super.setOptions();
67
71
  }
68
72
 
package/generators/discover/index.js CHANGED
@@ -86,7 +86,10 @@ module.exports = class DiscoveryGenerator extends ArtifactGenerator {
86
86
  this.options.dataSource,
87
87
  );
88
88
  }
89
-
89
+ // remove not needed .env property
90
+ if (this.options.config) {
91
+ delete this.options?.env;
92
+ }
90
93
  return super.setOptions();
91
94
  }
92
95
 
package/generators/openapi/spec-loader.js CHANGED
@@ -10,6 +10,7 @@ const swagger2openapi = require('swagger2openapi');
10
10
  const {debugJson, cloneSpecObject} = require('./utils');
11
11
  const {generateControllerSpecs} = require('./spec-helper');
12
12
  const {generateModelSpecs, registerNamedSchemas} = require('./schema-helper');
13
+ const {ResolverError} = require('@apidevtools/json-schema-ref-parser');
13
14
 
14
15
  /**
15
16
  * Load swagger specs from the given url or file path; handle yml or json
@@ -42,7 +43,14 @@ async function loadSpec(specUrlStr, {log, validate} = {}) {
42
43
  },
43
44
  });
44
45
  } else {
45
- spec = await parser.dereference(spec);
46
+ try {
47
+ spec = await parser.dereference(spec);
48
+ } catch (error) {
49
+ // If returns http unauthorized error, ignore resolving external ref$ pointer
50
+ if (error instanceof ResolverError) {
51
+ spec = await parser.dereference(spec, {resolve: {external: false}});
52
+ }
53
+ }
46
54
  }
47
55
 
48
56
  return spec;
package/generators/relation/utils.generator.js CHANGED
@@ -81,7 +81,7 @@ exports.addExportController = async function (
81
81
  for (const declarations of exportedDeclarations.values()) {
82
82
  for (const declaration of declarations) {
83
83
  if (
84
- ast.TypeGuards.isClassDeclaration(declaration) &&
84
+ ast.Node.isClassDeclaration(declaration) &&
85
85
  controllerClassName === declaration.getName()
86
86
  ) {
87
87
  return;
package/generators/repository/index.js CHANGED
@@ -566,11 +566,7 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
566
566
  return repositoryName + 'Repository';
567
567
  },
568
568
  );
569
-
570
- this.artifactInfo.name = this.artifactInfo.modelNameList
571
- ? this.artifactInfo.modelNameList.join(this.classNameSeparator)
572
- : this.artifactInfo.modelName;
573
-
569
+ this.artifactInfo.name = `${this.artifactInfo.className}Repository`;
574
570
  await super.end();
575
571
  }
576
572
  };
package/lib/base-generator.js CHANGED
@@ -196,7 +196,7 @@ module.exports = class BaseGenerator extends Generator {
196
196
  return;
197
197
  }
198
198
  for (const o in opts) {
199
- if (this.options[o] == null) {
199
+ if (!this.options[o]) {
200
200
  this.options[o] = opts[o];
201
201
  }
202
202
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@loopback/cli",
3
3
  "description": "Yeoman generator for LoopBack 4",
4
- "version": "4.1.3",
4
+ "version": "4.1.5",
5
5
  "keywords": [
6
6
  "LoopBack",
7
7
  "CLI",
@@ -39,7 +39,7 @@
39
39
  ".yo-rc.json"
40
40
  ],
41
41
  "dependencies": {
42
- "@lerna/project": "^5.4.3",
42
+ "@lerna/project": "^6.0.3",
43
43
  "@openapi-contrib/openapi-schema-to-json-schema": "^3.2.0",
44
44
  "@phenomnomnominal/tsquery": "^5.0.0",
45
45
  "camelcase-keys": "^7.0.2",
@@ -53,13 +53,13 @@
53
53
  "latest-version": "^5.1.0",
54
54
  "lodash": "^4.17.21",
55
55
  "minimatch": "^5.1.0",
56
- "minimist": "^1.2.6",
56
+ "minimist": "^1.2.7",
57
57
  "mkdirp": "^1.0.4",
58
58
  "natural-compare": "^1.4.0",
59
- "pacote": "^13.6.2",
59
+ "pacote": "^15.0.6",
60
60
  "pluralize": "^8.0.0",
61
61
  "regenerate": "^1.4.2",
62
- "semver": "^7.3.7",
62
+ "semver": "^7.3.8",
63
63
  "slash": "^3.0.0",
64
64
  "spdx-license-list": "^6.6.0",
65
65
  "stringify-object": "^3.3.0",
@@ -69,34 +69,34 @@
69
69
  "tabtab": "^3.0.2",
70
70
  "terminal-link": "^2.1.1",
71
71
  "tildify": "^2.0.0",
72
- "ts-morph": "^12.2.0",
73
- "typescript": "~4.7.4",
72
+ "ts-morph": "^16.0.0",
73
+ "typescript": "~4.8.4",
74
74
  "unicode-10.0.0": "^0.7.5",
75
75
  "untildify": "^4.0.0",
76
76
  "update-notifier": "^5.1.0",
77
77
  "url-slug": "^3.0.4",
78
78
  "validate-npm-package-name": "^4.0.0",
79
79
  "write-file-atomic": "^4.0.2",
80
- "yeoman-environment": "^3.10.0",
80
+ "yeoman-environment": "^3.12.1",
81
81
  "yeoman-generator": "^5.7.0"
82
82
  },
83
83
  "devDependencies": {
84
- "@loopback/build": "^9.0.3",
85
- "@loopback/eslint-config": "^13.0.3",
86
- "@loopback/testlab": "^5.0.3",
84
+ "@loopback/build": "^9.0.5",
85
+ "@loopback/eslint-config": "^13.0.5",
86
+ "@loopback/testlab": "^5.0.5",
87
87
  "@types/ejs": "^3.1.1",
88
88
  "@types/fs-extra": "^9.0.13",
89
- "@types/minimatch": "^5.1.0",
90
- "@types/node": "^14.18.26",
89
+ "@types/minimatch": "^5.1.2",
90
+ "@types/node": "^14.18.33",
91
91
  "@types/yeoman-environment": "^2.10.8",
92
92
  "@types/yeoman-generator": "^5.2.11",
93
93
  "loopback": "^3.28.0",
94
- "loopback-datasource-juggler": "^4.27.1",
94
+ "loopback-datasource-juggler": "^4.28.0",
95
95
  "mem-fs": "^2.2.1",
96
96
  "mem-fs-editor": "^9.5.0",
97
97
  "mock-stdin": "^1.0.0",
98
98
  "rimraf": "^3.0.2",
99
- "sinon": "^14.0.0",
99
+ "sinon": "^14.0.2",
100
100
  "strong-globalize-cli": "7.1.0",
101
101
  "yeoman-assert": "^3.1.1",
102
102
  "yeoman-test": "^6.3.0"
@@ -104,97 +104,97 @@
104
104
  "config": {
105
105
  "templateDependencies": {
106
106
  "tslib": "^2.0.0",
107
- "@types/mocha": "^9.1.1",
108
- "@types/node": "^14.18.26",
107
+ "@types/mocha": "^10.0.0",
108
+ "@types/node": "^14.18.33",
109
109
  "cross-spawn": "^7.0.3",
110
110
  "debug": "^4.3.4",
111
111
  "fs-extra": "^10.1.0",
112
- "mocha": "^10.0.0",
112
+ "mocha": "^10.1.0",
113
113
  "nyc": "^15.1.0",
114
- "prettier": "^2.7.1",
114
+ "prettier": "^2.8.0",
115
115
  "rimraf": "^3.0.2",
116
116
  "source-map-support": "^0.5.21",
117
- "typescript": "~4.7.4",
118
- "@loopback/authentication": "^9.0.3",
119
- "@loopback/boot": "^5.0.3",
120
- "@loopback/build": "^9.0.3",
121
- "@loopback/cli": "^4.1.3",
122
- "@loopback/context": "^5.0.3",
123
- "@loopback/core": "^4.0.3",
124
- "@loopback/metadata": "^5.0.3",
125
- "@loopback/openapi-spec-builder": "^5.0.3",
126
- "@loopback/openapi-v3": "^8.0.3",
127
- "@loopback/repository-json-schema": "^6.0.3",
128
- "@loopback/repository": "^5.0.3",
129
- "@loopback/rest": "^12.0.3",
130
- "@loopback/testlab": "^5.0.3",
131
- "@loopback/docs": "^5.1.2",
117
+ "typescript": "~4.8.4",
118
+ "@loopback/authentication": "^9.0.5",
119
+ "@loopback/boot": "^5.0.5",
120
+ "@loopback/build": "^9.0.5",
121
+ "@loopback/cli": "^4.1.5",
122
+ "@loopback/context": "^5.0.5",
123
+ "@loopback/core": "^4.0.5",
124
+ "@loopback/metadata": "^5.0.5",
125
+ "@loopback/openapi-spec-builder": "^5.0.5",
126
+ "@loopback/openapi-v3": "^8.0.5",
127
+ "@loopback/repository-json-schema": "^6.0.5",
128
+ "@loopback/repository": "^5.1.0",
129
+ "@loopback/rest": "^12.0.5",
130
+ "@loopback/testlab": "^5.0.5",
131
+ "@loopback/docs": "^5.1.4",
132
132
  "glob": "^8.0.3",
133
- "@loopback/example-hello-world": "^5.0.3",
134
- "@loopback/example-log-extension": "^5.0.3",
135
- "@loopback/example-rpc-server": "^5.0.3",
136
- "@loopback/example-todo": "^6.0.3",
137
- "@loopback/example-soap-calculator": "^5.0.3",
138
- "@loopback/service-proxy": "^5.0.3",
139
- "@loopback/http-caching-proxy": "^4.0.3",
140
- "@loopback/http-server": "^4.0.3",
141
- "@loopback/example-todo-list": "^6.0.3",
133
+ "@loopback/example-hello-world": "^5.0.5",
134
+ "@loopback/example-log-extension": "^5.0.5",
135
+ "@loopback/example-rpc-server": "^5.0.5",
136
+ "@loopback/example-todo": "^6.0.5",
137
+ "@loopback/example-soap-calculator": "^5.0.5",
138
+ "@loopback/service-proxy": "^5.0.5",
139
+ "@loopback/http-caching-proxy": "^4.0.5",
140
+ "@loopback/http-server": "^4.0.5",
141
+ "@loopback/example-todo-list": "^6.0.5",
142
142
  "@loopback/dist-util": "^0.4.0",
143
- "@loopback/rest-explorer": "^5.0.3",
144
- "@loopback/eslint-config": "^13.0.3",
143
+ "@loopback/rest-explorer": "^5.0.5",
144
+ "@loopback/eslint-config": "^13.0.5",
145
145
  "express-composition": "^1.1.0",
146
- "@loopback/example-express-composition": "^5.0.3",
147
- "@loopback/example-greeter-extension": "^5.0.3",
148
- "@loopback/booter-lb3app": "^4.0.3",
149
- "@loopback/example-lb3-application": "^5.0.3",
150
- "eslint": "^8.22.0",
146
+ "@loopback/example-express-composition": "^5.0.5",
147
+ "@loopback/example-greeter-extension": "^5.0.5",
148
+ "@loopback/booter-lb3app": "^4.0.5",
149
+ "@loopback/example-lb3-application": "^5.0.5",
150
+ "eslint": "^8.28.0",
151
151
  "eslint-plugin-mocha": "^10.1.0",
152
- "@loopback/example-greeting-app": "^5.0.3",
153
- "@loopback/example-context": "^5.0.3",
154
- "@typescript-eslint/eslint-plugin": "^5.35.1",
155
- "@typescript-eslint/parser": "^5.35.1",
152
+ "@loopback/example-greeting-app": "^5.0.5",
153
+ "@loopback/example-context": "^5.0.5",
154
+ "@typescript-eslint/eslint-plugin": "^5.44.0",
155
+ "@typescript-eslint/parser": "^5.44.0",
156
156
  "eslint-plugin-eslint-plugin": "^5.0.6",
157
157
  "eslint-config-prettier": "^8.5.0",
158
- "@loopback/repository-tests": "^0.21.3",
159
- "@loopback/health": "^0.11.3",
160
- "@loopback/authorization": "^0.12.3",
161
- "@loopback/rest-crud": "^0.15.2",
162
- "@loopback/security": "^0.8.3",
163
- "@loopback/authentication-passport": "^5.0.3",
164
- "@loopback/example-metrics-prometheus": "^0.10.3",
165
- "@loopback/metrics": "^0.11.3",
166
- "@loopback/model-api-builder": "^4.0.3",
167
- "@loopback/logging": "^0.9.3",
168
- "@loopback/example-access-control-migration": "^5.0.3",
169
- "@loopback/example-file-transfer": "^4.0.3",
170
- "@loopback/example-rest-crud": "^4.0.3",
171
- "@loopback/apiconnect": "^0.10.3",
172
- "@loopback/example-validation-app": "^4.0.3",
173
- "@loopback/cron": "^0.9.3",
174
- "@loopback/example-multi-tenancy": "^0.13.3",
175
- "@loopback/example-passport-login": "^4.0.3",
176
- "@loopback/authentication-jwt": "^0.12.3",
177
- "@loopback/context-explorer": "^0.8.3",
178
- "@loopback/express": "^5.0.3",
158
+ "@loopback/repository-tests": "^0.21.5",
159
+ "@loopback/health": "^0.11.5",
160
+ "@loopback/authorization": "^0.12.5",
161
+ "@loopback/rest-crud": "^0.15.4",
162
+ "@loopback/security": "^0.8.5",
163
+ "@loopback/authentication-passport": "^5.0.5",
164
+ "@loopback/example-metrics-prometheus": "^0.10.5",
165
+ "@loopback/metrics": "^0.11.5",
166
+ "@loopback/model-api-builder": "^4.0.5",
167
+ "@loopback/logging": "^0.9.5",
168
+ "@loopback/example-access-control-migration": "^5.0.5",
169
+ "@loopback/example-file-transfer": "^4.0.5",
170
+ "@loopback/example-rest-crud": "^4.0.5",
171
+ "@loopback/apiconnect": "^0.10.5",
172
+ "@loopback/example-validation-app": "^4.0.5",
173
+ "@loopback/cron": "^0.9.5",
174
+ "@loopback/example-multi-tenancy": "^0.13.5",
175
+ "@loopback/example-passport-login": "^4.0.5",
176
+ "@loopback/authentication-jwt": "^0.12.5",
177
+ "@loopback/context-explorer": "^0.8.5",
178
+ "@loopback/express": "^5.0.5",
179
179
  "@types/js-yaml": "^3.12.4",
180
180
  "js-yaml": "^3.13.1",
181
- "@loopback/example-todo-jwt": "^4.0.3",
182
- "@loopback/mock-oauth2-provider": "^0.6.3",
181
+ "@loopback/example-todo-jwt": "^4.0.5",
182
+ "@loopback/mock-oauth2-provider": "^0.6.5",
183
183
  "lodash": "^4.17.21",
184
- "@loopback/pooling": "^0.8.3",
185
- "@loopback/typeorm": "^0.7.3",
186
- "@loopback/example-graphql": "^0.7.3",
187
- "@loopback/graphql": "^0.8.3",
188
- "@loopback/filter": "^3.0.3",
189
- "@loopback/rest-msgpack": "^0.8.3",
190
- "@loopback/example-binding-resolution": "^0.7.3",
191
- "@loopback/example-webpack": "^0.8.3",
192
- "@loopback/example-socketio": "^0.6.3",
193
- "@loopback/socketio": "^0.6.3",
194
- "@loopback/monorepo": "^0.5.3",
195
- "@loopback/tsdocs": "^4.0.3",
196
- "@loopback/example-references-many": "^6.0.3"
184
+ "@loopback/pooling": "^0.8.5",
185
+ "@loopback/typeorm": "^0.7.5",
186
+ "@loopback/example-graphql": "^0.7.5",
187
+ "@loopback/graphql": "^0.8.5",
188
+ "@loopback/filter": "^3.0.5",
189
+ "@loopback/rest-msgpack": "^0.8.5",
190
+ "@loopback/example-binding-resolution": "^0.7.5",
191
+ "@loopback/example-webpack": "^0.8.5",
192
+ "@loopback/example-socketio": "^0.6.5",
193
+ "@loopback/socketio": "^0.6.5",
194
+ "@loopback/monorepo": "^0.5.5",
195
+ "@loopback/tsdocs": "^4.0.5",
196
+ "@loopback/example-references-many": "^6.0.5"
197
197
  }
198
198
  },
199
- "gitHead": "296d9a9577fd058d1a2b2386087686cefa65a7a9"
199
+ "gitHead": "2d762e2a1bcc73263dd7776e072b3ec3a9279472"
200
200
  }