@adonisjs/core 7.0.0-next.1 → 7.0.0-next.3

package/build/modules/ace/codemods.js

@@ -308,8 +308,16 @@ export class Codemods extends EventEmitter {
         const transformer = await this.#getCodeTransformer();
         const appPath = this.#app.makePath();
         const colors = this.#cliLogger.getColors();
-        const devDependencies = packages.filter((pkg) => pkg.isDevDependency).map(({ name }) => name);
-        const dependencies = packages.filter((pkg) => !pkg.isDevDependency).map(({ name }) => name);
+        const devDependencies = packages
+            .filter((pkg) => pkg.isDevDependency)
+            .map(({ name }) => {
+            return name.startsWith('@adonisjs/') ? `${name}@next` : name;
+        });
+        const dependencies = packages
+            .filter((pkg) => !pkg.isDevDependency)
+            .map(({ name }) => {
+            return name.startsWith('@adonisjs/') ? `${name}@next` : name;
+        });
         if (!transformer) {
             this.#cliLogger.warning('Cannot install packages. Install "@adonisjs/assembler" or manually install following packages');
             this.#cliLogger.log(`devDependencies: ${devDependencies.join(',')}`);

package/build/providers/edge_provider.js

@@ -71,6 +71,7 @@ export default class EdgeServiceProvider {
         edge.configure({ cache: app.inProduction });
         /**
          * Define Edge global helpers
+         * @deprecated
          */
         edge.global('route', function (...args) {
             return router.makeUrl(...args);
@@ -80,6 +81,15 @@ export default class EdgeServiceProvider {
         });
         edge.global('app', app);
         edge.global('config', edgeConfigResolver);
+        /**
+         * Route helpers
+         */
+        edge.global('urlFor', function (...args) {
+            return router.urlBuilder.urlFor(...args);
+        });
+        edge.global('signedUrlFor', function (...args) {
+            return router.urlBuilder.signedUrlFor(...args);
+        });
         /**
          * Creating a isolated instance of edge renderer
          */

package/build/src/assembler_hooks/index_entities.js

@@ -45,12 +45,18 @@ export function indexEntities(entities = {}) {
     const events = Object.assign({ enabled: true, source: 'app/events', importAlias: '#events' }, entities.events);
     const listeners = Object.assign({ enabled: true, source: 'app/listeners', importAlias: '#listeners' }, entities.listeners);
     const controllers = Object.assign({ enabled: true, source: 'app/controllers', importAlias: '#controllers' }, entities.controllers);
-    const transformers = Object.assign({ enabled: false, source: 'app/transformers', importAlias: '#transformers' }, entities.transformers);
+    const transformers = Object.assign({
+        enabled: false,
+        source: 'app/transformers',
+        importAlias: '#transformers',
+        withSharedProps: false,
+    }, entities.transformers);
     return {
         run(_, indexGenerator) {
             if (events.enabled) {
                 indexGenerator.add('events', {
                     source: events.source,
+                    disableLazyImports: true,
                     glob: events.glob,
                     as: 'barrelFile',
                     exportName: 'events',
@@ -95,7 +101,7 @@ export function indexEntities(entities = {}) {
                             },
                             transformValue: helpers.toImportPath,
                         });
-                        outputTransformerDataObjects(transformersList, buffer);
+                        outputTransformerDataObjects(transformersList, buffer, transformers.withSharedProps);
                     },
                     importAlias: transformers.importAlias,
                     output: '.adonisjs/client/data.d.ts',

package/build/src/types.d.ts

@@ -374,6 +374,7 @@ export type IndexEntitiesConfig = {
     };
     transformers?: {
         enabled?: boolean;
+        withSharedProps?: boolean;
         source?: string;
         importAlias?: string;
         glob?: string[];

package/build/src/utils.d.ts

@@ -57,4 +57,4 @@ export declare function importTypeScript(app: ApplicationService): Promise<typeo
  * //   }
  * // }
  */
-export declare function outputTransformerDataObjects(transformersList: RecursiveFileTree, buffer: Assembler.FileBuffer): Promise<void>;
+export declare function outputTransformerDataObjects(transformersList: RecursiveFileTree, buffer: Assembler.FileBuffer, withSharedProps: boolean): Promise<void>;

package/build/src/utils.js

@@ -71,9 +71,12 @@ export async function importTypeScript(app) {
  * //   }
  * // }
  */
-export async function outputTransformerDataObjects(transformersList, buffer) {
+export async function outputTransformerDataObjects(transformersList, buffer, withSharedProps) {
     const importsBuffer = buffer.create();
-    importsBuffer.write(`import { InferData } from '@adonisjs/core/types/transformers'`);
+    importsBuffer.write(`import type { InferData, InferVariants } from '@adonisjs/core/types/transformers'`);
+    if (withSharedProps) {
+        importsBuffer.write(`import type { InferSharedProps } from '@adonisjs/inertia/types'`);
+    }
     buffer.writeLine(importsBuffer);
     buffer.write('export namespace Data {').indent();
     /**
@@ -91,6 +94,9 @@ export async function outputTransformerDataObjects(transformersList, buffer) {
                 const importName = `${parents.join()}${key}Transformer`;
                 importsBuffer.write(`import ${importName} from '${value}'`);
                 buffer.write(`export type ${key} = InferData<${importName}>`);
+                buffer.write(`export namespace ${key} {`).indent();
+                buffer.write(`export type Variants = InferVariants<${importName}>`);
+                buffer.dedent().write('}');
             }
             else {
                 buffer.write(`export namespace ${key} {`).indent();
@@ -100,5 +106,9 @@ export async function outputTransformerDataObjects(transformersList, buffer) {
         });
     }
     generateNamespaceTree(transformersList, []);
+    if (withSharedProps) {
+        importsBuffer.write(`import type InertiaMiddleware from '#middleware/inertia_middleware'`);
+        buffer.write('export type SharedProps = InferSharedProps<InertiaMiddleware>');
+    }
     buffer.dedent().write('}');
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/core",
   "description": "Core of AdonisJS",
-  "version": "7.0.0-next.1",
+  "version": "7.0.0-next.3",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -84,7 +84,7 @@
     "index:commands": "node --import=@poppinss/ts-exec toolkit/main.js index build/commands"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^8.0.0-next.9",
+    "@adonisjs/assembler": "^8.0.0-next.10",
     "@adonisjs/eslint-config": "^3.0.0-next.1",
     "@adonisjs/prettier-config": "^1.4.5",
     "@adonisjs/tsconfig": "^2.0.0-next.0",
@@ -123,7 +123,7 @@
   },
   "dependencies": {
     "@adonisjs/ace": "^14.0.1-next.1",
-    "@adonisjs/application": "^9.0.0-next.8",
+    "@adonisjs/application": "^9.0.0-next.9",
     "@adonisjs/bodyparser": "^11.0.0-next.1",
     "@adonisjs/config": "^6.0.0-next.1",
     "@adonisjs/encryption": "^7.0.0-next.1",
@@ -148,7 +148,7 @@
     "string-width": "^8.1.0"
   },
   "peerDependencies": {
-    "@adonisjs/assembler": "^8.0.0-next.6",
+    "@adonisjs/assembler": "^8.0.0-next.10",
     "@vinejs/vine": "^3.0.0",
     "argon2": "^0.43.0",
     "bcrypt": "^6.0.0",