@whook/gcp-functions 18.0.1 → 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.
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/services/_autoload.d.ts +1 -1
- package/dist/services/_autoload.js +21 -46
- package/dist/services/_autoload.js.map +1 -1
- package/package.json +4 -4
- package/src/index.ts +5 -3
- package/src/services/_autoload.ts +42 -80
package/dist/index.js
CHANGED
|
@@ -10,6 +10,7 @@ import { Knifecycle, constant, initInitializerBuilder } from 'knifecycle';
|
|
|
10
10
|
import { DEFAULT_BUILD_INITIALIZER_PATH_MAP as BASE_DEFAULT_BUILD_INITIALIZER_PATH_MAP, initCompiler, } from '@whook/whook';
|
|
11
11
|
import initBuildAutoloader from './services/_autoload.js';
|
|
12
12
|
import { dereferenceOpenAPIOperations, getOpenAPIOperations, } from '@whook/http-router';
|
|
13
|
+
import { parseArgs } from '@whook/whook/dist/libs/args.js';
|
|
13
14
|
export const DEFAULT_BUILD_PARALLELISM = 10;
|
|
14
15
|
export const DEFAULT_BUILD_INITIALIZER_PATH_MAP = {
|
|
15
16
|
...BASE_DEFAULT_BUILD_INITIALIZER_PATH_MAP,
|
|
@@ -17,10 +18,11 @@ export const DEFAULT_BUILD_INITIALIZER_PATH_MAP = {
|
|
|
17
18
|
};
|
|
18
19
|
const cprAsync = promisify(cpr);
|
|
19
20
|
export async function prepareBuildEnvironment($ = new Knifecycle()) {
|
|
20
|
-
$.register(constant('INITIALIZER_PATH_MAP', DEFAULT_BUILD_INITIALIZER_PATH_MAP));
|
|
21
21
|
$.register(initInitializerBuilder);
|
|
22
22
|
$.register(initBuildAutoloader);
|
|
23
23
|
$.register(initCompiler);
|
|
24
|
+
$.register(constant('INITIALIZER_PATH_MAP', DEFAULT_BUILD_INITIALIZER_PATH_MAP));
|
|
25
|
+
$.register(constant('args', parseArgs([])));
|
|
24
26
|
$.register(constant('PORT', 1337));
|
|
25
27
|
$.register(constant('HOST', 'localhost'));
|
|
26
28
|
return $;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EACL,kCAAkC,IAAI,uCAAuC,EAC7E,YAAY,GACb,MAAM,cAAc,CAAC;AACtB,OAAO,mBAAmB,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EACL,4BAA4B,EAC5B,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,EACL,kCAAkC,IAAI,uCAAuC,EAC7E,YAAY,GACb,MAAM,cAAc,CAAC;AACtB,OAAO,mBAAmB,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EACL,4BAA4B,EAC5B,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAgB5B,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAE3D,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAC5C,MAAM,CAAC,MAAM,kCAAkC,GAAG;IAChD,GAAG,uCAAuC;IAC1C,GAAG,EAAE,2CAA2C;CACjD,CAAC;AAaF,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAIR,CAAC;AAEvB,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,IAAO,IAAI,UAAU,EAAO;IAE5B,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;IACnC,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAChC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IACzB,CAAC,CAAC,QAAQ,CACR,QAAQ,CAAC,sBAAsB,EAAE,kCAAkC,CAAC,CACrE,CAAC;IACF,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAE1C,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,wBAAwD;IAExD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,MAAM,wBAAwB,EAAE,CAAC;QAC3C,MAAM,EACJ,OAAO,EACP,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,GAAG,EACH,SAAS,EACT,GAAG,EACH,gBAAgB,GACjB,GAQG,MAAM,CAAC,CAAC,GAAG,CAAC;YACd,SAAS;YACT,oBAAoB;YACpB,aAAa;YACb,SAAS;YACT,UAAU;YACV,KAAK;YACL,WAAW;YACX,KAAK;YACL,kBAAkB;SACnB,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,EAAE,kDAAkD,CAAC,CAAC;QAEhE,MAAM,UAAU,GAAG,CACjB,MAAM,4BAA4B,CAChC,GAAG,EACH,oBAAoB,CAAqC,GAAG,CAAC,CAC9D,CACF,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;YACrB,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,iBAAiB,GACrB,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,CAAC;gBAEjE,OAAO,CACL,WAAW,KAAK,SAAS,CAAC,WAAW;oBACrC,WAAW,KAAK,iBAAiB,CAClC,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,EAAE,QAAQ,UAAU,CAAC,MAAM,yBAAyB,CAAC,CAAC;QAEnE,MAAM,iBAAiB,CACrB;YACE,OAAO;YACP,iBAAiB,EAAE,iBAAiB,IAAI,yBAAyB;YACjE,WAAW;YACX,QAAQ;YACR,GAAG;YACH,SAAS;YACT,gBAAgB;SACjB,EACD,UAAU,CACX,CAAC;QACF,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CACV,kCAAkC,eAAe,CAAC,GAAY,CAAC,EAAE,CAClE,CAAC;QACF,IAAI,CAAC,CAAC,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,EACE,OAAO,EACP,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,GAAG,EACH,SAAS,EACT,gBAAgB,GAQjB,EACD,UAAgE;IAEhE,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAE3D,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACvD,cAAc,CACZ;QACE,OAAO;QACP,WAAW;QACX,QAAQ;QACR,GAAG;QACH,gBAAgB;KACjB,EACD,SAAS,CACV,CACF,CACF,CAAC;IAEF,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAC1B,GAAG,CAAC,MAAM,EAAE,QAAQ,cAAc,CAAC,MAAM,mBAAmB,CAAC,CAAC;QAC9D,OAAO,iBAAiB,CACtB;YACE,OAAO;YACP,iBAAiB;YACjB,WAAW;YACX,QAAQ;YACR,GAAG;YACH,SAAS;YACT,gBAAgB;SACjB,EACD,cAAc,CACf,CAAC;IACJ,CAAC;IACD,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;AAC1C,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,EACE,OAAO,EACP,WAAW,EACX,QAAQ,EACR,GAAG,EACH,gBAAgB,GAOjB,EACD,SAA6D;IAE7D,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;IAElC,IAAI,CAAC;QACH,MAAM,WAAW,GAAuC,SAAS,CAC/D,SAAS,CACV,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QACtB,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC;QACjD,MAAM,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QACxD,MAAM,eAAe,GACnB,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW,CAAC;YACrD,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QAE9C,GAAG,CAAC,SAAS,EAAE,iBAAiB,aAAa,KAAK,eAAe,MAAM,CAAC,CAAC;QAEzE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACzC,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,kBAAkB,GAAG,CACzB,MAAM,gBAAgB,CAAC,CAAC,qBAAqB,eAAe,EAAE,CAAC,CAAC,CACjE,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,MAAM,gBAAgB,CACzC,qBAAqB,eAAe,EAAE,CACvC,CAAC;QAEF,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACzB,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,eAAe,CACb,EAAE,WAAW,EAAE,GAAG,EAAE,EACpB,UAAU,EACV,WAAW,CAAC,WAAW,IAAI,EAAE,CAC9B;YACD,UAAU,CACR,EAAE,GAAG,EAAE,EACP,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,EACjC,kBAAkB,CACnB;YACD,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,YAAY,CAAC;SAC/D,CAAC,CAAC;QACH,MAAM,gBAAgB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,OAAO,EAAE,mBAAmB,WAAW,MAAM,CAAC,CAAC;QACnD,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,GAAY,CAAC,CAAC,CAAC;QAClD,MAAM,MAAM,CAAC,IAAI,CAAC,GAAY,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAY;IAC1C,OAAO;;;;;;;kCAOyB,IAAI;;CAErC,CAAC;AACF,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,EAAE,QAAQ,EAAE,GAAG,EAAuD,EACtE,UAAkB,EAClB,WAA+C;IAE/C,MAAM,UAAU,GAAG,GAAG,UAAU,UAAU,CAAC;IAC3C,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,QAAQ,CACtD,UAAU,EACV,WAAW,CAAC,eAAe,CAC5B,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC,EAAE,QAAQ,CAAC;QACrE,QAAQ;YACN,CAAC,CAAC,UAAU,CACR,EAAE,GAAG,EAAE,EACP,IAAI,CAAC,UAAU,EAAE,SAAS,SAAS,MAAM,CAAC,EAC1C,QAAQ,CACT;YACH,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;KACtB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,EAAE,WAAW,EAAE,GAAG,EAA4C,EAC9D,UAAkB,EAClB,cAAwB,EAAE;IAE1B,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CACb,KAAK,EAAE,UAAU,EAAE,EAAE,CACnB,MAAM,SAAS,CACb,EAAE,GAAG,EAAE,EACP,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,EAC7C,IAAI,CAAC,UAAU,EAAE,cAAc,EAAE,UAAU,CAAC,CAC7C,CACJ,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,EAAE,GAAG,EAAuB,EAC5B,MAAc,EACd,WAAmB;IAEnB,IAAI,QAAQ,GAAuB,SAAS,CAAC;IAE7C,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QAE1B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEpC,MAAM,UAAU,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,QAAQ,GAAG,GAAa,CAAC;IAC3B,CAAC;IACD,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,QAAQ,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC/B,MAAM,QAAQ,CAAC;QACjB,CAAC;QACD,MAAM,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE;YAClC,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,EAAE,GAAG,EAAuB,EAC5B,IAAY,EACZ,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAErD,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,GAAG,CAAC,OAAO,EAAE,gCAAgC,IAAI,IAAI,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,OAAO,EAAE,yBAAyB,IAAI,IAAI,CAAC,CAAC;QAChD,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,GAAY,CAAC,CAAC,CAAC;QAClD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IACD,GAAG,CAAC,OAAO,EAAE,6BAA6B,IAAI,IAAI,CAAC,CAAC;IACpD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC"}
|
|
@@ -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 {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
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 ({
|
|
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
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
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
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
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":"AAAA,uDAAuD;AACvD,OAAO,EAAE,
|
|
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.
|
|
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.
|
|
52
|
+
"@whook/cors": "^18.0.3",
|
|
53
53
|
"@whook/http-router": "^18.0.0",
|
|
54
|
-
"@whook/whook": "^18.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": "
|
|
149
|
+
"gitHead": "7313f1c7c6a20f084654dd23f358190840f2a189"
|
|
150
150
|
}
|
package/src/index.ts
CHANGED
|
@@ -31,6 +31,7 @@ import type {
|
|
|
31
31
|
import type { OpenAPIV3_1 } from 'openapi-types';
|
|
32
32
|
import type { LogService } from 'common-services';
|
|
33
33
|
import type { CprOptions } from 'cpr';
|
|
34
|
+
import { parseArgs } from '@whook/whook/dist/libs/args.js';
|
|
34
35
|
|
|
35
36
|
export const DEFAULT_BUILD_PARALLELISM = 10;
|
|
36
37
|
export const DEFAULT_BUILD_INITIALIZER_PATH_MAP = {
|
|
@@ -58,12 +59,13 @@ const cprAsync = promisify(cpr) as (
|
|
|
58
59
|
export async function prepareBuildEnvironment<T extends Knifecycle>(
|
|
59
60
|
$: T = new Knifecycle() as T,
|
|
60
61
|
): Promise<T> {
|
|
61
|
-
$.register(
|
|
62
|
-
constant('INITIALIZER_PATH_MAP', DEFAULT_BUILD_INITIALIZER_PATH_MAP),
|
|
63
|
-
);
|
|
64
62
|
$.register(initInitializerBuilder);
|
|
65
63
|
$.register(initBuildAutoloader);
|
|
66
64
|
$.register(initCompiler);
|
|
65
|
+
$.register(
|
|
66
|
+
constant('INITIALIZER_PATH_MAP', DEFAULT_BUILD_INITIALIZER_PATH_MAP),
|
|
67
|
+
);
|
|
68
|
+
$.register(constant('args', parseArgs([])));
|
|
67
69
|
$.register(constant('PORT', 1337));
|
|
68
70
|
$.register(constant('HOST', 'localhost'));
|
|
69
71
|
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
-
import {
|
|
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 {
|
|
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
|
-
|
|
149
|
-
|
|
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
|
-
|
|
176
|
-
|
|
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
|
-
|
|
211
|
-
|
|
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
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
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
|
-
|
|
243
|
-
wrapInitializer(initializerWrapper as any, initAutoload),
|
|
205
|
+
wrapInitializer(initializerWrapper as any, initBuildAutoload),
|
|
244
206
|
);
|