taon 21.0.63 → 21.0.71

package/lib/endpoint-context.js

@@ -714,22 +714,17 @@ class EndpointContext {
             }
             return class extends TaonBaseClass {
                 // static ['_'] = TaonBaseClass['_'];
-                // @ts-ignore
-                static [symbols_1.Symbols.orignalClass] = TaonBaseClass;
-                // @ts-ignore
+                static [lib_9.CoreModels.OrignalClassKey] = TaonBaseClass;
                 static [symbols_1.Symbols.fullClassNameStaticProperty] = `${ctx.contextName}.${className}`;
-                // @ts-ignore
-                static [symbols_1.Symbols.classNameStaticProperty] = className;
+                static [lib_9.CoreModels.ClassNameStaticProperty] = className;
                 static [symbols_1.Symbols.ctxInClassOrClassObj] = ctx;
                 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
                 static __getFullPathForClass__(arr = []) {
                     const name = this[symbols_1.Symbols.fullClassNameStaticProperty];
                     arr.push(name);
-                    // @ts-ignore
-                    if (this[symbols_1.Symbols.orignalClass] && // @ts-ignore
-                        this[symbols_1.Symbols.orignalClass].__getFullPathForClass__) {
-                        // @ts-ignore
-                        this[symbols_1.Symbols.orignalClass].__getFullPathForClass__(arr);
+                    if (this[lib_9.CoreModels.OrignalClassKey] &&
+                        this[lib_9.CoreModels.OrignalClassKey].__getFullPathForClass__) {
+                        this[lib_9.CoreModels.OrignalClassKey].__getFullPathForClass__(arr);
                     }
                     return arr.join('/');
                 }
@@ -780,7 +775,7 @@ class EndpointContext {
             //   console.warn(`Please provide className for ${TaonBaseClass.name} class`);
             // }
             className = className || key;
-            TaonBaseClass[symbols_1.Symbols.classNameStaticProperty] = className;
+            TaonBaseClass[lib_9.CoreModels.ClassNameStaticProperty] = className;
             const clonedClass = this.cloneClassWithNewMetadata({
                 TaonBaseClass,
                 className,
@@ -1559,7 +1554,8 @@ class EndpointContext {
         })).map(f => {
             const [method, expressPath] = f.split(' ');
             if (method.toUpperCase() === 'GET' && this.isRunningInsideDocker) {
-                this.logRoutes && console.log(`apk add curl && curl http://localhost:${this.uriPort}${expressPath}`);
+                this.logRoutes &&
+                    console.log(`apk add curl && curl http://localhost:${this.uriPort}${expressPath}`);
             }
             return (`\n### ${lib_13._.startCase(lib_13._.last(expressPath.split('/')))}\n` +
                 taon_helpers_1.TaonHelpers.fillUpTo(method.toUpperCase() + ' ', 10) +
@@ -1603,7 +1599,7 @@ class EndpointContext {
         middlewares.forEach(middlewareInstanceName => {
             const contextName = this.contextName;
             const interceptorName = `${contextName}-${class_helpers_1.ClassHelpers.getName(middlewareInstanceName)}`;
-            lib_3.Resource.request.interceptors.set(interceptorName, {
+            lib_3.Resource.globalInterceptors.set(interceptorName, {
                 intercept: ({ req, next }) => {
                     const url = new url_1.URL(req.url);
                     if (url.pathname.startsWith(`${this.uriPathnameOrNothingIfRoot}/${constants_1.apiPrefix}/${contextName}/`)) {
@@ -1815,45 +1811,58 @@ class EndpointContext {
                 let tParams = req.params;
                 let tQuery = req.query;
                 if (req.headers[symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY]) {
+                    //#region handle circural item in body params
                     try {
                         tBody = JSON.parse(JSON.stringify(tBody), JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY])));
                     }
                     catch (e) { }
+                    //#endregion
                 }
                 if (req.headers[symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_QUERY_PARAM]) {
+                    //#region handle circular items in query params
                     try {
                         tQuery = JSON.parse(JSON.stringify(tQuery), JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_QUERY_PARAM])));
                     }
                     catch (e) { }
+                    //#endregion
                 }
                 // make class instance from body
                 // console.log('req.headers', req.headers)
                 if (req.headers[symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS]) {
+                    //#region encode entity or enties in body from header mapping
                     try {
-                        const entity = JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS]));
-                        tBody = lib_3.Mapping.encode(tBody, entity);
+                        const mappinForEntityBody = JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS]));
+                        tBody = (0, lib_3.encodeMapping)(tBody, mappinForEntityBody);
                     }
                     catch (e) { }
+                    //#endregion
                 }
                 else {
+                    // TODO why do i need this ????
+                    //#region encode entity or enties in body from header mapping
                     Object.keys(tBody).forEach(paramName => {
                         try {
-                            const entityForParam = JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS}${paramName} `]));
-                            tBody[paramName] = lib_3.Mapping.encode(tBody[paramName], entityForParam);
+                            const mappingForEntityBodyForParam = JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS}${paramName} `]));
+                            tBody[paramName] = (0, lib_3.encodeMapping)(tBody[paramName], mappingForEntityBodyForParam);
                         }
                         catch (e) { }
                     });
+                    //#endregion
                 }
                 // make class instance from query params
                 // console.log('req.headers', tQuery)
                 if (req.headers[symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS]) {
+                    //#region encode entity or enties in query parms from header mapping
                     try {
                         const entity = JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS]));
