aeria-sdk 0.0.58 → 0.0.60

package/dist/http.js

@@ -6,10 +6,11 @@ const storage_js_1 = require("./storage.js");
 const request = (config, url, payload, _requestConfig) => {
     const requestConfig = Object.assign({}, _requestConfig);
     requestConfig.requestTransformer ??= async (url, payload, _params) => {
-        const params = Object.assign({}, _params);
+        const params = Object.assign({
+            headers: {},
+        }, _params);
         const auth = (0, storage_js_1.getStorage)(config).get('auth');
-        if (auth?.token) {
-            params.headers ??= {};
+        if (auth?.token && !params.headers.authorization) {
             switch (auth.token.type) {
                 case 'bearer': {
                     params.headers.authorization = `Bearer ${auth.token.content}`;

package/dist/http.mjs

@@ -4,10 +4,11 @@ import { getStorage } from "./storage.mjs";
 export const request = (config, url, payload, _requestConfig) => {
   const requestConfig = Object.assign({}, _requestConfig);
   requestConfig.requestTransformer ??= async (url2, payload2, _params) => {
-    const params = Object.assign({}, _params);
+    const params = Object.assign({
+      headers: {}
+    }, _params);
     const auth = getStorage(config).get("auth");
-    if (auth?.token) {
-      params.headers ??= {};
+    if (auth?.token && !params.headers.authorization) {
       switch (auth.token.type) {
         case "bearer": {
           params.headers.authorization = `Bearer ${auth.token.content}`;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { left, right, isLeft, isRight, unwrapEither, unsafe, } from '@aeriajs/common/either';
+export * from './auth.js';
 export * from './topLevel.js';
 export * from './constants.js';
 export * from './http.js';

package/dist/index.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "isLeft", { enumerable: true, get: function () {
 Object.defineProperty(exports, "isRight", { enumerable: true, get: function () { return either_1.isRight; } });
 Object.defineProperty(exports, "unwrapEither", { enumerable: true, get: function () { return either_1.unwrapEither; } });
 Object.defineProperty(exports, "unsafe", { enumerable: true, get: function () { return either_1.unsafe; } });
+__exportStar(require("./auth.js"), exports);
 __exportStar(require("./topLevel.js"), exports);
 __exportStar(require("./constants.js"), exports);
 __exportStar(require("./http.js"), exports);

package/dist/index.mjs

@@ -7,6 +7,7 @@ export {
   unwrapEither,
   unsafe
 } from "@aeriajs/common/either";
+export * from "./auth.mjs";
 export * from "./topLevel.mjs";
 export * from "./constants.mjs";
 export * from "./http.mjs";

package/dist/mirror.js

@@ -35,7 +35,7 @@ ${config.integrated
       }
     }\n`}
 declare module 'aeria-sdk' {
-  import { TopLevelObject, TLOFunctions } from 'aeria-sdk'
+  import { TopLevelObject, TLOFunctions, AuthenticationPayload } from 'aeria-sdk'
 
   type UnionToIntersection<T> = (T extends any ? ((x: T) => 0) : never) extends ((x: infer R) => 0)
     ? R
@@ -79,10 +79,12 @@ declare module 'aeria-sdk' {
     ? UnionToIntersection<Endpoints[keyof Endpoints]>
     : never
 
-  type StrongelyTypedTLO = TopLevelObject & Endpoints
+  type TopLevelFunction = (auth?: AuthenticationPayload) => TopLevelObject & Endpoints
+  declare const aeria: TopLevelFunction
 
   export const url: string
-  export const aeria: StrongelyTypedTLO
+  export const aeria: TopLevelFunction
+  export default aeria
 }
 \n`;
 };
@@ -115,8 +117,8 @@ const writeMirrorFiles = async (mirror, config, filesPath = process.cwd()) => {
 };
 exports.writeMirrorFiles = writeMirrorFiles;
 const mirrorRemotely = async (config) => {
-    const api = (0, topLevel_js_1.topLevel)(config);
-    const mirror = (0, common_1.deserialize)(await api.describe.POST({
+    const aeria = (0, topLevel_js_1.topLevel)(config);
+    const mirror = (0, common_1.deserialize)(await aeria().describe.POST({
         router: true,
     }));
     return (0, exports.writeMirrorFiles)(mirror, config);

package/dist/mirror.mjs

@@ -31,7 +31,7 @@ ${config.integrated ? "" : `declare global {
     }
 `}
 declare module 'aeria-sdk' {
-  import { TopLevelObject, TLOFunctions } from 'aeria-sdk'
+  import { TopLevelObject, TLOFunctions, AuthenticationPayload } from 'aeria-sdk'
 
   type UnionToIntersection<T> = (T extends any ? ((x: T) => 0) : never) extends ((x: infer R) => 0)
     ? R
@@ -75,10 +75,12 @@ declare module 'aeria-sdk' {
     ? UnionToIntersection<Endpoints[keyof Endpoints]>
     : never
 
-  type StrongelyTypedTLO = TopLevelObject & Endpoints
+  type TopLevelFunction = (auth?: AuthenticationPayload) => TopLevelObject & Endpoints
+  declare const aeria: TopLevelFunction
 
   export const url: string
-  export const aeria: StrongelyTypedTLO
+  export const aeria: TopLevelFunction
+  export default aeria
 }
 
 `;
@@ -111,8 +113,8 @@ export const writeMirrorFiles = async (mirror, config, filesPath = process.cwd()
   await writeFile(path.join(runtimeBase, "runtime.mjs"), runtimeEsm(config));
 };
 export const mirrorRemotely = async (config) => {
-  const api = topLevel(config);
-  const mirror = deserialize(await api.describe.POST({
+  const aeria = topLevel(config);
+  const mirror = deserialize(await aeria().describe.POST({
     router: true
   }));
   return writeMirrorFiles(mirror, config);

package/dist/topLevel.d.ts

@@ -1,19 +1,11 @@
 import type { RequestMethod } from '@aeriajs/types';
 import type { InstanceConfig } from './types.js';
-import { type AuthenticationPayload } from './auth.js';
-type UserFunctions = {
-    user: TLOFunctions & {
-        authenticate: (payload: AuthenticationPayload) => Promise<any>;
-        signout: () => Promise<void>;
-    };
-};
 export type TLOFunctions = {
     [P: string]: Record<RequestMethod, ((payload?: any) => Promise<any>) & TLOFunctions>;
 };
-export type TopLevelObject = UserFunctions & {
+export type TopLevelObject = {
     describe: {
         POST: (...args: any) => Promise<any>;
     };
 };
-export declare const topLevel: (config: InstanceConfig) => TopLevelObject;
-export {};
+export declare const topLevel: (config: InstanceConfig) => (bearerToken?: string) => TopLevelObject;

package/dist/topLevel.js

@@ -1,25 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.topLevel = void 0;
-const auth_js_1 = require("./auth.js");
 const http_js_1 = require("./http.js");
 const utils_js_1 = require("./utils.js");
-const topLevel = (config) => {
-    const proxify = (target, parent) => new Proxy(target, {
-        get: (_, key) => {
+const proxify = (config, _target, bearerToken, parent) => {
+    return new Proxy(_target, {
+        get: (target, key) => {
             if (typeof key === 'symbol') {
                 return target[key];
             }
-            switch (`${parent}/${key}`) {
-                case 'user/authenticate': return (0, auth_js_1.authenticate)(config);
-                case 'user/signout': return (0, auth_js_1.signout)(config);
-            }
-            const endpoint = parent;
             const fn = async (payload) => {
                 const method = key;
                 const requestConfig = {
                     params: {
                         method,
+                        headers: {},
                     },
                 };
                 if (method !== 'GET' && method !== 'HEAD') {
@@ -29,15 +24,22 @@ const topLevel = (config) => {
                         };
                     }
                 }
-                const response = await (0, http_js_1.request)(config, `${(0, utils_js_1.publicUrl)(config)}/${endpoint}`, payload, requestConfig);
+                if (bearerToken) {
+                    requestConfig.params.headers.authorization = `Bearer ${bearerToken}`;
+                }
+                const response = await (0, http_js_1.request)(config, `${(0, utils_js_1.publicUrl)(config)}/${parent}`, payload, requestConfig);
                 return response.data;
             };
             const path = parent
                 ? `${parent}/${key}`
                 : key;
-            return proxify(fn, path);
+            return proxify(config, fn, bearerToken, path);
         },
     });
-    return proxify({});
+};
+const topLevel = (config) => {
+    return (bearerToken) => {
+        return proxify(config, {}, bearerToken);
+    };
 };
 exports.topLevel = topLevel;

package/dist/topLevel.mjs

@@ -1,25 +1,18 @@
 "use strict";
-import { authenticate, signout } from "./auth.mjs";
 import { request } from "./http.mjs";
 import { publicUrl } from "./utils.mjs";
-export const topLevel = (config) => {
-  const proxify = (target, parent) => new Proxy(target, {
-    get: (_, key) => {
+const proxify = (config, _target, bearerToken, parent) => {
+  return new Proxy(_target, {
+    get: (target, key) => {
       if (typeof key === "symbol") {
         return target[key];
       }
-      switch (`${parent}/${key}`) {
-        case "user/authenticate":
-          return authenticate(config);
-        case "user/signout":
-          return signout(config);
-      }
-      const endpoint = parent;
       const fn = async (payload) => {
         const method = key;
         const requestConfig = {
           params: {
-            method
+            method,
+            headers: {}
           }
         };
         if (method !== "GET" && method !== "HEAD") {
@@ -29,17 +22,24 @@ export const topLevel = (config) => {
             };
           }
         }
+        if (bearerToken) {
+          requestConfig.params.headers.authorization = `Bearer ${bearerToken}`;
+        }
         const response = await request(
           config,
-          `${publicUrl(config)}/${endpoint}`,
+          `${publicUrl(config)}/${parent}`,
           payload,
           requestConfig
         );
         return response.data;
       };
       const path = parent ? `${parent}/${key}` : key;
-      return proxify(fn, path);
+      return proxify(config, fn, bearerToken, path);
     }
   });
-  return proxify({});
+};
+export const topLevel = (config) => {
+  return (bearerToken) => {
+    return proxify(config, {}, bearerToken);
+  };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aeria-sdk",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -20,10 +20,12 @@
   ],
   "exports": {
     ".": {
+      "webpack": "./dist/index.js",
       "import": "./dist/index.mjs",
       "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
+    "./next": "./dist/index.js",
     "./types": {
       "types": "./types.d.ts"
     },
@@ -54,12 +56,12 @@
     }
   },
   "devDependencies": {
-    "@aeriajs/common": "^0.0.37",
-    "@aeriajs/types": "^0.0.34"
+    "@aeriajs/common": "link:../common",
+    "@aeriajs/types": "link:../types"
   },
   "peerDependencies": {
-    "@aeriajs/common": "^0.0.37",
-    "@aeriajs/types": "^0.0.34"
+    "@aeriajs/common": "^0.0.38",
+    "@aeriajs/types": "^0.0.35"
   },
   "scripts": {
     "test": "echo skipping",