aeria-sdk 0.0.6 → 0.0.7

package/dist/cjs/auth.d.ts

@@ -1,6 +1,6 @@
 import type { InstanceConfig } from './types';
 export type AuthenticationResult = {
-    user: any;
+    user: Collections['user']['item'];
     token: {
         type: 'bearer';
         content: string;

package/dist/cjs/auth.js

@@ -11,7 +11,7 @@ const authenticate = (config) => async (payload) => {
     const resultEither = response.data;
     if ((0, common_1.isRight)(resultEither)) {
         const result = (0, common_1.unwrapEither)(resultEither);
-        (0, storage_1.getStorage)(config).set('auth', JSON.stringify(result));
+        (0, storage_1.getStorage)(config).set('auth', result);
     }
     return resultEither;
 };

package/dist/cjs/http.js

@@ -7,10 +7,7 @@ const request = (config, url, payload, _requestConfig) => {
     const requestConfig = Object.assign({}, _requestConfig);
     requestConfig.requestTransformer ??= async (url, payload, _params) => {
         const params = Object.assign({}, _params);
-        const authVal = (0, storage_1.getStorage)(config).get('auth');
-        const auth = authVal
-            ? JSON.parse(authVal)
-            : {};
+        const auth = (0, storage_1.getStorage)(config).get('auth') || {};
         if (auth.token) {
             params.headers ??= {};
             switch (auth.token.type) {

package/dist/cjs/mirror.js

@@ -12,18 +12,11 @@ const utils_1 = require("./utils");
 const mirrorDts = (mirrorObj) => {
     const collections = mirrorObj.descriptions;
     return `import type {
-  InferSchema,
+  InferProperty,
   InferResponse,
   SchemaWithId,
   MakeEndpoint,
-  CollectionDocument,
-  GetPayload,
-  GetAllPayload,
-  InsertPayload,
-  RemovePayload,
-  RemoveAllPayload,
-  UploadPayload,
-  RemoveFilePayload,
+  RequestMethod,
   CollectionFunctions
 
 } from '@sonata-api/types'
@@ -48,14 +41,19 @@ declare module 'aeria-sdk' {
     : never
 
   type Endpoints = {
-    [Route in keyof MirrorRouter]: MirrorRouter[Route] extends infer RouteContract
-      ? RouteContract extends [infer RoutePayload, infer RouteResponse]
-        ? RoutePayload extends null
-          ? MakeEndpoint<Route, InferResponse<RouteResponse>, undefined>
-          : MakeEndpoint<Route, InferResponse<RouteResponse>, InferSchema<RoutePayload>>
-        : RouteContract extends Record<string, any>
-          ? MakeEndpoint<Route, any, InferSchema<RouteContract>>
-          : MakeEndpoint<Route>
+    [Route in keyof MirrorRouter]: {
+      [Method in keyof MirrorRouter[Route]]: Method extends RequestMethod
+        ? MirrorRouter[Route][Method] extends infer RouteContract
+          ? RouteContract extends
+            | { response: infer RouteResponse }
+            | { payload: infer RoutePayload  }
+            | { query: infer RoutePayload  }
+            ? MakeEndpoint<Route, Method, InferResponse<RouteResponse>, InferProperty<RoutePayload>>
+            : MakeEndpoint<Route, Method>
+          : never
+        : never
+    } extends infer Methods
+      ? Methods[keyof Methods]
       : never
   } extends infer Endpoints
     ? UnionToIntersection<Endpoints[keyof Endpoints]>
@@ -63,7 +61,13 @@ declare module 'aeria-sdk' {
 
   type StrongelyTypedTLO = TopLevelObject & Endpoints & {
     [K in keyof MirrorDescriptions]: SchemaWithId<MirrorDescriptions[K]> extends infer Document
-      ? CollectionFunctions<Document> & Omit<TLOFunctions, keyof Functions>
+      ? CollectionFunctions<Document> extends infer Functions
+        ? Omit<TLOFunctions, keyof Functions> & {
+          [P in keyof Functions]: {
+            POST: Functions[P]
+          }
+        }
+        : never
       : never
   }
 
@@ -72,12 +76,11 @@ declare module 'aeria-sdk' {
 }\n
   `;
 };
-const runtimeCjs = (config) => `const { Aeria, getStorage } from 'aeria-sdk'
-const config = ${JSON.stringify(config)}
+const runtimeCjs = (config) => `const config = ${JSON.stringify(config)}
 exports.config = config
 exports.url = '${(0, utils_1.apiUrl)(config)}'
-exports.aeria = Aeria(config)
-exports.storage = getStorage(config)
+exports.aeria = require('aeria-sdk/topLevel').topLevel(config)
+exports.storage = require('aeria-sdk/storage').getStorage(config)
 \n`;
 exports.runtimeCjs = runtimeCjs;
 const runtimeEsm = (config) => `import { Aeria, getStorage } from 'aeria-sdk'
@@ -90,7 +93,7 @@ exports.runtimeEsm = runtimeEsm;
 const mirror = async (config) => {
     const api = (0, topLevel_1.topLevel)(config);
     const runtimeBase = path_1.default.dirname(require.resolve('aeria-sdk'));
-    const mirror = (0, common_1.deserialize)(await api.describe({
+    const mirror = (0, common_1.deserialize)(await api.describe.POST({
         router: true
     }));
     await (0, promises_1.mkdir)(runtimeBase, { recursive: true });

package/dist/cjs/runtime.d.ts

@@ -3,7 +3,7 @@ export declare const instanceConfig: InstanceConfig;
 export declare const url = "";
 export declare const aeria: {};
 export declare const storage: {
-    get: (key: string) => string | null;
+    get: (key: "auth") => import("./auth").AuthenticationResult;
     remove: (key: string) => void;
-    set: (key: string, value: string) => void;
+    set: (key: string, value: any) => void;
 };

package/dist/cjs/storage.d.ts

@@ -1,8 +1,9 @@
 import type { InstanceConfig } from './types';
+import type { AuthenticationResult } from './auth';
 export declare const storageMemo: Record<string, string>;
 export declare const storageKey: (key: string, config: InstanceConfig) => string;
 export declare const getStorage: (config: InstanceConfig) => {
-    get: (key: string) => string | null;
+    get: (key: 'auth') => AuthenticationResult;
     remove: (key: string) => void;
-    set: (key: string, value: string) => void;
+    set: (key: string, value: any) => void;
 };

package/dist/cjs/storage.js

@@ -13,15 +13,19 @@ const getStorage = (config) => {
         : config.storage.strategy === 'localStorage' && !('localStorage' in globalThis)
             ? 'memo'
             : config.storage.strategy;
+    function get(key) {
+        switch (strategy) {
+            case 'memo':
+                return exports.storageMemo[key];
+            case 'localStorage':
+                const value = localStorage.getItem((0, exports.storageKey)(key, config));
+                return value
+                    ? JSON.parse(value)
+                    : null;
+        }
+    }
     return {
-        get: (key) => {
-            switch (strategy) {
-                case 'memo':
-                    return exports.storageMemo[key];
-                case 'localStorage':
-                    return localStorage.getItem((0, exports.storageKey)(key, config));
-            }
-        },
+        get,
         remove: (key) => {
             switch (strategy) {
                 case 'memo':
@@ -38,7 +42,8 @@ const getStorage = (config) => {
                     exports.storageMemo[key] = value;
                     break;
                 case 'localStorage':
-                    return localStorage.setItem((0, exports.storageKey)(key, config), value);
+                    const serialized = JSON.stringify(value);
+                    return localStorage.setItem((0, exports.storageKey)(key, config), serialized);
             }
         },
     };

package/dist/cjs/topLevel.d.ts

@@ -1,4 +1,5 @@
 import type { InstanceConfig } from './types';
+import { RequestMethod } from '@sonata-api/types';
 import { type AuthenticationPayload } from './auth';
 type UserFunctions = {
     user: TLOFunctions & {
@@ -7,11 +8,12 @@ type UserFunctions = {
     };
 };
 export type TLOFunctions = {
-    [P in string]: ((payload?: any) => Promise<any>) & TLOFunctions;
+    [P: string]: Record<RequestMethod, ((payload?: any) => Promise<any>) & TLOFunctions>;
 };
 export type TopLevelObject = UserFunctions & {
-    describe: (...args: any) => Promise<any>;
-    $currentUser: any;
+    describe: {
+        POST: (...args: any) => Promise<any>;
+    };
 };
 export declare const topLevel: (config: InstanceConfig) => TopLevelObject;
 export {};

package/dist/cjs/topLevel.js

@@ -10,20 +10,32 @@ const topLevel = (config) => {
             if (typeof key === 'symbol') {
                 return target[key];
             }
-            const endpoint = parent
-                ? `${parent}/${key}`
-                : `${key}`;
-            switch (endpoint) {
+            switch (`${parent}/${key}`) {
                 case 'user/authenticate': return (0, auth_1.authenticate)(config);
                 case 'user/signout': return (0, auth_1.signout)(config);
             }
+            const endpoint = parent;
             const fn = async (payload) => {
-                const response = payload
-                    ? await (0, http_1.request)(config, `${(0, utils_1.apiUrl)(config)}/${endpoint}`, payload)
-                    : await (0, http_1.request)(config, `${(0, utils_1.apiUrl)(config)}/${endpoint}`);
+                const method = key;
+                const requestConfig = {
+                    params: {
+                        method
+                    }
+                };
+                if (method !== 'GET' && method !== 'HEAD') {
+                    if (payload) {
+                        requestConfig.params.headers = {
+                            'content-type': 'application/json'
+                        };
+                    }
+                }
+                const response = await (0, http_1.request)(config, `${(0, utils_1.apiUrl)(config)}/${endpoint}`, payload, requestConfig);
                 return response.data;
             };
-            return proxify(fn, endpoint);
+            const path = parent
+                ? `${parent}/${key}`
+                : key;
+            return proxify(fn, path);
         }
     });
     return proxify({});

package/dist/esm/auth.d.ts

@@ -1,6 +1,6 @@
 import type { InstanceConfig } from './types';
 export type AuthenticationResult = {
-    user: any;
+    user: Collections['user']['item'];
     token: {
         type: 'bearer';
         content: string;

package/dist/esm/auth.js

@@ -8,7 +8,7 @@ export const authenticate = (config) => async (payload) => {
     const resultEither = response.data;
     if (isRight(resultEither)) {
         const result = unwrapEither(resultEither);
-        getStorage(config).set('auth', JSON.stringify(result));
+        getStorage(config).set('auth', result);
     }
     return resultEither;
 };

package/dist/esm/http.js

@@ -4,10 +4,7 @@ export const request = (config, url, payload, _requestConfig) => {
     const requestConfig = Object.assign({}, _requestConfig);
     requestConfig.requestTransformer ??= async (url, payload, _params) => {
         const params = Object.assign({}, _params);
-        const authVal = getStorage(config).get('auth');
-        const auth = authVal
-            ? JSON.parse(authVal)
-            : {};
+        const auth = getStorage(config).get('auth') || {};
         if (auth.token) {
             params.headers ??= {};
             switch (auth.token.type) {

package/dist/esm/mirror.js

@@ -6,18 +6,11 @@ import { apiUrl } from './utils';
 const mirrorDts = (mirrorObj) => {
     const collections = mirrorObj.descriptions;
     return `import type {
-  InferSchema,
+  InferProperty,
   InferResponse,
   SchemaWithId,
   MakeEndpoint,
-  CollectionDocument,
-  GetPayload,
-  GetAllPayload,
-  InsertPayload,
-  RemovePayload,
-  RemoveAllPayload,
-  UploadPayload,
-  RemoveFilePayload,
+  RequestMethod,
   CollectionFunctions
 
 } from '@sonata-api/types'
@@ -42,14 +35,19 @@ declare module 'aeria-sdk' {
     : never
 
   type Endpoints = {
-    [Route in keyof MirrorRouter]: MirrorRouter[Route] extends infer RouteContract
-      ? RouteContract extends [infer RoutePayload, infer RouteResponse]
-        ? RoutePayload extends null
-          ? MakeEndpoint<Route, InferResponse<RouteResponse>, undefined>
-          : MakeEndpoint<Route, InferResponse<RouteResponse>, InferSchema<RoutePayload>>
-        : RouteContract extends Record<string, any>
-          ? MakeEndpoint<Route, any, InferSchema<RouteContract>>
-          : MakeEndpoint<Route>
+    [Route in keyof MirrorRouter]: {
+      [Method in keyof MirrorRouter[Route]]: Method extends RequestMethod
+        ? MirrorRouter[Route][Method] extends infer RouteContract
+          ? RouteContract extends
+            | { response: infer RouteResponse }
+            | { payload: infer RoutePayload  }
+            | { query: infer RoutePayload  }
+            ? MakeEndpoint<Route, Method, InferResponse<RouteResponse>, InferProperty<RoutePayload>>
+            : MakeEndpoint<Route, Method>
+          : never
+        : never
+    } extends infer Methods
+      ? Methods[keyof Methods]
       : never
   } extends infer Endpoints
     ? UnionToIntersection<Endpoints[keyof Endpoints]>
@@ -57,7 +55,13 @@ declare module 'aeria-sdk' {
 
   type StrongelyTypedTLO = TopLevelObject & Endpoints & {
     [K in keyof MirrorDescriptions]: SchemaWithId<MirrorDescriptions[K]> extends infer Document
-      ? CollectionFunctions<Document> & Omit<TLOFunctions, keyof Functions>
+      ? CollectionFunctions<Document> extends infer Functions
+        ? Omit<TLOFunctions, keyof Functions> & {
+          [P in keyof Functions]: {
+            POST: Functions[P]
+          }
+        }
+        : never
       : never
   }
 
@@ -66,12 +70,11 @@ declare module 'aeria-sdk' {
 }\n
   `;
 };
-export const runtimeCjs = (config) => `const { Aeria, getStorage } from 'aeria-sdk'
-const config = ${JSON.stringify(config)}
+export const runtimeCjs = (config) => `const config = ${JSON.stringify(config)}
 exports.config = config
 exports.url = '${apiUrl(config)}'
-exports.aeria = Aeria(config)
-exports.storage = getStorage(config)
+exports.aeria = require('aeria-sdk/topLevel').topLevel(config)
+exports.storage = require('aeria-sdk/storage').getStorage(config)
 \n`;
 export const runtimeEsm = (config) => `import { Aeria, getStorage } from 'aeria-sdk'
 export const config = ${JSON.stringify(config)}
@@ -82,7 +85,7 @@ export const storage = getStorage(config)
 export const mirror = async (config) => {
     const api = topLevel(config);
     const runtimeBase = path.dirname(require.resolve('aeria-sdk'));
-    const mirror = deserialize(await api.describe({
+    const mirror = deserialize(await api.describe.POST({
         router: true
     }));
     await mkdir(runtimeBase, { recursive: true });

package/dist/esm/runtime.d.ts

@@ -3,7 +3,7 @@ export declare const instanceConfig: InstanceConfig;
 export declare const url = "";
 export declare const aeria: {};
 export declare const storage: {
-    get: (key: string) => string | null;
+    get: (key: "auth") => import("./auth").AuthenticationResult;
     remove: (key: string) => void;
-    set: (key: string, value: string) => void;
+    set: (key: string, value: any) => void;
 };

package/dist/esm/storage.d.ts

@@ -1,8 +1,9 @@
 import type { InstanceConfig } from './types';
+import type { AuthenticationResult } from './auth';
 export declare const storageMemo: Record<string, string>;
 export declare const storageKey: (key: string, config: InstanceConfig) => string;
 export declare const getStorage: (config: InstanceConfig) => {
-    get: (key: string) => string | null;
+    get: (key: 'auth') => AuthenticationResult;
     remove: (key: string) => void;
-    set: (key: string, value: string) => void;
+    set: (key: string, value: any) => void;
 };

package/dist/esm/storage.js

@@ -9,15 +9,19 @@ export const getStorage = (config) => {
         : config.storage.strategy === 'localStorage' && !('localStorage' in globalThis)
             ? 'memo'
             : config.storage.strategy;
+    function get(key) {
+        switch (strategy) {
+            case 'memo':
+                return storageMemo[key];
+            case 'localStorage':
+                const value = localStorage.getItem(storageKey(key, config));
+                return value
+                    ? JSON.parse(value)
+                    : null;
+        }
+    }
     return {
-        get: (key) => {
-            switch (strategy) {
-                case 'memo':
-                    return storageMemo[key];
-                case 'localStorage':
-                    return localStorage.getItem(storageKey(key, config));
-            }
-        },
+        get,
         remove: (key) => {
             switch (strategy) {
                 case 'memo':
@@ -34,7 +38,8 @@ export const getStorage = (config) => {
                     storageMemo[key] = value;
                     break;
                 case 'localStorage':
-                    return localStorage.setItem(storageKey(key, config), value);
+                    const serialized = JSON.stringify(value);
+                    return localStorage.setItem(storageKey(key, config), serialized);
             }
         },
     };

package/dist/esm/topLevel.d.ts

@@ -1,4 +1,5 @@
 import type { InstanceConfig } from './types';
+import { RequestMethod } from '@sonata-api/types';
 import { type AuthenticationPayload } from './auth';
 type UserFunctions = {
     user: TLOFunctions & {
@@ -7,11 +8,12 @@ type UserFunctions = {
     };
 };
 export type TLOFunctions = {
-    [P in string]: ((payload?: any) => Promise<any>) & TLOFunctions;
+    [P: string]: Record<RequestMethod, ((payload?: any) => Promise<any>) & TLOFunctions>;
 };
 export type TopLevelObject = UserFunctions & {
-    describe: (...args: any) => Promise<any>;
-    $currentUser: any;
+    describe: {
+        POST: (...args: any) => Promise<any>;
+    };
 };
 export declare const topLevel: (config: InstanceConfig) => TopLevelObject;
 export {};

package/dist/esm/topLevel.js

@@ -7,20 +7,32 @@ export const topLevel = (config) => {
             if (typeof key === 'symbol') {
                 return target[key];
             }
-            const endpoint = parent
-                ? `${parent}/${key}`
-                : `${key}`;
-            switch (endpoint) {
+            switch (`${parent}/${key}`) {
                 case 'user/authenticate': return authenticate(config);
                 case 'user/signout': return signout(config);
             }
+            const endpoint = parent;
             const fn = async (payload) => {
-                const response = payload
-                    ? await request(config, `${apiUrl(config)}/${endpoint}`, payload)
-                    : await request(config, `${apiUrl(config)}/${endpoint}`);
+                const method = key;
+                const requestConfig = {
+                    params: {
+                        method
+                    }
+                };
+                if (method !== 'GET' && method !== 'HEAD') {
+                    if (payload) {
+                        requestConfig.params.headers = {
+                            'content-type': 'application/json'
+                        };
+                    }
+                }
+                const response = await request(config, `${apiUrl(config)}/${endpoint}`, payload, requestConfig);
                 return response.data;
             };
-            return proxify(fn, endpoint);
+            const path = parent
+                ? `${parent}/${key}`
+                : key;
+            return proxify(fn, path);
         }
     });
     return proxify({});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aeria-sdk",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -21,15 +21,20 @@
     ".": {
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
+    },
+    "./storage": {
+      "import": "./dist/esm/storage.js",
+      "require": "./dist/cjs/storage.js"
+    },
+    "./topLevel": {
+      "import": "./dist/esm/topLevel.js",
+      "require": "./dist/cjs/topLevel.js"
     }
   },
   "peerDependencies": {
     "@sonata-api/common": "*",
     "@sonata-api/types": "*"
   },
-  "devDependencies": {
-    "@types/node": "^20.10.4"
-  },
   "scripts": {
     "test": "echo skipping",
     "build": "tsc -p tsconfig.json; tsc -p tsconfig.esm.json",