-                        tQuery = taon_helpers_1.TaonHelpers.parseJSONwithStringJSONs(lib_3.Mapping.encode(tQuery, entity));
+                        tQuery = taon_helpers_1.TaonHelpers.parseJSONwithStringJSONs((0, lib_3.encodeMapping)(tQuery, entity));
                     }
                     catch (e) { }
+                    //#endregion
                 }
                 else {
+                    // TODO why do i need this ????
+                    //#region encode entity or enties in query parms from header mapping
                     Object.keys(tQuery).forEach(queryParamName => {
                         try {
                             const entityForParam = JSON.parse(taon_helpers_1.TaonHelpers.firstStringOrElemFromArray(req.headers[`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS}${queryParamName} `]));
@@ -1865,13 +1874,15 @@ class EndpointContext {
                                 }
                                 catch (e) { }
                             }
-                            const afterEncoding = lib_3.Mapping.encode(beforeTransofrm, entityForParam);
+                            const afterEncoding = (0, lib_3.encodeMapping)(beforeTransofrm, entityForParam);
                             tQuery[queryParamName] =
                                 taon_helpers_1.TaonHelpers.parseJSONwithStringJSONs(afterEncoding);
                         }
                         catch (e) { }
                     });
+                    //#endregion
                 }
+                //#region set proper arguments for backend function
                 Object.keys(methodConfig.parameters).forEach(paramName => {
                     let p = methodConfig.parameters[paramName];
                     if (p.paramType === 'Path' && tParams) {
@@ -1901,6 +1912,7 @@ class EndpointContext {
                     }
                 });
                 //#endregion
+                //#endregion
                 const resolvedParams = args
                     .reverse()
                     .map(v => taon_helpers_1.TaonHelpers.tryTransformParam(v));
@@ -1917,8 +1929,7 @@ class EndpointContext {
                         return;
                     }
                     if (result instanceof Blob &&
-                        methodConfig.responseType ===
-                            'blob') {
+                        methodConfig.responseType === 'blob') {
                         // console.log('INSTANCE OF BLOB')
                         //#region processs blob result type
                         const blob = result;
@@ -1931,8 +1942,7 @@ class EndpointContext {
                         //#endregion
                     }
                     else if (lib_13._.isString(result) &&
-                        methodConfig.responseType ===
-                            'blob') {
+                        methodConfig.responseType === 'blob') {
                         // console.log('BASE64')
                         //#region process string buffer TODO refacetor
                         const img_base64 = result;
@@ -1951,7 +1961,7 @@ class EndpointContext {
                     }
                     else {
                         //#region process json request
-                        await entity_process_1.EntityProcess.init(result, res);
+                        await new entity_process_1.EntityProcess(result, res).run();
                         //#endregion
                     }
                 }
@@ -2032,7 +2042,7 @@ class EndpointContext {
             const middlewareName = class_helpers_1.ClassHelpers.getName(instance);
             // middlewareName - only needed for inheritace and uniqness of interceptors
             const interceptorKey = `${middlewareName}-${methodConfig.type?.toUpperCase()}-${expressPath}`;
-            lib_3.Resource.request.methodsInterceptors.set(interceptorKey, {
+            lib_3.Resource.methodsInterceptors.set(interceptorKey, {
                 intercept: ({ req, next }) => {
                     return instance.interceptClientMethod({
                         req,
@@ -2098,6 +2108,9 @@ class EndpointContext {
                     /* */
                     /* */
                     /* */
+                    /* */
+                    /* */
+                    /* */
                 });
                 received['observable'] = (0, rxjs_1.from)(received);
                 return {
@@ -2273,28 +2286,51 @@ class EndpointContext {
                 storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG][ctx.uriOrigin] = {};
             const endpoints = storage[symbols_1.Symbols.old.ENDPOINT_META_CONFIG];
             let rest;
+            const requestHeaders = lib_3.RestHeaders.from({});
             if (!endpoints[ctx.uriOrigin][expressPath]) {
-                let headers = {};
                 if (methodConfig.contentType && !methodConfig.responseType) {
-                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: symbols_1.Symbols.old.MAPPING_CONFIG_HEADER,
+                            circular: symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
+                    requestHeaders.apply({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
-                    }));
+                    });
                 }
                 else if (methodConfig.contentType && methodConfig.responseType) {
-                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: symbols_1.Symbols.old.MAPPING_CONFIG_HEADER,
+                            circular: symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
+                    requestHeaders.apply({
                         'Content-Type': methodConfig.contentType,
                         Accept: methodConfig.contentType,
                         responsetypeaxios: methodConfig.responseType,
-                    }));
+                    });
                 }
                 else if (!methodConfig.contentType && methodConfig.responseType) {
-                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_3.RestHeaders.from({
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: symbols_1.Symbols.old.MAPPING_CONFIG_HEADER,
+                            circular: symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
+                    requestHeaders.apply({
                         responsetypeaxios: methodConfig.responseType,
-                    }));
+                    });
                 }
                 else {
-                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, symbols_1.Symbols.old.MAPPING_CONFIG_HEADER, symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY);
+                    rest = lib_3.Resource.create(ctx.uriOrigin, expressPath, {
+                        responseMapping: {
+                            entity: symbols_1.Symbols.old.MAPPING_CONFIG_HEADER,
+                            circular: symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY,
+                        },
+                    });
                 }
                 endpoints[ctx.uriOrigin][expressPath] = rest;
             }
@@ -2323,47 +2359,60 @@ class EndpointContext {
                     //#endregion
                     throw new Error(errorMessage);
                 }
+                const optionsDecodeHeader = {
+                    useFirstArrayItemClassNameForAllElements: true,
+                };
                 if (currentParam.paramType === 'Path') {
+                    //#region handle path params
                     pathPrams[currentParam.paramName] = param;
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Query') {
+                    //#region handle query params
                     if (currentParam.paramName) {
-                        const mapping = lib_3.Mapping.decode(param, !ctx.isProductionMode);
+                        const mapping = (0, lib_3.decodeMappingForHeaderJson)(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
+                            requestHeaders.set(`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
                         }
                         queryParams[currentParam.paramName] = param;
                     }
                     else {
-                        const mapping = lib_3.Mapping.decode(param, !ctx.isProductionMode);
+                        const mapping = (0, lib_3.decodeMappingForHeaderJson)(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS, JSON.stringify(mapping));
+                            requestHeaders.set(symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_QUERY_PARAMS, JSON.stringify(mapping));
                         }
                         queryParams = lib_13._.cloneDeep(param);
                     }
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Header') {
+                    //#region handler header params
                     if (currentParam.paramName) {
                         if (currentParam.paramName === symbols_1.Symbols.old.MDC_KEY) {
                             // parese MDC
-                            rest.headers.set(currentParam.paramName, encodeURIComponent(JSON.stringify(param)));
+                            requestHeaders.set(currentParam.paramName, encodeURIComponent(JSON.stringify(param)));
                         }
                         else {
-                            rest.headers.set(currentParam.paramName, param);
+                            requestHeaders.set(currentParam.paramName, param);
                         }
                     }
                     else {
                         for (let header in param) {
-                            rest.headers.set(header, param[header]);
+                            requestHeaders.set(header, param[header]);
                         }
                     }
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Cookie') {
+                    //#region handle cookie params
                     lib_3.Resource.Cookies.write(currentParam.paramName, param, currentParam.expireInSeconds);
+                    //#endregion
                 }
                 if (currentParam.paramType === 'Body') {
+                    //#region handle body params
                     if (currentParam.paramName) {
                         if (class_helpers_1.ClassHelpers.getName(bodyObject) === 'FormData') {
+                            //#region prevent posting/putting not full body as FormData
                             throw new Error(`[taon - framework] Don use param names when posting / putting FormData.
               Use this:
 // ...
@@ -2375,45 +2424,52 @@ instead
   (@Taon.Http.Param.Body('${currentParam.paramName}') formData: FormData) ...
 // ...
 `);
+                            //#endregion
                         }
-                        const mapping = lib_3.Mapping.decode(param, !ctx.isProductionMode);
+                        const mapping = (0, lib_3.decodeMappingForHeaderJson)(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
+                            requestHeaders.set(`${symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS}${currentParam.paramName} `, JSON.stringify(mapping));
                         }
                         bodyObject[currentParam.paramName] = param;
                     }
                     else {
-                        const mapping = lib_3.Mapping.decode(param, !ctx.isProductionMode);
+                        const mapping = (0, lib_3.decodeMappingForHeaderJson)(param, optionsDecodeHeader);
                         if (mapping) {
-                            rest.headers.set(symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS, JSON.stringify(mapping));
+                            requestHeaders.set(symbols_1.Symbols.old.MAPPING_CONFIG_HEADER_BODY_PARAMS, JSON.stringify(mapping));
                         }
                         bodyObject = param;
                     }
+                    //#endregion
                 }
             });
             if (typeof bodyObject === 'object' &&
                 class_helpers_1.ClassHelpers.getName(bodyObject) !== 'FormData') {
+                //#region handle circular objects in body params
                 let circuralFromItem = [];
                 bodyObject = lib_1.JSON10.parse(lib_1.JSON10.stringify(bodyObject, void 0, void 0, circs => {
                     circuralFromItem = circs;
                 }));
-                rest.headers.set(symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_1.JSON10.stringify(circuralFromItem));
+                requestHeaders.set(symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_BODY, lib_1.JSON10.stringify(circuralFromItem));
+                //#endregion
             }
             if (typeof queryParams === 'object') {
+                //#region handle circular objects in query params
                 let circuralFromQueryParams = [];
                 queryParams = lib_1.JSON10.parse(lib_1.JSON10.stringify(queryParams, void 0, void 0, circs => {
                     circuralFromQueryParams = circs;
                 }));
-                rest.headers.set(symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_QUERY_PARAM, lib_1.JSON10.stringify(circuralFromQueryParams));
+                requestHeaders.set(symbols_1.Symbols.old.CIRCURAL_OBJECTS_MAP_QUERY_PARAM, lib_1.JSON10.stringify(circuralFromQueryParams));
+                //#endregion
             }
             //#endregion
             const httpResultObj = {
                 get received() {
-                    return rest.model(pathPrams)[method](bodyObject, [queryParams]);
+                    return rest
+                        .model(pathPrams, { headers: requestHeaders })[method](bodyObject, [queryParams]);
                 },
                 request(axiosConfig) {
                     return rest
-                        .model(pathPrams)[method](bodyObject, [queryParams], axiosConfig);
+                        .model(pathPrams, { headers: requestHeaders })[method](bodyObject, [queryParams], axiosConfig);
                 },
             };
             return httpResultObj;