crelte 0.5.15 → 0.6.0-alpha.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.
- package/dist/blocks/Blocks.svelte +5 -4
- package/dist/blocks/Blocks.svelte.d.ts +4 -19
- package/dist/blocks/Blocks.svelte.d.ts.map +1 -1
- package/dist/crelte.d.ts +2 -2
- package/dist/crelte.d.ts.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/init/InternalApp.d.ts.map +1 -1
- package/dist/init/InternalApp.js +2 -2
- package/dist/init/server.js +4 -4
- package/dist/loadData/loadData.d.ts +1 -1
- package/dist/loadData/loadData.d.ts.map +1 -1
- package/dist/node/index.d.ts.map +1 -1
- package/dist/node/index.js +15 -11
- package/dist/queries/Queries.d.ts +16 -27
- package/dist/queries/Queries.d.ts.map +1 -1
- package/dist/queries/Queries.js +13 -20
- package/dist/queries/gql.d.ts +2 -2
- package/dist/queries/gql.d.ts.map +1 -1
- package/dist/queries/gql.js +3 -2
- package/dist/queries/index.d.ts +13 -13
- package/dist/queries/index.d.ts.map +1 -1
- package/dist/queries/index.js +2 -2
- package/dist/queries/vars.d.ts +3 -3
- package/dist/queries/vars.d.ts.map +1 -1
- package/dist/queries/vars.js +3 -3
- package/dist/routing/route/BaseRoute.d.ts +4 -0
- package/dist/routing/route/BaseRoute.d.ts.map +1 -1
- package/dist/routing/route/BaseRoute.js +6 -0
- package/dist/routing/router/BaseRouter.d.ts.map +1 -1
- package/dist/routing/router/BaseRouter.js +4 -3
- package/dist/routing/router/ClientRouter.d.ts +1 -0
- package/dist/routing/router/ClientRouter.d.ts.map +1 -1
- package/dist/routing/router/ClientRouter.js +22 -7
- package/dist/server/CrelteServer.d.ts +1 -1
- package/dist/server/CrelteServer.d.ts.map +1 -1
- package/dist/server/ServerRouter.d.ts +1 -1
- package/dist/server/ServerRouter.d.ts.map +1 -1
- package/dist/server/queries/QueriesCaching.d.ts +0 -1
- package/dist/server/queries/QueriesCaching.d.ts.map +1 -1
- package/dist/server/queries/QueriesCaching.js +0 -2
- package/dist/server/queries/QueryGqlRoute.d.ts +2 -0
- package/dist/server/queries/QueryGqlRoute.d.ts.map +1 -1
- package/dist/server/queries/QueryGqlRoute.js +22 -14
- package/dist/server/queries/QueryHandleRoute.d.ts +1 -2
- package/dist/server/queries/QueryHandleRoute.d.ts.map +1 -1
- package/dist/server/queries/QueryHandleRoute.js +2 -2
- package/dist/server/queries/queries.d.ts.map +1 -1
- package/dist/server/queries/queries.js +2 -1
- package/dist/server/queries/routes.d.ts +3 -4
- package/dist/server/queries/routes.d.ts.map +1 -1
- package/dist/server/queries/routes.js +3 -3
- package/dist/server/shared.d.ts +5 -4
- package/dist/server/shared.d.ts.map +1 -1
- package/dist/server/shared.js +26 -16
- package/dist/ssr/SsrCache.d.ts +2 -2
- package/dist/ssr/SsrCache.d.ts.map +1 -1
- package/dist/ssr/SsrCache.js +10 -16
- package/dist/std/encdec/escaping.d.ts +2 -0
- package/dist/std/encdec/escaping.d.ts.map +1 -0
- package/dist/std/encdec/escaping.js +41 -0
- package/dist/std/encdec/index.d.ts +13 -0
- package/dist/std/encdec/index.d.ts.map +1 -0
- package/dist/std/encdec/index.js +15 -0
- package/dist/std/index.d.ts.map +1 -1
- package/dist/utils.d.ts +1 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +17 -0
- package/dist/vite/index.d.ts +1 -5
- package/dist/vite/index.d.ts.map +1 -1
- package/dist/vite/index.js +39 -79
- package/package.json +12 -7
- package/src/blocks/Blocks.svelte +4 -3
- package/src/crelte.ts +2 -2
- package/src/index.ts +2 -2
- package/src/init/InternalApp.ts +3 -4
- package/src/init/server.ts +4 -4
- package/src/loadData/loadData.ts +0 -2
- package/src/node/index.ts +24 -9
- package/src/queries/Queries.ts +31 -36
- package/src/queries/gql.ts +7 -3
- package/src/queries/index.ts +19 -16
- package/src/queries/vars.ts +5 -7
- package/src/routing/route/BaseRoute.ts +8 -7
- package/src/routing/router/BaseRouter.ts +6 -3
- package/src/routing/router/ClientRouter.ts +29 -8
- package/src/server/CrelteServer.ts +1 -1
- package/src/server/ServerRouter.ts +1 -1
- package/src/server/queries/QueriesCaching.ts +0 -2
- package/src/server/queries/QueryGqlRoute.ts +24 -20
- package/src/server/queries/QueryHandleRoute.ts +2 -6
- package/src/server/queries/queries.ts +2 -3
- package/src/server/queries/routes.ts +9 -6
- package/src/server/shared.ts +34 -16
- package/src/ssr/SsrCache.ts +13 -23
- package/src/std/encdec/escaping.ts +47 -0
- package/src/std/encdec/index.ts +16 -0
- package/src/std/index.ts +1 -6
- package/src/utils.ts +21 -0
- package/src/vite/index.ts +51 -87
- package/types.d.ts +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
<script lang="ts">import
|
|
2
|
-
|
|
1
|
+
<script lang="ts">import "./index.js";
|
|
2
|
+
// eslint-disable-next-line svelte/valid-compile
|
|
3
|
+
let { blocks, ...rest } = $props();
|
|
3
4
|
</script>
|
|
4
5
|
|
|
5
|
-
{#each blocks.each() as { mod, props }}
|
|
6
|
-
<
|
|
6
|
+
{#each blocks.each() as { mod: Mod, props }}
|
|
7
|
+
<Mod {...props} {...rest} />
|
|
7
8
|
{/each}
|
|
@@ -1,23 +1,8 @@
|
|
|
1
1
|
import { type BlocksInstance } from './index.js';
|
|
2
|
-
|
|
3
|
-
new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
|
|
4
|
-
$$bindings?: Bindings;
|
|
5
|
-
} & Exports;
|
|
6
|
-
(internal: unknown, props: Props & {
|
|
7
|
-
$$events?: Events;
|
|
8
|
-
$$slots?: Slots;
|
|
9
|
-
}): Exports & {
|
|
10
|
-
$set?: any;
|
|
11
|
-
$on?: any;
|
|
12
|
-
};
|
|
13
|
-
z_$$bindings?: Bindings;
|
|
14
|
-
}
|
|
15
|
-
declare const Blocks: $$__sveltets_2_IsomorphicComponent<{
|
|
16
|
-
[x: string]: any;
|
|
2
|
+
type $$ComponentProps = {
|
|
17
3
|
blocks: BlocksInstance;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
type Blocks = InstanceType<typeof Blocks>;
|
|
4
|
+
};
|
|
5
|
+
declare const Blocks: import("svelte").Component<$$ComponentProps, {}, "">;
|
|
6
|
+
type Blocks = ReturnType<typeof Blocks>;
|
|
22
7
|
export default Blocks;
|
|
23
8
|
//# sourceMappingURL=Blocks.svelte.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Blocks.svelte.d.ts","sourceRoot":"","sources":["../../src/blocks/Blocks.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"Blocks.svelte.d.ts","sourceRoot":"","sources":["../../src/blocks/Blocks.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhD,KAAK,gBAAgB,GAAI;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC;AAcrD,QAAA,MAAM,MAAM,sDAAwC,CAAC;AACrD,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;AACxC,eAAe,MAAM,CAAC"}
|
package/dist/crelte.d.ts
CHANGED
|
@@ -97,10 +97,10 @@ export type Crelte = {
|
|
|
97
97
|
/**
|
|
98
98
|
* returns an env variable from the craft/.env file.
|
|
99
99
|
* All env variables need to start with VITE_
|
|
100
|
-
* except ENDPOINT_URL,
|
|
100
|
+
* except ENDPOINT_URL, CRAFT_BASE_CP_URL and FRONTEND_URL
|
|
101
101
|
*/
|
|
102
102
|
getEnv(name: 'ENDPOINT_URL'): string;
|
|
103
|
-
getEnv(name: '
|
|
103
|
+
getEnv(name: 'CRAFT_BASE_CP_URL'): string;
|
|
104
104
|
getEnv(name: 'FRONTEND_URL'): string;
|
|
105
105
|
getEnv(name: string): string | null;
|
|
106
106
|
/**
|
package/dist/crelte.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crelte.d.ts","sourceRoot":"","sources":["../src/crelte.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,yCAAyC;AACzC,MAAM,MAAM,MAAM,GAAG;IACpB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAI3B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CASxE;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,MAAM,GAAG;IACpB;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEzB;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;OAEG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAEvC;;;;OAIG;IACH,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;IACrC,MAAM,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"crelte.d.ts","sourceRoot":"","sources":["../src/crelte.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -66,13 +66,13 @@ export declare function getEntry(): Readable<Entry>;
|
|
|
66
66
|
/**
|
|
67
67
|
* returns an env variable from the craft/.env file.
|
|
68
68
|
* All env variables need to start with VITE_
|
|
69
|
-
* except ENDPOINT_URL,
|
|
69
|
+
* except ENDPOINT_URL, CRAFT_BASE_CP_URL and FRONTEND_URL
|
|
70
70
|
*
|
|
71
71
|
* #### Note
|
|
72
72
|
* This only works during component initialisation.
|
|
73
73
|
*/
|
|
74
74
|
export declare function getEnv(name: 'ENDPOINT_URL'): string;
|
|
75
|
-
export declare function getEnv(name: '
|
|
75
|
+
export declare function getEnv(name: 'CRAFT_BASE_CP_URL'): string;
|
|
76
76
|
export declare function getEnv(name: 'FRONTEND_URL'): string;
|
|
77
77
|
export declare function getEnv(name: string): string | null;
|
|
78
78
|
/**
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EACN,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACN,KAAK,EACL,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EACN,KAAK,MAAM,EACX,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,GAClB,CAAC;AAEF,yCAAyC;AACzC,MAAM,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAE5C,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG;IAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;CAAE,CAAC;AAMlD;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,eAAe,CAa3C;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAExC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,IAAI,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EACN,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,MAAM,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EACN,KAAK,EACL,QAAQ,EACR,aAAa,EACb,UAAU,EACV,WAAW,EACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EACN,KAAK,MAAM,EACX,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,GAClB,CAAC;AAEF,yCAAyC;AACzC,MAAM,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAE5C,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG;IAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;CAAE,CAAC;AAMlD;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,eAAe,CAa3C;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,IAAI,QAAQ,CAEtC;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAExC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAE1C;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAAC;AAC1D,wBAAgB,MAAM,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAAC;AACrD,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAKpD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,QAAQ,CAAC,MAAM,CAAC,CAErD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,IAAI,SAAS,CAExC;AAED;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,QAIjD;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,KAAK,IAAI,QAIxD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalApp.d.ts","sourceRoot":"","sources":["../../src/init/InternalApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,GAAG;IACnB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE/C,cAAc,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEhC,SAAS,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAG3B,aAAa,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAIhC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,cAAc;IAE9B,OAAO,EAAE,GAAG,CAAC;IAEb,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;CAC3B;AAED,MAAM,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"InternalApp.d.ts","sourceRoot":"","sources":["../../src/init/InternalApp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,GAAG;IACnB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAE/C,cAAc,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEhC,SAAS,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAG3B,aAAa,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAIhC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,cAAc;IAE9B,OAAO,EAAE,GAAG,CAAC;IAEb,QAAQ,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;CAC3B;AAED,MAAM,MAAM,kBAAkB,GAC7B,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,cAAc,CAAC;AAElD,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,WAAW;IAC/B,KAAK,EAAE,GAAG,CAAC;IACX,eAAe,EAAE,eAAe,CAAC;gBAErB,KAAK,EAAE,GAAG;IAatB,IAAI,OAAO,IAAI,aAAa,EAAE,CAE7B;IAED,IAAI,cAAc,IAAI,QAAQ,CAAC,IAAI,CAAC,CAEnC;IAED,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI1B,IAAI,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,CAG9B;IAEK,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC;IA4BzD,IAAI,aAAa,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAI,CAE1C;CACD"}
|
package/dist/init/InternalApp.js
CHANGED
|
@@ -14,14 +14,14 @@ export default class InternalApp {
|
|
|
14
14
|
return this.inner.plugins ?? [];
|
|
15
15
|
}
|
|
16
16
|
get loadGlobalData() {
|
|
17
|
-
return this.inner.loadGlobalData ??
|
|
17
|
+
return this.inner.loadGlobalData ?? 'global';
|
|
18
18
|
}
|
|
19
19
|
init(crelte) {
|
|
20
20
|
this.inner.init?.(crelte);
|
|
21
21
|
}
|
|
22
22
|
get loadEntry() {
|
|
23
23
|
// if no loadEntry property was defined we expect a graphql entry file
|
|
24
|
-
return this.inner.loadEntry ??
|
|
24
|
+
return this.inner.loadEntry ?? 'entry';
|
|
25
25
|
}
|
|
26
26
|
async loadTemplate(entry) {
|
|
27
27
|
const modules = this.templateModules;
|
package/dist/init/server.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { loadFn, newQueries, onNewCrelteRequest, pluginsBeforeRender, pluginsBeforeRequest, setupPlugins, } from './shared.js';
|
|
2
2
|
import SsrComponents from '../ssr/SsrComponents.js';
|
|
3
|
-
import SsrCache from '../ssr/SsrCache.js';
|
|
3
|
+
import SsrCache, { ssrCacheExportToHead } from '../ssr/SsrCache.js';
|
|
4
4
|
import ServerCookies from '../cookies/ServerCookies.js';
|
|
5
5
|
import { svelteRender } from './svelteComponents.js';
|
|
6
6
|
import ServerRouter from '../routing/router/ServerRouter.js';
|
|
@@ -43,7 +43,7 @@ export async function main(data) {
|
|
|
43
43
|
data.serverData.viteEnv.forEach((v, k) => ssrCache.set(k, v));
|
|
44
44
|
const endpoint = data.serverData.endpoint;
|
|
45
45
|
ssrCache.set('ENDPOINT_URL', endpoint);
|
|
46
|
-
ssrCache.set('
|
|
46
|
+
ssrCache.set('CRAFT_BASE_CP_URL', data.serverData.craftUrl);
|
|
47
47
|
ssrCache.set('FRONTEND_URL', data.serverData.frontend);
|
|
48
48
|
const cookies = new ServerCookies(data.serverData.headers);
|
|
49
49
|
const bodyClass = new ServerBodyClass();
|
|
@@ -103,7 +103,7 @@ export async function main(data) {
|
|
|
103
103
|
});
|
|
104
104
|
bodyClass.z_populateSsrCache(ssrCache);
|
|
105
105
|
head += ssrComponents.toHead(data.serverData.ssrManifest);
|
|
106
|
-
head += crelte.ssrCache
|
|
106
|
+
head += ssrCacheExportToHead(crelte.ssrCache);
|
|
107
107
|
let htmlTemplate = data.serverData.htmlTemplate;
|
|
108
108
|
htmlTemplate = htmlTemplate.replace('<!--page-lang-->', route.site.language);
|
|
109
109
|
htmlTemplate = bodyClass.z_processHtmlTemplate(htmlTemplate);
|
|
@@ -153,7 +153,7 @@ export async function mainError(data) {
|
|
|
153
153
|
context,
|
|
154
154
|
});
|
|
155
155
|
head += ssrComponents.toHead(data.serverData.ssrManifest);
|
|
156
|
-
head += ssrCache
|
|
156
|
+
head += ssrCacheExportToHead(ssrCache);
|
|
157
157
|
let htmlTemplate = data.serverData.htmlTemplate;
|
|
158
158
|
htmlTemplate = htmlTemplate.replace('<!--page-lang-->', 'de');
|
|
159
159
|
const finalHtml = htmlTemplate
|
|
@@ -62,7 +62,7 @@ export interface LoadDataArray<A1 = any> extends Array<LoadData<A1>> {
|
|
|
62
62
|
* }
|
|
63
63
|
* ```
|
|
64
64
|
*/
|
|
65
|
-
export type LoadData<A1 = any> = LoadDataFn<A1> | Query | LoadDataObj<A1> | LoadDataArray<A1> |
|
|
65
|
+
export type LoadData<A1 = any> = LoadDataFn<A1> | Query | LoadDataObj<A1> | LoadDataArray<A1> | null | undefined;
|
|
66
66
|
export declare function callLoadData<A1 = any>(ld: LoadData<A1>, cr: CrelteRequest, arg1: A1, ...args: any[]): Promise<any>;
|
|
67
67
|
/**
|
|
68
68
|
* Spread the data of two loadData functions.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadData.d.ts","sourceRoot":"","sources":["../../src/loadData/loadData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAW,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,WAAW,UAAU,CAAC,EAAE,GAAG,GAAG;IACnC,CAAC,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;CAC1E;AAED,MAAM,WAAW,WAAW,CAAC,EAAE,GAAG,GAAG;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;CAC5B;AAGD,MAAM,WAAW,aAAa,CAAC,EAAE,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CAAG;AAKvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,MAAM,MAAM,QAAQ,CAAC,EAAE,GAAG,GAAG,IAC1B,UAAU,CAAC,EAAE,CAAC,GACd,KAAK,GACL,WAAW,CAAC,EAAE,CAAC,GACf,aAAa,CAAC,EAAE,CAAC,GACjB,
|
|
1
|
+
{"version":3,"file":"loadData.d.ts","sourceRoot":"","sources":["../../src/loadData/loadData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAW,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEvD,MAAM,WAAW,UAAU,CAAC,EAAE,GAAG,GAAG;IACnC,CAAC,EAAE,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;CAC1E;AAED,MAAM,WAAW,WAAW,CAAC,EAAE,GAAG,GAAG;IACpC,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;CAC5B;AAGD,MAAM,WAAW,aAAa,CAAC,EAAE,GAAG,GAAG,CAAE,SAAQ,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;CAAG;AAKvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,MAAM,MAAM,QAAQ,CAAC,EAAE,GAAG,GAAG,IAC1B,UAAU,CAAC,EAAE,CAAC,GACd,KAAK,GACL,WAAW,CAAC,EAAE,CAAC,GACf,aAAa,CAAC,EAAE,CAAC,GACjB,IAAI,GACJ,SAAS,CAAC;AAOb,wBAAsB,YAAY,CAAC,EAAE,GAAG,GAAG,EAC1C,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,EAChB,EAAE,EAAE,aAAa,EACjB,IAAI,EAAE,EAAE,EACR,GAAG,IAAI,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,GAAG,CAAC,CA6Bd;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,EAAE,GAAG,GAAG,EACrC,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,GACpB,UAAU,CAAC,EAAE,CAAC,CAUhB"}
|
package/dist/node/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAqEA;;;;GAIG;AACH,wBAA8B,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,iBA8G3E"}
|
package/dist/node/index.js
CHANGED
|
@@ -2,7 +2,7 @@ import http from 'node:http';
|
|
|
2
2
|
import path, { join } from 'node:path';
|
|
3
3
|
import fs from 'node:fs/promises';
|
|
4
4
|
import { createReadStream } from 'node:fs';
|
|
5
|
-
import { initEnvData, initSites, modRender, modRenderError, } from '../server/shared.js';
|
|
5
|
+
import { initEnvData, initSites, initRequestSites, modRender, modRenderError, } from '../server/shared.js';
|
|
6
6
|
import ServerRouter from '../server/ServerRouter.js';
|
|
7
7
|
import { fileURLToPath } from 'node:url';
|
|
8
8
|
import { initQueryRoutes } from '../server/queries/queries.js';
|
|
@@ -17,12 +17,14 @@ async function readSitesCache() {
|
|
|
17
17
|
async function writeSitesCache(data) {
|
|
18
18
|
return await writeFile(localDir('sites.json'), JSON.stringify(data));
|
|
19
19
|
}
|
|
20
|
-
async function initRouter(serverMod, env) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
async function initRouter(serverMod, env, sites) {
|
|
21
|
+
if (!sites) {
|
|
22
|
+
sites = await initSites(env, {
|
|
23
|
+
enabled: process.env.NODE_ENV === 'production',
|
|
24
|
+
writeSitesCache,
|
|
25
|
+
readSitesCache,
|
|
26
|
+
});
|
|
27
|
+
}
|
|
26
28
|
const router = new ServerRouter(env.endpointUrl, env.frontendUrl, env.env, sites, {
|
|
27
29
|
endpointToken: env.endpointToken,
|
|
28
30
|
});
|
|
@@ -75,16 +77,18 @@ export default async function createServer(serverMod, buildTime) {
|
|
|
75
77
|
if (routesError || !router || !sites) {
|
|
76
78
|
throw routesError ?? new Error('Router not initialized');
|
|
77
79
|
}
|
|
78
|
-
const
|
|
80
|
+
const requestSites = await initRequestSites(env, sites, req);
|
|
81
|
+
const requestRouter = requestSites === sites
|
|
82
|
+
? router
|
|
83
|
+
: (await initRouter(serverMod, env, requestSites))[1];
|
|
84
|
+
const routeResp = await requestRouter.z_handle(req);
|
|
79
85
|
if (routeResp) {
|
|
80
86
|
await webResponseToResponse(routeResp, res);
|
|
81
87
|
return;
|
|
82
88
|
}
|
|
83
89
|
if (await basicAuthCheck(req, res, env))
|
|
84
90
|
return;
|
|
85
|
-
const response = await modRender(env,
|
|
86
|
-
ssrManifest,
|
|
87
|
-
});
|
|
91
|
+
const response = await modRender(env, requestSites, serverMod, template, req, { ssrManifest });
|
|
88
92
|
await webResponseToResponse(response, res);
|
|
89
93
|
};
|
|
90
94
|
http.createServer(async (nodeReq, res) => {
|
|
@@ -14,39 +14,22 @@ export type QueriesOptions = {
|
|
|
14
14
|
/**
|
|
15
15
|
* A GraphQL query
|
|
16
16
|
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
* Alternatively you can use the {@link namedQuery} function to create
|
|
23
|
-
* a {@link NamedQuery}.
|
|
17
|
+
* When importing a graphql file you will get a string with the name of the
|
|
18
|
+
* query or you can use the {@link gql} template function to create
|
|
19
|
+
* an {@link GqlQuery}.
|
|
20
|
+
* Alternatively you can use the name of the query directly, note thought
|
|
21
|
+
* that this will not reload when you're query changes.
|
|
24
22
|
*/
|
|
25
|
-
export type Query =
|
|
23
|
+
export type Query = string | GqlQuery;
|
|
26
24
|
/**
|
|
27
25
|
* You should never create this type directly. It is returned from
|
|
28
26
|
* the {@link gql} template function.
|
|
29
27
|
*/
|
|
30
|
-
export type
|
|
28
|
+
export type GqlQuery = {
|
|
31
29
|
path?: string;
|
|
32
30
|
query: string;
|
|
33
31
|
};
|
|
34
|
-
/**
|
|
35
|
-
* Always create this object via the {@link namedQuery} function
|
|
36
|
-
*/
|
|
37
|
-
export type NamedQuery = {
|
|
38
|
-
queryName: string;
|
|
39
|
-
};
|
|
40
|
-
/**
|
|
41
|
-
* Create a NamedQuery for the given server query name.
|
|
42
|
-
*
|
|
43
|
-
* Prefer importing a graphql file instead.
|
|
44
|
-
*
|
|
45
|
-
* #### Note
|
|
46
|
-
* This needs to match the name of the js/ts file.
|
|
47
|
-
*/
|
|
48
|
-
export declare function namedQuery(name: string): NamedQuery;
|
|
49
|
-
/** Returns true if the passed object is a GraphQlQuery */
|
|
32
|
+
/** Returns true if the passed object is a Query */
|
|
50
33
|
export declare function isQuery(obj: any): obj is Query;
|
|
51
34
|
/**
|
|
52
35
|
* Options to configure the request
|
|
@@ -64,10 +47,16 @@ export type QueryOptions = {
|
|
|
64
47
|
*/
|
|
65
48
|
bearerToken?: string;
|
|
66
49
|
/**
|
|
67
|
-
* Configure caching
|
|
50
|
+
* Configure Crelte's local query caching.
|
|
68
51
|
* @default true
|
|
69
52
|
*/
|
|
70
53
|
caching?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* Allow Craft's configured GraphQL caching. Set false to bypass it.
|
|
56
|
+
* Does not affect Crelte's caching.
|
|
57
|
+
* @default true
|
|
58
|
+
*/
|
|
59
|
+
craftCaching?: boolean;
|
|
71
60
|
/**
|
|
72
61
|
* Usually automatically set
|
|
73
62
|
*/
|
|
@@ -99,7 +88,7 @@ export default class Queries {
|
|
|
99
88
|
*/
|
|
100
89
|
static new(endpoint: string, frontend?: string | null, ssrCache?: SsrCache, opts?: QueriesOptions): Queries;
|
|
101
90
|
/**
|
|
102
|
-
* Create a new Queries instance that always intented to call an
|
|
91
|
+
* Create a new Queries instance that is always intented to call an
|
|
103
92
|
* external GraphQl endpoint.
|
|
104
93
|
*/
|
|
105
94
|
static newExternal(endpoint: string, bearerToken?: string): Queries;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queries.d.ts","sourceRoot":"","sources":["../../src/queries/Queries.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAa,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"Queries.d.ts","sourceRoot":"","sources":["../../src/queries/Queries.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAa,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEhE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC5B,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEtC;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,mDAAmD;AACnD,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,KAAK,CAO9C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,YAAY,GAAG;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO;IAC3B,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,KAAK,CAAgC;IAE7C,OAAO,CAAC,OAAO,CAAiB;IAEhC,OAAO;IAUP;;;;;;;;OAQG;IACH,MAAM,CAAC,GAAG,CACT,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,QAAQ,GAAE,QAAyB,EACnC,IAAI,GAAE,cAAmB,GACvB,OAAO;IAQV;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO;IAQnE;;;;;;;OAOG;IACG,KAAK,CACV,KAAK,EAAE,KAAK,EACZ,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EAClC,IAAI,GAAE,YAAiB,GACrB,OAAO,CAAC,OAAO,CAAC;IA2BnB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,OAAO;CAGxB"}
|
package/dist/queries/Queries.js
CHANGED
|
@@ -1,21 +1,11 @@
|
|
|
1
1
|
import SsrCache, { calcKey as ssrCacheCalcKey } from '../ssr/SsrCache.js';
|
|
2
2
|
import QueryError from './QueryError.js';
|
|
3
|
-
/**
|
|
4
|
-
* Create a NamedQuery for the given server query name.
|
|
5
|
-
*
|
|
6
|
-
* Prefer importing a graphql file instead.
|
|
7
|
-
*
|
|
8
|
-
* #### Note
|
|
9
|
-
* This needs to match the name of the js/ts file.
|
|
10
|
-
*/
|
|
11
|
-
export function namedQuery(name) {
|
|
12
|
-
return { queryName: name };
|
|
13
|
-
}
|
|
14
|
-
/** Returns true if the passed object is a GraphQlQuery */
|
|
3
|
+
/** Returns true if the passed object is a Query */
|
|
15
4
|
export function isQuery(obj) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
5
|
+
return (typeof obj === 'string' ||
|
|
6
|
+
(typeof obj === 'object' &&
|
|
7
|
+
obj !== null &&
|
|
8
|
+
typeof obj.query === 'string'));
|
|
19
9
|
}
|
|
20
10
|
/**
|
|
21
11
|
* With queries you can execute GraphQl queries, either directly
|
|
@@ -46,7 +36,7 @@ export default class Queries {
|
|
|
46
36
|
return new Queries(new Inner(endpoint, frontend, ssrCache, opts), opts?.route ?? null, null);
|
|
47
37
|
}
|
|
48
38
|
/**
|
|
49
|
-
* Create a new Queries instance that always intented to call an
|
|
39
|
+
* Create a new Queries instance that is always intented to call an
|
|
50
40
|
* external GraphQl endpoint.
|
|
51
41
|
*/
|
|
52
42
|
static newExternal(endpoint, bearerToken) {
|
|
@@ -78,6 +68,7 @@ export default class Queries {
|
|
|
78
68
|
bearerToken,
|
|
79
69
|
xCraftSiteId,
|
|
80
70
|
caching: opts.caching ?? true,
|
|
71
|
+
craftCaching: opts.craftCaching ?? true,
|
|
81
72
|
});
|
|
82
73
|
}
|
|
83
74
|
/**
|
|
@@ -153,12 +144,12 @@ class Inner {
|
|
|
153
144
|
}
|
|
154
145
|
async queryNotCached(query, vars, opts) {
|
|
155
146
|
let logName, url;
|
|
156
|
-
if ('
|
|
147
|
+
if (typeof query === 'string') {
|
|
157
148
|
if (!this.frontend)
|
|
158
149
|
throw new Error('only inline queries supported');
|
|
159
|
-
logName = `query (server: ${query
|
|
150
|
+
logName = `query (server: ${query})`;
|
|
160
151
|
url = new URL(this.frontend);
|
|
161
|
-
url.pathname = '/queries/' + query
|
|
152
|
+
url.pathname = '/queries/' + query;
|
|
162
153
|
}
|
|
163
154
|
else {
|
|
164
155
|
logName = `query (${query.path ?? 'unknown'})`;
|
|
@@ -175,6 +166,8 @@ class Inner {
|
|
|
175
166
|
headers['Authorization'] = 'Bearer ' + opts.bearerToken;
|
|
176
167
|
if (opts.xCraftSiteId)
|
|
177
168
|
headers['X-Craft-Site'] = opts.xCraftSiteId.toString();
|
|
169
|
+
if (!opts.craftCaching)
|
|
170
|
+
headers['X-Craft-GQL-Cache'] = 'no-cache';
|
|
178
171
|
if (this.loggingRequests) {
|
|
179
172
|
console.log(logName + ' to:', url.toString(), vars, headers);
|
|
180
173
|
headers['X-Debug'] = 'enable';
|
|
@@ -183,7 +176,7 @@ class Inner {
|
|
|
183
176
|
if (this.loggingTiming)
|
|
184
177
|
timing = Date.now();
|
|
185
178
|
let body;
|
|
186
|
-
if ('
|
|
179
|
+
if (typeof query === 'string') {
|
|
187
180
|
body = vars;
|
|
188
181
|
}
|
|
189
182
|
else {
|
package/dist/queries/gql.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { GqlQuery } from './Queries.js';
|
|
2
2
|
/**
|
|
3
3
|
* Create a GraphQL query string with variables.
|
|
4
4
|
* @param strings
|
|
@@ -9,5 +9,5 @@ import { InlineQuery } from './Queries.js';
|
|
|
9
9
|
* const query = gql`query ($id: ID!) { page(id: $id) { id } }`;
|
|
10
10
|
* ```
|
|
11
11
|
*/
|
|
12
|
-
export declare function gql(strings: TemplateStringsArray | string[] | string, ...keys: unknown[]):
|
|
12
|
+
export declare function gql(strings: TemplateStringsArray | string[] | string, ...keys: unknown[]): GqlQuery;
|
|
13
13
|
//# sourceMappingURL=gql.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../../src/queries/gql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../../src/queries/gql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC;;;;;;;;;GASG;AACH,wBAAgB,GAAG,CAClB,OAAO,EAAE,oBAAoB,GAAG,MAAM,EAAE,GAAG,MAAM,EACjD,GAAG,IAAI,EAAE,OAAO,EAAE,GAChB,QAAQ,CA2BV"}
|
package/dist/queries/gql.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { isQuery } from './Queries.js';
|
|
2
1
|
/**
|
|
3
2
|
* Create a GraphQL query string with variables.
|
|
4
3
|
* @param strings
|
|
@@ -18,7 +17,9 @@ export function gql(strings, ...keys) {
|
|
|
18
17
|
if (typeof keys[i] !== 'undefined') {
|
|
19
18
|
const variable = keys[i];
|
|
20
19
|
// nesting support
|
|
21
|
-
if (
|
|
20
|
+
if (typeof variable === 'object' &&
|
|
21
|
+
variable !== null &&
|
|
22
|
+
'query' in variable) {
|
|
22
23
|
query += variable.query;
|
|
23
24
|
}
|
|
24
25
|
else if (typeof variable === 'string') {
|
package/dist/queries/index.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import Queries, {
|
|
1
|
+
import Queries, { GqlQuery, isQuery, QueriesOptions, Query, QueryOptions } from '../queries/Queries.js';
|
|
2
2
|
import type CrelteServerRequest from '../server/CrelteServer.js';
|
|
3
|
-
import ServerRouter from '../server/ServerRouter.js';
|
|
4
3
|
import { gql } from './gql.js';
|
|
5
4
|
import QueryError, { QueryErrorResponse } from './QueryError.js';
|
|
6
5
|
import { QueryVar, ValidIf, vars, varsIdsEqual } from './vars.js';
|
|
7
|
-
export { Queries, type QueriesOptions, type QueryOptions, type Query, type
|
|
6
|
+
export { Queries, type QueriesOptions, type QueryOptions, type Query, type GqlQuery, isQuery, QueryError, type QueryErrorResponse, gql, vars, type ValidIf, QueryVar, varsIdsEqual, };
|
|
8
7
|
/** @hidden */
|
|
9
8
|
export type InferQueryVarType<T> = T extends QueryVar<infer U> ? U : never;
|
|
10
9
|
/** @hidden */
|
|
@@ -25,12 +24,12 @@ export type InferVariableTypes<T> = {
|
|
|
25
24
|
* category: vars.id()
|
|
26
25
|
* };
|
|
27
26
|
*
|
|
28
|
-
* export const validVars: ValidVars<typeof variables> = (vars,
|
|
27
|
+
* export const validVars: ValidVars<typeof variables> = (vars, csr) => {
|
|
29
28
|
* if (!vars.category === 5) throw new Error('category needs to be 5');
|
|
30
29
|
* };
|
|
31
30
|
* ```
|
|
32
31
|
*/
|
|
33
|
-
export type ValidVars<T extends Record<string, QueryVar<any>>> = (vars: InferVariableTypes<T>,
|
|
32
|
+
export type ValidVars<T extends Record<string, QueryVar<any>>> = (vars: InferVariableTypes<T>, csr: CrelteServerRequest) => void | boolean;
|
|
34
33
|
/**
|
|
35
34
|
* Defines when a query can safely be cached.
|
|
36
35
|
*
|
|
@@ -44,22 +43,23 @@ export type ValidVars<T extends Record<string, QueryVar<any>>> = (vars: InferVar
|
|
|
44
43
|
* };
|
|
45
44
|
*
|
|
46
45
|
* export const caching: Caching<typeof variables> =
|
|
47
|
-
* (queryResponse, variables) => !!queryResponse.entries.length;
|
|
46
|
+
* (queryResponse, variables, csr) => !!queryResponse.entries.length;
|
|
48
47
|
* ```
|
|
49
48
|
*/
|
|
50
|
-
export type Caching<T extends Record<string, QueryVar<any>> = Record<string, QueryVar<any>>> = boolean | ((response: any, vars: InferVariableTypes<T
|
|
49
|
+
export type Caching<T extends Record<string, QueryVar<any>> = Record<string, QueryVar<any>>> = boolean | ((response: any, vars: InferVariableTypes<T>, csr: CrelteServerRequest) => boolean);
|
|
51
50
|
/** use {@link Transfrom} */
|
|
52
|
-
export type TransformFn<T extends Record<string, QueryVar<any>> = Record<string, QueryVar<any>>> = (response: any, vars: InferVariableTypes<T
|
|
51
|
+
export type TransformFn<T extends Record<string, QueryVar<any>> = Record<string, QueryVar<any>>> = (response: any, vars: InferVariableTypes<T>, csr: CrelteServerRequest) => void | any | Promise<void | any>;
|
|
53
52
|
/**
|
|
54
53
|
* Transforms the query response before it is returned or cached.
|
|
55
54
|
*
|
|
56
55
|
* #### Example
|
|
57
56
|
* ```ts
|
|
58
|
-
* export const transform: Transform<typeof variables> =
|
|
59
|
-
*
|
|
60
|
-
* entry
|
|
61
|
-
*
|
|
62
|
-
*
|
|
57
|
+
* export const transform: Transform<typeof variables> =
|
|
58
|
+
* (response, vars, csr) => {
|
|
59
|
+
* for (const entry of response.entries) {
|
|
60
|
+
* entry.title = entry.title.toUpperCase();
|
|
61
|
+
* }
|
|
62
|
+
* };
|
|
63
63
|
* ```
|
|
64
64
|
*/
|
|
65
65
|
export type Transform<T extends Record<string, QueryVar<any>> = Record<string, QueryVar<any>>, F extends TransformFn<T> = TransformFn<T>> = (response: any, vars: InferVariableTypes<T>, csr: CrelteServerRequest) => Awaited<ReturnType<F>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EACf,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/queries/index.ts"],"names":[],"mappings":"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"}
|
package/dist/queries/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import Queries, { isQuery,
|
|
1
|
+
import Queries, { isQuery, } from '../queries/Queries.js';
|
|
2
2
|
import { gql } from './gql.js';
|
|
3
3
|
import QueryError from './QueryError.js';
|
|
4
4
|
import { QueryVar, vars, varsIdsEqual } from './vars.js';
|
|
5
|
-
export { Queries,
|
|
5
|
+
export { Queries, isQuery, QueryError, gql, vars, QueryVar, varsIdsEqual, };
|
package/dist/queries/vars.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import CrelteServerRequest from '../server/CrelteServer.js';
|
|
2
2
|
export declare const vars: {
|
|
3
3
|
/**
|
|
4
4
|
* Any is not validated except for nullability
|
|
@@ -57,7 +57,7 @@ export declare const vars: {
|
|
|
57
57
|
*/
|
|
58
58
|
siteId: () => QueryVar<number>;
|
|
59
59
|
};
|
|
60
|
-
export type ValidIf<T> = (v: T,
|
|
60
|
+
export type ValidIf<T> = (v: T, csr: CrelteServerRequest) => boolean;
|
|
61
61
|
export declare class QueryVar<T = any> {
|
|
62
62
|
private name;
|
|
63
63
|
private type;
|
|
@@ -79,7 +79,7 @@ export declare class QueryVar<T = any> {
|
|
|
79
79
|
* the passed function will not be called.
|
|
80
80
|
*/
|
|
81
81
|
validIf(fn: ValidIf<T>): QueryVar<T>;
|
|
82
|
-
validValue(v: any,
|
|
82
|
+
validValue(v: any, csr: CrelteServerRequest): T | null;
|
|
83
83
|
/**
|
|
84
84
|
* @hidden
|
|
85
85
|
* Internal method to set the name of the variable
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../src/queries/vars.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../src/queries/vars.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,2BAA2B,CAAC;AAE5D,eAAO,MAAM,IAAI;IAChB;;OAEG;eACM,QAAQ,CAAC,GAAG,CAAC;IAEtB;;OAEG;kBACS,QAAQ,CAAC,MAAM,CAAC;IAE5B;;OAEG;kBACS,QAAQ,CAAC,MAAM,CAAC;IAE5B;;;;;;;;OAQG;mBACU,QAAQ,CAAC,MAAM,EAAE,CAAC;IAE/B;;;;;;;;OAQG;cACK,QAAQ,CAAC,MAAM,CAAC;IAExB;;;;;;;;;;;;;;;;;;OAkBG;eACM,QAAQ,CAAC,MAAM,EAAE,CAAC;IAE3B;;OAEG;kBACS,QAAQ,CAAC,MAAM,CAAC;CAI5B,CAAC;AAIF,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC;AAErE,qBAAa,QAAQ,CAAC,CAAC,GAAG,GAAG;IAC5B,OAAO,CAAC,IAAI,CAAgB;IAC5B,OAAO,CAAC,IAAI,CAAyD;IACrE,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,SAAS,CAAa;;IAU9B,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;IAK7B,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;IAK1B,EAAE,IAAI,QAAQ,CAAC,MAAM,CAAC;IAKtB,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;IAKzB,QAAQ,IAAI,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC;IAK9B,OAAO,CAAC,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAK9B;;;;;OAKG;IACH,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAKpC,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,mBAAmB,GAAG,CAAC,GAAG,IAAI;IAoGtD;;;OAGG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAKpC,YAAY;CACZ;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,QAAQ,CAMhD;AAOD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,YAAY,CAC3B,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,EAC9B,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,GACvC,OAAO,CAWT"}
|
package/dist/queries/vars.js
CHANGED
|
@@ -56,7 +56,7 @@ export const vars = {
|
|
|
56
56
|
*/
|
|
57
57
|
siteId: () => new QueryVar()
|
|
58
58
|
.number()
|
|
59
|
-
.validIf((num,
|
|
59
|
+
.validIf((num, csr) => !!csr.sites.find(site => site.id === num)),
|
|
60
60
|
};
|
|
61
61
|
export class QueryVar {
|
|
62
62
|
name;
|
|
@@ -109,7 +109,7 @@ export class QueryVar {
|
|
|
109
109
|
this.validIfFn = fn;
|
|
110
110
|
return this;
|
|
111
111
|
}
|
|
112
|
-
validValue(v,
|
|
112
|
+
validValue(v, csr) {
|
|
113
113
|
// undefined is treated as null
|
|
114
114
|
if (typeof v === 'undefined')
|
|
115
115
|
v = null;
|
|
@@ -174,7 +174,7 @@ export class QueryVar {
|
|
|
174
174
|
default:
|
|
175
175
|
throw new Error('uknown type ' + this.type);
|
|
176
176
|
}
|
|
177
|
-
if (!this.validIfFn(v,
|
|
177
|
+
if (!this.validIfFn(v, csr))
|
|
178
178
|
throw new Error(`variable ${this.name} is not valid`);
|
|
179
179
|
return v;
|
|
180
180
|
}
|
|
@@ -209,6 +209,10 @@ export default class BaseRoute {
|
|
|
209
209
|
* The context is not cloned in the clone call and will be the same object.
|
|
210
210
|
*/
|
|
211
211
|
setContext<T>(key: string, value: T | null | undefined): void;
|
|
212
|
+
/**
|
|
213
|
+
* Returns the site preview token, or null if it is missing or empty.
|
|
214
|
+
*/
|
|
215
|
+
getSiteToken(): string | null;
|
|
212
216
|
/**
|
|
213
217
|
* Returns true if the route is in live preview mode
|
|
214
218
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseRoute.d.ts","sourceRoot":"","sources":["../../../src/routing/route/BaseRoute.ts"],"names":[],"mappings":"AAMA,OAAO,IAAI,MAAM,YAAY,CAAC;AAG9B,MAAM,MAAM,gBAAgB,GAAG;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"BaseRoute.d.ts","sourceRoot":"","sources":["../../../src/routing/route/BaseRoute.ts"],"names":[],"mappings":"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"}
|