@whook/gcp-functions 18.0.2 → 18.0.3

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.
@@ -35,7 +35,7 @@ declare const _default: import("knifecycle").ServiceInitializer<Dependencies<any
35
35
  WHOOK_PLUGINS?: import("@whook/whook").WhookPluginName[];
36
36
  WHOOK_RESOLVED_PLUGINS: import("@whook/whook/dist/services/WHOOK_RESOLVED_PLUGINS.js").WhookResolvedPluginsService;
37
37
  args: import("@whook/whook").WhookCommandArgs;
38
- $injector: Injector<Service>;
38
+ $injector: import("knifecycle").Injector<Service>;
39
39
  importer: import("common-services").ImporterService<{
40
40
  default: Initializer<Service, Dependencies>;
41
41
  }>;
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
- import { initAutoload, noop, cleanupOpenAPI } from '@whook/whook';
3
- import { SPECIAL_PROPS, UNBUILDABLE_SERVICES, wrapInitializer, constant, alsoInject, location, } from 'knifecycle';
4
- import { printStackTrace, YError } from 'yerror';
2
+ import { initBuildAutoload, noop, cleanupOpenAPI } from '@whook/whook';
3
+ import { UNBUILDABLE_SERVICES, wrapInitializer, constant, alsoInject, location, } from 'knifecycle';
4
+ import { YError } from 'yerror';
5
5
  import { dereferenceOpenAPIOperations, getOpenAPIOperations, } from '@whook/http-router';
6
6
  import initHandler from './HANDLER.js';
7
7
  import initWrapHandlerForGoogleHTTPFunction from '../wrappers/wrapHandlerForGoogleHTTPFunction.js';
@@ -11,7 +11,7 @@ export const GCP_WRAPPERS = {
11
11
  initializer: initWrapHandlerForGoogleHTTPFunction,
12
12
  },
13
13
  };
