@adonisjs/session 7.0.0-13 → 7.0.0-15

package/package.json

@@ -1,21 +1,17 @@
 {
   "name": "@adonisjs/session",
   "description": "Session provider for AdonisJS",
-  "version": "7.0.0-13",
+  "version": "7.0.0-15",
   "engines": {
     "node": ">=18.16.0"
   },
   "main": "build/index.js",
   "type": "module",
   "files": [
-    "build/src",
-    "build/stubs",
-    "build/providers",
-    "build/factories",
-    "build/configure.d.ts",
-    "build/configure.js",
-    "build/index.d.ts",
-    "build/index.js"
+    "build",
+    "!build/bin",
+    "!build/tests",
+    "!build/tests_helpers"
   ],
   "exports": {
     ".": "./build/index.js",
@@ -33,9 +29,11 @@
     "test": "cross-env NODE_DEBUG=adonisjs:session c8 npm run quick:test",
     "clean": "del-cli build",
     "typecheck": "tsc --noEmit",
-    "copy:templates": "copyfiles \"stubs/**/*.stub\" build",
-    "compile": "npm run lint && npm run clean && tsc",
-    "build": "npm run compile && npm run copy:templates",
+    "copy:templates": "copyfiles \"stubs/**/*.stub\" --up=\"1\" build",
+    "precompile": "npm run lint && npm run clean",
+    "compile": "tsup-node && tsc --emitDeclarationOnly --declaration",
+    "postcompile": "npm run copy:templates",
+    "build": "npm run compile",
     "prepublishOnly": "npm run build",
     "lint": "eslint . --ext=.ts",
     "format": "prettier --write .",
@@ -45,50 +43,51 @@
     "quick:test": "node --enable-source-maps --loader=ts-node/esm bin/test.ts"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^6.1.3-25",
-    "@adonisjs/core": "^6.1.5-28",
-    "@adonisjs/eslint-config": "^1.1.8",
-    "@adonisjs/prettier-config": "^1.1.8",
-    "@adonisjs/redis": "^8.0.0-11",
-    "@adonisjs/tsconfig": "^1.1.8",
-    "@japa/api-client": "^2.0.0",
-    "@japa/assert": "^2.0.0",
-    "@japa/browser-client": "^2.0.0",
-    "@japa/file-system": "^2.0.0",
-    "@japa/plugin-adonisjs": "^2.0.0",
-    "@japa/runner": "^3.0.4",
-    "@japa/snapshot": "^2.0.0",
-    "@swc/core": "1.3.82",
-    "@types/node": "^20.8.7",
-    "@types/set-cookie-parser": "^2.4.4",
-    "@types/supertest": "^2.0.14",
-    "@vinejs/vine": "^1.6.0",
+    "@adonisjs/assembler": "^7.0.0-1",
+    "@adonisjs/core": "^6.1.5-36",
+    "@adonisjs/eslint-config": "^1.2.0",
+    "@adonisjs/prettier-config": "^1.2.0",
+    "@adonisjs/redis": "^8.0.0-14",
+    "@adonisjs/tsconfig": "^1.2.0",
+    "@japa/api-client": "^2.0.2",
+    "@japa/assert": "^2.1.0",
+    "@japa/browser-client": "^2.0.2",
+    "@japa/file-system": "^2.1.1",
+    "@japa/plugin-adonisjs": "^2.0.1",
+    "@japa/runner": "^3.1.1",
+    "@japa/snapshot": "^2.0.4",
+    "@swc/core": "^1.3.101",
+    "@types/node": "^20.10.5",
+    "@types/set-cookie-parser": "^2.4.7",
+    "@types/supertest": "^6.0.1",
+    "@vinejs/vine": "^1.7.0",
     "c8": "^8.0.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "edge.js": "^6.0.0-8",
-    "eslint": "^8.51.0",
+    "edge.js": "^6.0.0",
+    "eslint": "^8.56.0",
     "get-port": "^7.0.0",
     "github-label-sync": "^2.3.1",
     "husky": "^8.0.3",
-    "np": "^8.0.4",
-    "playwright": "^1.38.0",
-    "prettier": "^3.0.2",
+    "np": "^9.2.0",
+    "playwright": "^1.40.1",
+    "prettier": "^3.1.1",
     "set-cookie-parser": "^2.6.0",
     "supertest": "^6.3.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
+    "ts-node": "^10.9.2",
+    "tsup": "^8.0.1",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@poppinss/utils": "^6.5.0"
+    "@poppinss/utils": "^6.7.0"
   },
   "peerDependencies": {
-    "@adonisjs/core": "^6.1.5-28",
-    "@adonisjs/redis": "^8.0.0-11",
-    "@japa/api-client": "^2.0.0",
-    "@japa/browser-client": "^2.0.0",
-    "edge.js": "^6.0.0-8"
+    "@adonisjs/core": "^6.1.5-36",
+    "@adonisjs/redis": "^8.0.0-14",
+    "@japa/api-client": "^2.0.2",
+    "@japa/browser-client": "^2.0.2",
+    "edge.js": "^6.0.0"
   },
   "peerDependenciesMeta": {
     "@adonisjs/redis": {
@@ -148,5 +147,23 @@
       "factories/**",
       "bin/**"
     ]
+  },
+  "tsup": {
+    "entry": [
+      "./index.ts",
+      "./factories/main.ts",
+      "./providers/session_provider.ts",
+      "./src/session_middleware.ts",
+      "./src/plugins/edge.ts",
+      "./src/plugins/japa/api_client.ts",
+      "./src/plugins/japa/browser_client.ts",
+      "./src/client.ts"
+    ],
+    "outDir": "./build",
+    "clean": true,
+    "format": "esm",
+    "dts": false,
+    "sourcemap": true,
+    "target": "esnext"
   }
 }

