aeria-sdk 0.0.6 → 0.0.8

package/bin/index.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require('../dist/cjs/cli')
+require('../dist/cli')

package/dist/{cjs/auth.d.ts → 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 → 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/auth.mjs

@@ -0,0 +1,169 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import { isRight, unwrapEither } from "@sonata-api/common";
+import { request } from "./http";
+import { apiUrl } from "./utils";
+import { getStorage } from "./storage";
+export var authMemo = {};
+export var authenticate = function(config) {
+    return function() {
+        var _ref = _async_to_generator(function(payload) {
+            var response, resultEither, result;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            request(config, "".concat(apiUrl(config), "/user/authenticate"), payload)
+                        ];
+                    case 1:
+                        response = _state.sent();
+                        resultEither = response.data;
+                        if (isRight(resultEither)) {
+                            result = unwrapEither(resultEither);
+                            getStorage(config).set("auth", result);
+                        }
+                        return [
+                            2,
+                            resultEither
+                        ];
+                }
+            });
+        });
+        return function(payload) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+};
+export var signout = function(config) {
+    return /*#__PURE__*/ _async_to_generator(function() {
+        return _ts_generator(this, function(_state) {
+            getStorage(config).remove("auth");
+            return [
+                2
+            ];
+        });
+    });
+};

package/dist/cli.mjs

@@ -0,0 +1,148 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import path from "path";
+import { mirror } from "./mirror";
+var main = function() {
+    var _ref = _async_to_generator(function() {
+        var aeriaSdk;
+        return _ts_generator(this, function(_state) {
+            aeriaSdk = require(path.join(process.cwd(), "package.json")).aeriaSdk;
+            if (typeof aeriaSdk !== "object" || !aeriaSdk) {
+                console.log("aeriaSdk is absent in package.json");
+                return [
+                    2
+                ];
+            }
+            mirror(aeriaSdk);
+            return [
+                2
+            ];
+        });
+    });
+    return function main() {
+        return _ref.apply(this, arguments);
+    };
+}();
+main();

package/dist/{cjs/http.js → http.js}

@@ -7,11 +7,8 @@ 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)
-            : {};
-        if (auth.token) {
+        const auth = (0, storage_1.getStorage)(config).get('auth');
+        if (auth?.token) {
             params.headers ??= {};
             switch (auth.token.type) {
                 case 'bearer': {

package/dist/http.mjs

@@ -0,0 +1,160 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import { request as originalRequest, defaultRequestTransformer } from "@sonata-api/common";
+import { getStorage } from "./storage";
+export var request = function(config, url, payload, _requestConfig) {
+    var _$_requestConfig;
+    var requestConfig = Object.assign({}, _requestConfig);
+    var _requestTransformer;
+    (_requestTransformer = (_$_requestConfig = requestConfig).requestTransformer) !== null && _requestTransformer !== void 0 ? _requestTransformer : _$_requestConfig.requestTransformer = function() {
+        var _ref = _async_to_generator(function(url, payload, _params) {
+            var params, auth, _$_params, _headers;
+            return _ts_generator(this, function(_state) {
+                params = Object.assign({}, _params);
+                auth = getStorage(config).get("auth");
+                if (auth === null || auth === void 0 ? void 0 : auth.token) {
+                    ;
+                    ;
+                    (_headers = (_$_params = params).headers) !== null && _headers !== void 0 ? _headers : _$_params.headers = {};
+                    switch(auth.token.type){
+                        case "bearer":
+                            {
+                                params.headers.authorization = "Bearer ".concat(auth.token.content);
+                                break;
+                            }
+                    }
+                }
+                return [
+                    2,
+                    defaultRequestTransformer(url, payload, params)
+                ];
+            });
+        });
+        return function(url, payload, _params) {
+            return _ref.apply(this, arguments);
+        };
+    }();
+    return originalRequest(url, payload, requestConfig);
+};

package/dist/{cjs/index.d.ts → index.d.ts}

@@ -1,4 +1,4 @@
-export { topLevel as Aeria } from './topLevel';
+export { topLevel as Aeria, } from './topLevel';
 export * from '@sonata-api/common';
 export * from './topLevel';
 export * from './runtime';

package/dist/index.mjs

@@ -0,0 +1,5 @@
+export { topLevel as Aeria } from "./topLevel";
+export * from "@sonata-api/common";
+export * from "./topLevel";
+export * from "./runtime";
+export * from "./storage";

package/dist/{cjs/mirror.js → 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 Contract
+          ? Contract 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,10 +93,12 @@ 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({
-        router: true
+    const mirror = (0, common_1.deserialize)(await api.describe.POST({
+        router: true,
     }));
-    await (0, promises_1.mkdir)(runtimeBase, { recursive: true });
+    await (0, promises_1.mkdir)(runtimeBase, {
+        recursive: true,
+    });
     await (0, promises_1.writeFile)(path_1.default.join(process.cwd(), 'aeria-sdk.d.ts'), mirrorDts(mirror));
     await (0, promises_1.writeFile)(path_1.default.join(runtimeBase, '..', 'cjs', 'runtime.js'), (0, exports.runtimeCjs)(config));
     await (0, promises_1.writeFile)(path_1.default.join(runtimeBase, '..', 'esm', 'runtime.js'), (0, exports.runtimeEsm)(config));