14
- const initializerWrapper = (async ({ BUILD_CONSTANTS = {}, $injector, $instance, log = noop, }, $autoload) => {
14
+ const initializerWrapper = (async ({ $injector, log = noop }, $autoload) => {
15
15
  let API;
16
16
  let OPERATION_APIS;
17
17
  const getAPIOperation = (() => {
@@ -65,48 +65,25 @@ const initializerWrapper = (async ({ BUILD_CONSTANTS = {}, $injector, $instance,
65
65
  log('warning', `🤷 - Building a project with the "${serviceName}" unbuildable service (ie Knifecycle ones: ${UNBUILDABLE_SERVICES.join(', ')}) can give unpredictable results!`);
66
66
  return constant(serviceName, undefined);
67
67
  }
68
- try {
69
- let initializer;
70
- try {
71
- initializer = $instance._getInitializer(serviceName);
72
- }
73
- catch (err) {
74
- log('debug', `🤖 - Direct initializer access failure from the Knifecycle instance: "${serviceName}".`);
75
- log('debug-stack', printStackTrace(err));
76
- }
77
- if (initializer && initializer[SPECIAL_PROPS.TYPE] === 'constant') {
78
- log('debug', `🤖 - Reusing a constant initializer directly from the Knifecycle instance: "${serviceName}".`);
79
- return initializer;
80
- }
81
- if (serviceName.startsWith('OPERATION_API_')) {
82
- const [, , OPERATION_API] = await getAPIOperation(serviceName);
83
- return constant(serviceName, OPERATION_API);
84
- }
85
- if (serviceName.startsWith('OPERATION_WRAPPER_')) {
86
- const [type] = await getAPIOperation(serviceName);
87
- return location(alsoInject([
88
- `OPERATION_API>${serviceName.replace('OPERATION_WRAPPER_', 'OPERATION_API_')}`,
89
- ], GCP_WRAPPERS[type].initializer), `@whook/gcp-functions/dist/wrappers/${GCP_WRAPPERS[type].name}.js`);
90
- }
91
- if (serviceName.startsWith('OPERATION_HANDLER_')) {
92
- const [, operationId] = await getAPIOperation(serviceName);
93
- return location(alsoInject([
94
- `mainWrapper>OPERATION_WRAPPER_${serviceName.replace('OPERATION_HANDLER_', '')}`,
95
- `baseHandler>${operationId}`,
96
- ], initHandler), '@whook/gcp-functions/dist/services/HANDLER.js');
97
- }
98
- if (BUILD_CONSTANTS[serviceName]) {
99
- return constant(serviceName, BUILD_CONSTANTS[serviceName]);
100
- }
101
- return $autoload(serviceName);
68
+ if (serviceName.startsWith('OPERATION_API_')) {
69
+ const [, , OPERATION_API] = await getAPIOperation(serviceName);
70
+ return constant(serviceName, OPERATION_API);
71
+ }
72
+ if (serviceName.startsWith('OPERATION_WRAPPER_')) {
73
+ const [type] = await getAPIOperation(serviceName);
74
+ return location(alsoInject([
75
+ `OPERATION_API>${serviceName.replace('OPERATION_WRAPPER_', 'OPERATION_API_')}`,
76
+ ], GCP_WRAPPERS[type].initializer), `@whook/gcp-functions/dist/wrappers/${GCP_WRAPPERS[type].name}.js`);
102
77
  }
103
- catch (err) {
104
- log('error', `💥 - Build error while loading "${serviceName}".`);
105
- log('error-stack', printStackTrace(err));
106
- throw err;
78
+ if (serviceName.startsWith('OPERATION_HANDLER_')) {
79
+ const [, operationId] = await getAPIOperation(serviceName);
80
+ return location(alsoInject([
81
+ `mainWrapper>OPERATION_WRAPPER_${serviceName.replace('OPERATION_HANDLER_', '')}`,
82
+ `baseHandler>${operationId}`,
83
+ ], initHandler), '@whook/gcp-functions/dist/services/HANDLER.js');
107
84
  }
85
+ return await $autoload(serviceName);
108
86
  };
109
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
110
87
  });
111
88
  /**
112
89
  * Wrap the _autoload service in order to build for GCP
@@ -124,7 +101,5 @@ const initializerWrapper = (async ({ BUILD_CONSTANTS = {}, $injector, $instance,
124
101
  * @return {Promise<Object>}
125
102
  * A promise of an object containing the reshaped env vars.
126
103
  */
127
- export default alsoInject(['?BUILD_CONSTANTS', '$instance', '$injector', '?log'],
128
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
129
- wrapInitializer(initializerWrapper, initAutoload));
104
+ export default alsoInject(['?BUILD_CONSTANTS', '$instance', '$injector', '?log'], wrapInitializer(initializerWrapper, initBuildAutoload));
130
105
  //# sourceMappingURL=_autoload.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"_autoload.js","sourceRoot":"","sources":["../../src/services/_autoload.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_autoload.js","sourceRoot":"","sources":["../../src/services/_autoload.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -29,7 +29,7 @@
29
29
  }
30
30
  },
31
31
  "name": "@whook/gcp-functions",
32
- "version": "18.0.2",
32
+ "version": "18.0.3",
33
33
  "description": "Build and deploy to GCP Cloud Functions with Whook.",
34
34
  "type": "module",
35
35
  "main": "dist/index.js",
@@ -49,9 +49,9 @@
49
49
  },
50
50
  "homepage": "https://github.com/nfroidure/whook",
51
51
  "dependencies": {
52
- "@whook/cors": "^18.0.0",
52
+ "@whook/cors": "^18.0.3",
53
53
  "@whook/http-router": "^18.0.0",
54
- "@whook/whook": "^18.0.0",
54
+ "@whook/whook": "^18.0.3",
55
55
  "ajv": "^8.17.1",
56
56
  "ajv-formats": "^3.0.1",
57
57
  "application-services": "^7.0.0",
@@ -146,5 +146,5 @@
146
146
  "overrides": {
147
147
  "eslint": "^9.16.0"
148
148
  },
149
- "gitHead": "938b8e5a7d4f067f2ca88e5d8b821da941e96568"
149
+ "gitHead": "7313f1c7c6a20f084654dd23f358190840f2a189"
150
150
  }
@@ -1,7 +1,6 @@
1
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
- import { initAutoload, noop, cleanupOpenAPI } from '@whook/whook';
2
+ import { initBuildAutoload, noop, cleanupOpenAPI } from '@whook/whook';
3
3
  import {
4
- SPECIAL_PROPS,
5
4
  UNBUILDABLE_SERVICES,
6
5
  Knifecycle,
7
6
  wrapInitializer,
@@ -9,7 +8,7 @@ import {
9
8
  alsoInject,
10
9
  location,
11
10
  } from 'knifecycle';
12
- import { printStackTrace, YError } from 'yerror';
11
+ import { YError } from 'yerror';
13
12
  import {
14
13
  dereferenceOpenAPIOperations,
15
14
  getOpenAPIOperations,
@@ -54,12 +53,7 @@ const initializerWrapper: ServiceInitializerWrapper<
54
53
  Autoloader<Initializer<Dependencies, Service>>,
55
54
  Dependencies
56
55
  > = (async (
57
- {
58
- BUILD_CONSTANTS = {},
59
- $injector,
60
- $instance,
61
- log = noop,
62
- }: WhookGoogleFunctionsAutoloadDependencies,
56
+ { $injector, log = noop }: WhookGoogleFunctionsAutoloadDependencies,
63
57
  $autoload: Autoloader<Initializer<Dependencies, Service>>,
64
58
  ): Promise<
65
59
  (serviceName: string) => Promise<Initializer<Dependencies, Service>>
@@ -145,80 +139,49 @@ const initializerWrapper: ServiceInitializerWrapper<
145
139
  return constant(serviceName, undefined);
146
140
  }
147
141
 
148
- try {
149
- let initializer;
150
-
151
- try {
152
- initializer = $instance._getInitializer(serviceName);
153
- } catch (err) {
154
- log(
155
- 'debug',
156
- `🤖 - Direct initializer access failure from the Knifecycle instance: "${serviceName}".`,
157
- );
158
- log('debug-stack', printStackTrace(err as Error));
159
- }
160
-
161
- if (initializer && initializer[SPECIAL_PROPS.TYPE] === 'constant') {
162
- log(
163
- 'debug',
164
- `🤖 - Reusing a constant initializer directly from the Knifecycle instance: "${serviceName}".`,
165
- );
166
- return initializer;
167
- }
168
-
169
- if (serviceName.startsWith('OPERATION_API_')) {
170
- const [, , OPERATION_API] = await getAPIOperation(serviceName);
171
-
172
- return constant(serviceName, OPERATION_API);
173
- }
142
+ if (serviceName.startsWith('OPERATION_API_')) {
143
+ const [, , OPERATION_API] = await getAPIOperation(serviceName);
174
144
 
175
- if (serviceName.startsWith('OPERATION_WRAPPER_')) {
176
- const [type] = await getAPIOperation(serviceName);
177
-
178
- return location(
179
- alsoInject(
180
- [
181
- `OPERATION_API>${serviceName.replace(
182
- 'OPERATION_WRAPPER_',
183
- 'OPERATION_API_',
184
- )}`,
185
- ],
186
- GCP_WRAPPERS[type].initializer as any,
187
- ),
188
- `@whook/gcp-functions/dist/wrappers/${GCP_WRAPPERS[type].name}.js`,
189
- );
190
- }
191
-
192
- if (serviceName.startsWith('OPERATION_HANDLER_')) {
193
- const [, operationId] = await getAPIOperation(serviceName);
194
-
195
- return location(
196
- alsoInject(
197
- [
198
- `mainWrapper>OPERATION_WRAPPER_${serviceName.replace(
199
- 'OPERATION_HANDLER_',
200
- '',
201
- )}`,
202
- `baseHandler>${operationId}`,
203
- ],
204
- initHandler,
205
- ),
206
- '@whook/gcp-functions/dist/services/HANDLER.js',
207
- );
208
- }
145
+ return constant(serviceName, OPERATION_API);
146
+ }
209
147
 
210
- if (BUILD_CONSTANTS[serviceName]) {
211
- return constant(serviceName, BUILD_CONSTANTS[serviceName]);
212
- }
148
+ if (serviceName.startsWith('OPERATION_WRAPPER_')) {
149
+ const [type] = await getAPIOperation(serviceName);
150
+
151
+ return location(
152
+ alsoInject(
153
+ [
154
+ `OPERATION_API>${serviceName.replace(
155
+ 'OPERATION_WRAPPER_',
156
+ 'OPERATION_API_',
157
+ )}`,
158
+ ],
159
+ GCP_WRAPPERS[type].initializer as any,
160
+ ),
161
+ `@whook/gcp-functions/dist/wrappers/${GCP_WRAPPERS[type].name}.js`,
162
+ ) as any;
163
+ }
213
164
 
214
- return $autoload(serviceName);
215
- } catch (err) {
216
- log('error', `💥 - Build error while loading "${serviceName}".`);
217
- log('error-stack', printStackTrace(err as Error));
218
- throw err;
165
+ if (serviceName.startsWith('OPERATION_HANDLER_')) {
166
+ const [, operationId] = await getAPIOperation(serviceName);
167
+
168
+ return location(
169
+ alsoInject(
170
+ [
171
+ `mainWrapper>OPERATION_WRAPPER_${serviceName.replace(
172
+ 'OPERATION_HANDLER_',
173
+ '',
174
+ )}`,
175
+ `baseHandler>${operationId}`,
176
+ ],
177
+ initHandler,
178
+ ),
179
+ '@whook/gcp-functions/dist/services/HANDLER.js',
180
+ );
219
181
  }
182
+
183
+ return await $autoload(serviceName);
220
184
  };
221
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
222
185
  }) as any;
223
186
 
224
187
  /**
@@ -239,6 +202,5 @@ const initializerWrapper: ServiceInitializerWrapper<
239
202
  */
240
203
  export default alsoInject(
241
204
  ['?BUILD_CONSTANTS', '$instance', '$injector', '?log'],
242
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
243
- wrapInitializer(initializerWrapper as any, initAutoload),
205
+ wrapInitializer(initializerWrapper as any, initBuildAutoload),
244
206
  );