package/build/configure.js

@@ -1,45 +0,0 @@
-/*
- * @adonisjs/session
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Configures the package
- */
-export async function configure(command) {
-    /**
-     * Publish config file
-     */
-    await command.publishStub('config.stub');
-    const codemods = await command.createCodemods();
-    /**
-     * Define environment variables
-     */
-    await codemods.defineEnvVariables({ SESSION_DRIVER: 'cookie' });
-    /**
-     * Define environment variables validations
-     */
-    await codemods.defineEnvValidations({
-        variables: {
-            SESSION_DRIVER: `Env.schema.enum(['cookie', 'memory'] as const)`,
-        },
-        leadingComment: 'Variables for configuring session package',
-    });
-    /**
-     * Register middleware
-     */
-    await codemods.registerMiddleware('router', [
-        {
-            path: '@adonisjs/session/session_middleware',
-        },
-    ]);
-    /**
-     * Register provider
-     */
-    await codemods.updateRcFile((rcFile) => {
-        rcFile.addProvider('@adonisjs/session/session_provider');
-    });
-}

package/build/factories/session_middleware_factory.js

@@ -1,48 +0,0 @@
-/*
- * @adonisjs/session
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { Emitter } from '@adonisjs/core/events';
-import { AppFactory } from '@adonisjs/core/factories/app';
-import { defineConfig } from '../index.js';
-import SessionMiddleware from '../src/session_middleware.js';
-/**
- * Exposes the API to create an instance of the session middleware
- * without additional plumbing
- */
-export class SessionMiddlewareFactory {
-    #config = {
-        store: 'memory',
-        stores: {},
-    };
-    #emitter;
-    #getApp() {
-        return new AppFactory().create(new URL('./', import.meta.url), () => { });
-    }
-    #getEmitter() {
-        return this.#emitter || new Emitter(this.#getApp());
-    }
-    /**
-     * Merge custom options
-     */
-    merge(options) {
-        if (options.config) {
-            this.#config = options.config;
-        }
-        if (options.emitter) {
-            this.#emitter = options.emitter;
-        }
-        return this;
-    }
-    /**
-     * Creates an instance of the session middleware
-     */
-    async create() {
-        const config = await defineConfig(this.#config).resolver(this.#getApp());
-        return new SessionMiddleware(config, this.#getEmitter());
-    }
-}

package/build/src/debug.js

@@ -1,10 +0,0 @@
-/*
- * @adonisjs/session
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { debuglog } from 'node:util';
-export default debuglog('adonisjs:session');

package/build/src/define_config.js

@@ -1,105 +0,0 @@
-/*
- * @adonisjs/session
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/// <reference types="@adonisjs/redis/redis_provider" />
-import string from '@poppinss/utils/string';
-import { configProvider } from '@adonisjs/core';
-import { InvalidArgumentsException } from '@poppinss/utils';
-import debug from './debug.js';
-import { MemoryStore } from './stores/memory.js';
-/**
- * Helper to normalize session config
- */
-export function defineConfig(config) {
-    debug('processing session config %O', config);
-    /**
-     * Make sure a store is defined
-     */
-    if (!config.store) {
-        throw new InvalidArgumentsException('Missing "store" property inside the session config');
-    }
-    /**
-     * Destructuring config with the default values. We pull out
-     * stores and cookie values, since we have to transform
-     * them in the output value.
-     */
-    const { stores, cookie, ...rest } = {
-        enabled: true,
-        age: '2h',
-        cookieName: 'adonis_session',
-        clearWithBrowser: false,
-        ...config,
-    };
-    const cookieOptions = { ...cookie };
-    /**
-     * Define maxAge property when session id cookie is
-     * not a session cookie.
-     */
-    if (!rest.clearWithBrowser) {
-        cookieOptions.maxAge = string.seconds.parse(rest.age);
-        debug('computing maxAge "%s" for session id cookie', cookieOptions.maxAge);
-    }
-    return configProvider.create(async (app) => {
-        const storesNames = Object.keys(config.stores);
-        /**
-         * List of stores with memory store always configured
-         */
-        const storesList = {
-            memory: () => new MemoryStore(),
-        };
-        /**
-         * Looping for stores and resolving them
-         */
-        for (let storeName of storesNames) {
-            const store = config.stores[storeName];
-            if (typeof store === 'function') {
-                storesList[storeName] = store;
-            }
-            else {
-                storesList[storeName] = await store.resolver(app);
-            }
-        }
-        const transformedConfig = {
-            ...rest,
-            cookie: cookieOptions,
-            stores: storesList,
-        };
-        debug('transformed session config %O', transformedConfig);
-        return transformedConfig;
-    });
-}
-/**
- * Inbuilt stores to store the session data.
- */
-export const stores = {
-    file: (config) => {
-        return configProvider.create(async () => {
-            const { FileStore } = await import('./stores/file.js');
-            return (_, sessionConfig) => {
-                return new FileStore(config, sessionConfig.age);
-            };
-        });
-    },
-    redis: (config) => {
-        return configProvider.create(async (app) => {
-            const { RedisStore } = await import('./stores/redis.js');
-            const redis = await app.container.make('redis');
-            return (_, sessionConfig) => {
-                return new RedisStore(redis.connection(config.connection), sessionConfig.age);
-            };
-        });
-    },
-    cookie: () => {
-        return configProvider.create(async () => {
-            const { CookieStore } = await import('./stores/cookie.js');
-            return (ctx, sessionConfig) => {
-                return new CookieStore(sessionConfig.cookie, ctx);
-            };
-        });
-    },
-};

package/build/src/errors.js

@@ -1,17 +0,0 @@
-/*
- * @adonisjs/session
- *
- * (c) AdonisJS
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-import { createError } from '@poppinss/utils';
-/**
- * Raised when session store is not mutable
- */
-export const E_SESSION_NOT_MUTABLE = createError('Session store is in readonly mode and cannot be mutated', 'E_SESSION_NOT_MUTABLE', 500);
-/**
- * Raised when session store has been initiated
- */
-export const E_SESSION_NOT_READY = createError('Session store has not been initiated. Make sure you have registered the session middleware', 'E_SESSION_NOT_READY', 500);