@adonisjs/core 7.0.0-next.2 → 7.0.0-next.4
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/build/providers/app_provider.js +2 -2
- package/build/src/assembler_hooks/index_entities.js +7 -2
- package/build/src/helpers/main.d.ts +1 -1
- package/build/src/helpers/main.js +1 -1
- package/build/src/types.d.ts +1 -0
- package/build/src/utils.d.ts +1 -1
- package/build/src/utils.js +13 -3
- package/package.json +3 -3
|
@@ -337,8 +337,8 @@ export default class AppServiceProvider {
|
|
|
337
337
|
*/
|
|
338
338
|
async boot() {
|
|
339
339
|
BaseEvent.useEmitter(await this.app.container.make('emitter'));
|
|
340
|
-
HttpContext.instanceProperty('serialize', function (
|
|
341
|
-
return serialize(
|
|
340
|
+
HttpContext.instanceProperty('serialize', function (value, container) {
|
|
341
|
+
return serialize(value, container ?? this.containerResolver);
|
|
342
342
|
});
|
|
343
343
|
}
|
|
344
344
|
/**
|
|
@@ -45,7 +45,12 @@ export function indexEntities(entities = {}) {
|
|
|
45
45
|
const events = Object.assign({ enabled: true, source: 'app/events', importAlias: '#events' }, entities.events);
|
|
46
46
|
const listeners = Object.assign({ enabled: true, source: 'app/listeners', importAlias: '#listeners' }, entities.listeners);
|
|
47
47
|
const controllers = Object.assign({ enabled: true, source: 'app/controllers', importAlias: '#controllers' }, entities.controllers);
|
|
48
|
-
const transformers = Object.assign({
|
|
48
|
+
const transformers = Object.assign({
|
|
49
|
+
enabled: false,
|
|
50
|
+
source: 'app/transformers',
|
|
51
|
+
importAlias: '#transformers',
|
|
52
|
+
withSharedProps: false,
|
|
53
|
+
}, entities.transformers);
|
|
49
54
|
return {
|
|
50
55
|
run(_, indexGenerator) {
|
|
51
56
|
if (events.enabled) {
|
|
@@ -96,7 +101,7 @@ export function indexEntities(entities = {}) {
|
|
|
96
101
|
},
|
|
97
102
|
transformValue: helpers.toImportPath,
|
|
98
103
|
});
|
|
99
|
-
outputTransformerDataObjects(transformersList, buffer);
|
|
104
|
+
outputTransformerDataObjects(transformersList, buffer, transformers.withSharedProps);
|
|
100
105
|
},
|
|
101
106
|
importAlias: transformers.importAlias,
|
|
102
107
|
output: '.adonisjs/client/data.d.ts',
|
|
@@ -37,7 +37,7 @@ export { default as base64 } from '@poppinss/utils/base64';
|
|
|
37
37
|
* Core utilities including function composition, secret management,
|
|
38
38
|
* safe equality comparison, and message building.
|
|
39
39
|
*/
|
|
40
|
-
export { compose, Secret, safeEqual, MessageBuilder } from '@poppinss/utils';
|
|
40
|
+
export { compose, Secret, safeEqual, MessageBuilder, defineStaticProperty } from '@poppinss/utils';
|
|
41
41
|
/**
|
|
42
42
|
* Verification token utility for creating secure tokens.
|
|
43
43
|
*/
|
|
@@ -45,7 +45,7 @@ export { default as base64 } from '@poppinss/utils/base64';
|
|
|
45
45
|
* Core utilities including function composition, secret management,
|
|
46
46
|
* safe equality comparison, and message building.
|
|
47
47
|
*/
|
|
48
|
-
export { compose, Secret, safeEqual, MessageBuilder } from '@poppinss/utils';
|
|
48
|
+
export { compose, Secret, safeEqual, MessageBuilder, defineStaticProperty } from '@poppinss/utils';
|
|
49
49
|
/**
|
|
50
50
|
* Verification token utility for creating secure tokens.
|
|
51
51
|
*/
|
package/build/src/types.d.ts
CHANGED
package/build/src/utils.d.ts
CHANGED
|
@@ -57,4 +57,4 @@ export declare function importTypeScript(app: ApplicationService): Promise<typeo
|
|
|
57
57
|
* // }
|
|
58
58
|
* // }
|
|
59
59
|
*/
|
|
60
|
-
export declare function outputTransformerDataObjects(transformersList: RecursiveFileTree, buffer: Assembler.FileBuffer): Promise<void>;
|
|
60
|
+
export declare function outputTransformerDataObjects(transformersList: RecursiveFileTree, buffer: Assembler.FileBuffer, withSharedProps: boolean): Promise<void>;
|
package/build/src/utils.js
CHANGED
|
@@ -71,9 +71,12 @@ export async function importTypeScript(app) {
|
|
|
71
71
|
* // }
|
|
72
72
|
* // }
|
|
73
73
|
*/
|
|
74
|
-
export async function outputTransformerDataObjects(transformersList, buffer) {
|
|
74
|
+
export async function outputTransformerDataObjects(transformersList, buffer, withSharedProps) {
|
|
75
75
|
const importsBuffer = buffer.create();
|
|
76
|
-
importsBuffer.write(`import { InferData } from '@adonisjs/core/types/transformers'`);
|
|
76
|
+
importsBuffer.write(`import type { InferData, InferVariants } from '@adonisjs/core/types/transformers'`);
|
|
77
|
+
if (withSharedProps) {
|
|
78
|
+
importsBuffer.write(`import type { InferSharedProps } from '@adonisjs/inertia/types'`);
|
|
79
|
+
}
|
|
77
80
|
buffer.writeLine(importsBuffer);
|
|
78
81
|
buffer.write('export namespace Data {').indent();
|
|
79
82
|
/**
|
|
@@ -89,8 +92,11 @@ export async function outputTransformerDataObjects(transformersList, buffer) {
|
|
|
89
92
|
const value = input[key];
|
|
90
93
|
if (typeof value === 'string') {
|
|
91
94
|
const importName = `${parents.join()}${key}Transformer`;
|
|
92
|
-
importsBuffer.write(`import ${importName} from '${value}'`);
|
|
95
|
+
importsBuffer.write(`import type ${importName} from '${value}'`);
|
|
93
96
|
buffer.write(`export type ${key} = InferData<${importName}>`);
|
|
97
|
+
buffer.write(`export namespace ${key} {`).indent();
|
|
98
|
+
buffer.write(`export type Variants = InferVariants<${importName}>`);
|
|
99
|
+
buffer.dedent().write('}');
|
|
94
100
|
}
|
|
95
101
|
else {
|
|
96
102
|
buffer.write(`export namespace ${key} {`).indent();
|
|
@@ -100,5 +106,9 @@ export async function outputTransformerDataObjects(transformersList, buffer) {
|
|
|
100
106
|
});
|
|
101
107
|
}
|
|
102
108
|
generateNamespaceTree(transformersList, []);
|
|
109
|
+
if (withSharedProps) {
|
|
110
|
+
importsBuffer.write(`import type InertiaMiddleware from '#middleware/inertia_middleware'`);
|
|
111
|
+
buffer.write('export type SharedProps = InferSharedProps<InertiaMiddleware>');
|
|
112
|
+
}
|
|
103
113
|
buffer.dedent().write('}');
|
|
104
114
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adonisjs/core",
|
|
3
3
|
"description": "Core of AdonisJS",
|
|
4
|
-
"version": "7.0.0-next.
|
|
4
|
+
"version": "7.0.0-next.4",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=24.0.0"
|
|
7
7
|
},
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
"index:commands": "node --import=@poppinss/ts-exec toolkit/main.js index build/commands"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
|
-
"@adonisjs/assembler": "^8.0.0-next.
|
|
87
|
+
"@adonisjs/assembler": "^8.0.0-next.12",
|
|
88
88
|
"@adonisjs/eslint-config": "^3.0.0-next.1",
|
|
89
89
|
"@adonisjs/prettier-config": "^1.4.5",
|
|
90
90
|
"@adonisjs/tsconfig": "^2.0.0-next.0",
|
|
@@ -132,7 +132,7 @@
|
|
|
132
132
|
"@adonisjs/fold": "^11.0.0-next.2",
|
|
133
133
|
"@adonisjs/hash": "^10.0.0-next.1",
|
|
134
134
|
"@adonisjs/health": "^3.0.0-next.0",
|
|
135
|
-
"@adonisjs/http-server": "^8.0.0-next.
|
|
135
|
+
"@adonisjs/http-server": "^8.0.0-next.8",
|
|
136
136
|
"@adonisjs/http-transformers": "^1.4.0",
|
|
137
137
|
"@adonisjs/logger": "^7.1.0-next.0",
|
|
138
138
|
"@adonisjs/repl": "^5.0.0-next.0",
|