ng2-rest 21.0.18 → 21.0.21

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng2-rest/browser",
-  "version": "21.0.18",
+  "version": "21.0.21",
   "peerDependencies": {
     "@angular/common": "^21.0.0",
     "@angular/core": "^21.0.0"

package/browser/types/ng2-rest-browser.d.ts

@@ -1,8 +1,8 @@
 // @ts-nocheck
-import { Circ, JSON10 } from 'json10/browser';
+import { Circ } from 'json10/browser';
 import { Observable, Subject } from 'rxjs';
 import { AxiosRequestConfig, AxiosResponse } from 'axios';
-import { CoreModels, CoreHelpers } from 'tnp-core/browser';
+import { CoreModels } from 'tnp-core/browser';
 import express from 'express';
 
 declare class Cookie {
@@ -372,13 +372,12 @@ declare class Resource<E, T, TA> {
     private api;
 }
 
-declare class Helpers extends CoreHelpers {
-    static JSON: typeof JSON10;
-    static get Mapping(): {
+declare namespace Helpers {
+    const getMapping: () => {
         encode<T = Function>(json: Object, mapping: Mapping.Mapping): T;
         decode(json: Object, autodetect?: boolean): Mapping.Mapping;
     };
-    static checkValidUrl(url: string): boolean;
+    const checkValidUrl: (url: string) => boolean;
 }
 
 declare const CONTENT_TYPE: {

package/browser-prod/fesm2022/ng2-rest-browser.mjs

@@ -1,11 +1,11 @@
 import { from, firstValueFrom, Subject, Observable } from 'rxjs';
 import { diffChars } from 'diff';
-import { _, UtilsOs__NS__isBrowser, CoreHelpers, CoreModels__NS__TaonHttpErrorCustomProp, Helpers as Helpers$1, UtilsOs__NS__isSSRMode } from 'tnp-core/browser-prod';
+import { ___NS__isUndefined, ___NS__isArray, ___NS__first, ___NS__merge, ___NS__isString, ___NS__isBoolean, ___NS__isNumber, ___NS__isFunction, ___NS__cloneDeep, UtilsOs__NS__isBrowser, ___NS__isNull, ___NS__get, ___NS__set, ___NS__isObject, ___NS__omit, CoreModels__NS__TaonHttpErrorCustomProp, Helpers__NS__isBlob, UtilsOs__NS__isSSRMode } from 'tnp-core/browser-prod';
 import { Log, Level } from 'ng2-logger/browser-prod';
 import { walk } from 'lodash-walk-object/browser-prod';
 import { CLASS, SYMBOL } from 'typescript-class-helpers/browser-prod';
-import { JSON10 } from 'json10/browser-prod';
 import axios from 'axios';
+import { JSON10 } from 'json10/browser-prod';
 
 class Cookie {
     static get Instance() {
@@ -38,25 +38,25 @@ class Cookie {
 //namespace Mapping
 function Mapping__NS__decode(json, autodetect = false) {
     // console.log('DECODE isBrowser', HelpersLog.isBrowser)
-    if (_.isUndefined(json)) {
+    if (___NS__isUndefined(json)) {
         return void 0;
     }
-    let mapping = decodeFromDecorator(_.isArray(json) ? _.first(json) : json, !autodetect);
+    let mapping = decodeFromDecorator(___NS__isArray(json) ? ___NS__first(json) : json, !autodetect);
     if (autodetect) {
-        mapping = _.merge(getMappingNaive(json), mapping);
+        mapping = ___NS__merge(getMappingNaive(json), mapping);
     }
     return mapping;
 }
 function Mapping__NS__encode(json, mapping, circular = []) {
-    if (_.isString(json) || _.isBoolean(json) || _.isNumber(json)) {
+    if (___NS__isString(json) || ___NS__isBoolean(json) || ___NS__isNumber(json)) {
         return json;
     }
     if (mapping['']) {
         const decoratorMapping = Mapping__NS__getModelsMapping(CLASS.getBy(mapping['']));
-        mapping = _.merge(mapping, decoratorMapping);
+        mapping = ___NS__merge(mapping, decoratorMapping);
     }
     let res;
-    if (_.isArray(circular) && circular.length > 0) {
+    if (___NS__isArray(circular) && circular.length > 0) {
         res = setMappingCirc(json, mapping, circular);
     }
     else {
@@ -70,30 +70,30 @@ function decodeFromDecorator(json, production = false) {
     return mappings;
 }
 function Mapping__NS__getModelsMapping(entity) {
-    if (!_.isFunction(entity) || entity === Object) {
+    if (!___NS__isFunction(entity) || entity === Object) {
         return {};
     }
     const className = CLASS.getName(entity);
     // console.log(`getMaping for: '${className}' `)
-    let enityOWnMapping = _.isArray(entity[SYMBOL.MODELS_MAPPING])
+    let enityOWnMapping = ___NS__isArray(entity[SYMBOL.MODELS_MAPPING])
         ? entity[SYMBOL.MODELS_MAPPING]
         : [{ '': className }];
     let res = {};
     let parents = enityOWnMapping
-        .filter(m => !_.isUndefined(m['']) && m[''] !== className)
+        .filter(m => !___NS__isUndefined(m['']) && m[''] !== className)
         .map(m => m['']);
     enityOWnMapping.reverse().forEach(m => {
-        m = _.cloneDeep(m);
+        m = ___NS__cloneDeep(m);
         // console.log(`'${className}' m:`, m)
         Object.keys(m).forEach(key => {
             const v = m[key];
-            const isArr = _.isArray(v);
-            const model = isArr ? _.first(v) : v;
+            const isArr = ___NS__isArray(v);
+            const model = isArr ? ___NS__first(v) : v;
             if (parents.includes(model)) {
                 m[key] = isArr ? [className] : className;
             }
         });
-        res = _.merge(res, m);
+        res = ___NS__merge(res, m);
     });
     res[''] = className;
     // console.log(`mapping for ${className} : ${JSON.stringify(res)}`)
@@ -143,7 +143,7 @@ function getMappingNaive(c, path = '', mapping = {}, level = 0) {
         return;
     add(c, path, mapping);
     for (var p in c) {
-        if (_.isFunction(c.hasOwnProperty) && c.hasOwnProperty(p)) {
+        if (___NS__isFunction(c.hasOwnProperty) && c.hasOwnProperty(p)) {
             const v = c[p];
             if (Array.isArray(v) && v.length > 0) {
                 // reducer as impovement
@@ -163,7 +163,7 @@ function getMappingNaive(c, path = '', mapping = {}, level = 0) {
     return mapping;
 }
 function getMappingPathFrom(pathLodhas) {
-    if (!_.isString(pathLodhas)) {
+    if (!___NS__isString(pathLodhas)) {
         return void 0;
     }
     const regex = /\[([0-9a-zA-Z]|\'|\")*\]/g;
@@ -174,32 +174,32 @@ function getMappingPathFrom(pathLodhas) {
     return pathLodhas;
 }
 function setMappingCirc(json, mapping = {}, circular = []) {
-    const mainClassFn = !_.isArray(json) && CLASS.getBy(mapping['']);
+    const mainClassFn = !___NS__isArray(json) && CLASS.getBy(mapping['']);
     // console.log(mapping)
     walk.Object(json, (v, lodashPath, changeValue) => {
-        if (!_.isUndefined(v) && !_.isNull(v)) {
+        if (!___NS__isUndefined(v) && !___NS__isNull(v)) {
             const mappingPath = getMappingPathFrom(lodashPath);
-            if (!_.isUndefined(mapping[mappingPath])) {
-                const isArray = _.isArray(mapping[mappingPath]);
+            if (!___NS__isUndefined(mapping[mappingPath])) {
+                const isArray = ___NS__isArray(mapping[mappingPath]);
                 if (!isArray) {
                     const className = isArray
-                        ? _.first(mapping[mappingPath])
+                        ? ___NS__first(mapping[mappingPath])
                         : mapping[mappingPath];
                     const classFN = CLASS.getBy(className);
-                    if (_.isFunction(classFN)) {
+                    if (___NS__isFunction(classFN)) {
                         // console.log(`mapping: '${mappingPath}', lp: '${lodashPath}' class: '${className}' , set `, v.location)
-                        changeValue(_.merge(new classFN(), v));
+                        changeValue(___NS__merge(new classFN(), v));
                     }
                 }
             }
         }
     });
     circular.forEach(c => {
-        const ref = _.get(json, c.circuralTargetPath);
-        _.set(json, c.pathToObj, ref);
+        const ref = ___NS__get(json, c.circuralTargetPath);
+        ___NS__set(json, c.pathToObj, ref);
     });
-    if (_.isFunction(mainClassFn)) {
-        json = _.merge(new mainClassFn(), json);
+    if (___NS__isFunction(mainClassFn)) {
+        json = ___NS__merge(new mainClassFn(), json);
     }
     return json;
 }
@@ -216,13 +216,13 @@ function setMapping(json, mapping = {}) {
             // if (mainClassFn && mainClassFn.name === 'Project') {
             //   // console.log(`OWn property: "${key}"`)
             // }
-            if (_.isArray(json[key])) {
+            if (___NS__isArray(json[key])) {
                 json[key] = json[key].map(arrObj => {
                     const objMapping = Mapping__NS__getModelsMapping(CLASS.getBy(mapping[key]));
                     return setMapping(arrObj, objMapping);
                 });
             }
-            else if (_.isObject(json[key])) {
+            else if (___NS__isObject(json[key])) {
                 const objMapping = Mapping__NS__getModelsMapping(CLASS.getBy(mapping[key]));
                 json[key] = setMapping(json[key], objMapping);
             }
@@ -238,30 +238,30 @@ function setMapping(json, mapping = {}) {
         .forEach(lodasPath => {
         // console.log(`Loadsh path: ${lodasPath}`)
         const objMapping = Mapping__NS__getModelsMapping(CLASS.getBy(mapping[lodasPath]));
-        const input = _.get(json, lodasPath);
-        if (!_.isUndefined(input)) {
+        const input = ___NS__get(json, lodasPath);
+        if (!___NS__isUndefined(input)) {
             const res = setMapping(input, objMapping);
-            _.set(json, lodasPath, res);
+            ___NS__set(json, lodasPath, res);
         }
     });
     if (!mainClassFn) {
         return json;
     }
-    return _.merge(new mainClassFn(), json);
+    return ___NS__merge(new mainClassFn(), json);
 }
 function Mapping__NS__DefaultModelWithMapping(defaultModelValues, mapping) {
     return function (target) {
-        if (!_.isArray(target[SYMBOL.MODELS_MAPPING])) {
+        if (!___NS__isArray(target[SYMBOL.MODELS_MAPPING])) {
             target[SYMBOL.MODELS_MAPPING] = [];
         }
         target[SYMBOL.MODELS_MAPPING].push({
             '': CLASS.getName(target),
         });
-        if (_.isObject(mapping)) {
+        if (___NS__isObject(mapping)) {
             target[SYMBOL.MODELS_MAPPING] = target[SYMBOL.MODELS_MAPPING].concat(mapping);
             Object.keys(mapping).forEach(key => {
                 const v = mapping;
-                if (_.isUndefined(v) || _.isFunction(v)) {
+                if (___NS__isUndefined(v) || ___NS__isFunction(v)) {
                     throw `
 
 
@@ -271,7 +271,7 @@ function Mapping__NS__DefaultModelWithMapping(defaultModelValues, mapping) {
                 }
             });
         }
-        if (_.isObject(defaultModelValues)) {
+        if (___NS__isObject(defaultModelValues)) {
             const toMerge = {};
             const describedTarget = CLASS.describeProperites(target).filter(prop => /^([a-zA-Z0-9]|\_|\#)+$/.test(prop));
             // console.log(`describedTarget: ${describedTarget} for ${target.name}`)
@@ -290,36 +290,34 @@ function Mapping__NS__DefaultModelWithMapping(defaultModelValues, mapping) {
                 }
             });
             // console.log(`merge "${JSON.stringify(target.prototype)}" with "${JSON.stringify(defaultModelValues)}"`)
-            target[SYMBOL.DEFAULT_MODEL] = _.merge(toMerge, defaultModelValues);
+            target[SYMBOL.DEFAULT_MODEL] = ___NS__merge(toMerge, defaultModelValues);
             const propsToOmmit = Object.keys(target[SYMBOL.DEFAULT_MODEL]).filter(key => {
                 const descriptor = Object.getOwnPropertyDescriptor(target.prototype, key);
                 return !!descriptor;
             });
-            _.merge(target.prototype, _.omit(target[SYMBOL.DEFAULT_MODEL], propsToOmmit));
+            ___NS__merge(target.prototype, ___NS__omit(target[SYMBOL.DEFAULT_MODEL], propsToOmmit));
             // console.log(`DEFAULT VALUE MERGE for ${target.name}`)
         }
     };
 }
 //end of namespace Mapping
 
-// @ts-ignore
-class Helpers extends CoreHelpers {
-    static { this.JSON = JSON10; }
-    static get Mapping() {
-        return {
-            encode(json, mapping) {
-                return Mapping__NS__encode(json, mapping);
-            },
-            decode(json, autodetect = false) {
-                return Mapping__NS__decode(json, autodetect);
-            }
-        };
-    }
-    static checkValidUrl(url) {
-        let regex = /(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/;
-        return regex.test(url);
-    }
-}
+//namespace Helpers
+const Helpers__NS__getMapping = () => {
+    return {
+        encode(json, mapping) {
+            return Mapping__NS__encode(json, mapping);
+        },
+        decode(json, autodetect = false) {
+            return Mapping__NS__decode(json, autodetect);
+        },
+    };
+};
+const Helpers__NS__checkValidUrl = (url) => {
+    let regex = /(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/;
+    return regex.test(url);
+};
+//end of namespace Helpers
 
 const log = Log.create('[ng2-rest] params', Level.__NOTHING);
 /** check if string is a valid pattern */
@@ -327,7 +325,7 @@ function isValid(pattern) {
     return (new RegExp('\/:[a-zA-Z]*', 'g')).test(pattern.replace('://', ''));
 }
 function check(url, pattern) {
-    if (!Helpers.checkValidUrl(url)) {
+    if (!Helpers__NS__checkValidUrl(url)) {
         log.error(`Incorrect url: ${url}`);
         return false;
     }
@@ -420,7 +418,7 @@ function cutUrlModel(params, models, output) {
     // log.i('cut param', param)
     let model = m.match(/[a-zA-Z0-9]+\//)[0].replace('\/', '');
     if (params === void 0 ||
-        (paramIsPath ? _.get(params, param) === void 0 : params[param] === void 0) ||
+        (paramIsPath ? ___NS__get(params, param) === void 0 : params[param] === void 0) ||
         param === 'undefined') {
         output.length = 0;
         output.unshift(model);
@@ -429,7 +427,7 @@ function cutUrlModel(params, models, output) {
     else {
         if (paramIsPath) {
             // log.i('param is path', param)
-            let mrep = m.replace(new RegExp(`:${param}`, 'g'), `${_.get(params, param)}`);
+            let mrep = m.replace(new RegExp(`:${param}`, 'g'), `${___NS__get(params, param)}`);
             output.unshift(mrep);
             return cutUrlModel(params, models, output);
         }
@@ -474,7 +472,7 @@ function interpolateParamsToUrl(params, url) {
             let c = e.replace('\/:', '');
             // log.i('c', c)
             if (regexisPath.test(c)) {
-                url = url.replace(e, `/${_.get(params, c)}`);
+                url = url.replace(e, `/${___NS__get(params, c)}`);
             }
             else {
                 url = url.replace(e, `/${params[c]}`);
@@ -656,7 +654,7 @@ class Models__NS__BaseBody {
                     parsed = JSON.parse(parsed);
                 }
                 if (opt.parsingError && parsed[CoreModels__NS__TaonHttpErrorCustomProp]) {
-                    return _.merge(new RestErrorResponseWrapper(), parsed);
+                    return ___NS__merge(new RestErrorResponseWrapper(), parsed);
                 }
                 return parsed;
             }
@@ -680,17 +678,17 @@ class Models__NS__HttpBody extends Models__NS__BaseBody {
         return this.responseText;
     }
     get booleanValue() {
-        if (!Helpers$1.isBlob(this.responseText)) {
+        if (!Helpers__NS__isBlob(this.responseText)) {
             return ['ok', 'true'].includes(this.responseText?.trim());
         }
     }
     get numericValue() {
-        if (!Helpers$1.isBlob(this.responseText)) {
+        if (!Helpers__NS__isBlob(this.responseText)) {
             return Number(this.responseText?.trim());
         }
     }
     get rawJson() {
-        if (!Helpers$1.isBlob(this.responseText)) {
+        if (!Helpers__NS__isBlob(this.responseText)) {
             let res = this.toJSON(this.responseText, { isJSONArray: this.isArray });
             if (this.circular && Array.isArray(this.circular)) {
                 res = JSON10.parse(JSON.stringify(res), this.circular);
@@ -699,7 +697,7 @@ class Models__NS__HttpBody extends Models__NS__BaseBody {
         }
     }
     get json() {
-        const isBlob = Helpers$1.isBlob(this.responseText);
+        const isBlob = Helpers__NS__isBlob(this.responseText);
         if (isBlob) {
             return void 0;
         }
@@ -722,7 +720,7 @@ class Models__NS__HttpBody extends Models__NS__BaseBody {
      * undefined when blob
      */
     get text() {
-        if (!Helpers$1.isBlob(this.responseText)) {
+        if (!Helpers__NS__isBlob(this.responseText)) {
             return this.responseText
                 .replace(/^\"/, '')
                 .replace(/\"$/, '');
@@ -979,7 +977,7 @@ class RestRequest {
     //#region fields
     static { this.jobId = 0; }
     handlerResult(options, sourceRequest) {
-        if (_.isUndefined(options)) {
+        if (___NS__isUndefined(options)) {
             options = {};
         }
         // log.d(`HANDLE RESULT (jobid:${options.jobid}) ${sourceRequest.url}`);
@@ -987,7 +985,7 @@ class RestRequest {
         if (typeof res !== 'object') {
             throw new Error('No resposnse for request. ');
         }
-        if (Helpers$1.isBrowser) {
+        if (UtilsOs__NS__isBrowser) {
             res.headers = RestHeaders.from(res.headers);
         }
         // error no internet
@@ -1161,15 +1159,15 @@ class RestRequest {
     getReplay(method, meta, onlyGetLastReplayForMethod) {
         let replay;
         //#region prevent empty tree
-        if (_.isUndefined(this.replaySubjects[meta.endpoint])) {
+        if (___NS__isUndefined(this.replaySubjects[meta.endpoint])) {
             // log.i(`(${meta.endpoint}) `);
             this.replaySubjects[meta.endpoint] = {};
         }
-        if (_.isUndefined(this.replaySubjects[meta.endpoint][meta.path])) {
+        if (___NS__isUndefined(this.replaySubjects[meta.endpoint][meta.path])) {
             // log.i(`(${meta.endpoint})(${meta.path}) `);
             this.replaySubjects[meta.endpoint][meta.path] = {};
         }
-        if (_.isUndefined(this.replaySubjects[meta.endpoint][meta.path][method])) {
+        if (___NS__isUndefined(this.replaySubjects[meta.endpoint][meta.path][method])) {
             // log.i(`(${meta.endpoint})(${meta.path}) `);
             this.replaySubjects[meta.endpoint][meta.path][method] = {};
         }
@@ -1178,7 +1176,7 @@ class RestRequest {
         if (onlyGetLastReplayForMethod && objectIDToCreateOrLast === 0) {
             return replay;
         }
-        if (_.isUndefined(this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast])) {
+        if (___NS__isUndefined(this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast])) {
             // log.i(`(${meta.endpoint})(${meta.path})(${method}) `);
             this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast] = {
                 subject: new Subject(),
@@ -1187,7 +1185,7 @@ class RestRequest {
         }
         replay =
             this.replaySubjects[meta.endpoint][meta.path][method][objectIDToCreateOrLast];
-        if (!_.isNumber(replay.id)) {
+        if (!___NS__isNumber(replay.id)) {
             if (RestRequest.jobId === Number.MAX_SAFE_INTEGER) {
                 RestRequest.jobId = 0;
             }
@@ -1226,7 +1224,7 @@ class RestRequest {
             //#region DISPOSE  @UNCOMMENT AFTER TESTS
             // if (objectIDToCreateOrLast > 2) {
             //   const oldReq: Models__NS__ReplayData = this.replaySubjects[meta.endpoint][meta.path][method][(objectIDToCreateOrLast - 2)];
-            //   if (_.isUndefined(this.meta[oldReq.id])) {
+            //   if (___NS__isUndefined(this.meta[oldReq.id])) {
             //     // cant delete this - for counter purpose
             //     this.replaySubjects[meta.endpoint][meta.path][method][(objectIDToCreateOrLast - 2)] = {};
             //     delete this.subjectInuUse[oldReq.id];
@@ -1540,7 +1538,7 @@ Instead use nested approach:            /book/:bookid/author/:authorid
             url = url.slice(0, url.length - 1);
         // log.i('url after', url);
         if (Resource.endpoints[e] !== void 0) {
-            // Helpers.log(
+            // Helpers__NS__log(
             //   'Cannot use map function at the same API endpoint again (' +
             //     Resource.endpoints[e].url +
             //     ')',
@@ -1783,5 +1781,5 @@ class SimpleResource {
  * Generated bundle index. Do not edit.
  */
 
-export { AxiosBackendHandler, CONTENT_TYPE, Helpers, HttpResponseError, Mapping__NS__DefaultModelWithMapping, Mapping__NS__decode, Mapping__NS__encode, Mapping__NS__getModelsMapping, Models__NS__BaseBody, Models__NS__BaseResponse, Models__NS__ErrorBody, Models__NS__HttpBody, Models__NS__HttpResponse, Resource, Rest, RestErrorResponseWrapper, RestHeaders, RestResponseWrapper, SimpleResource, buildInterceptorChain, interpolateParamsToUrl };
+export { AxiosBackendHandler, CONTENT_TYPE, Helpers__NS__checkValidUrl, Helpers__NS__getMapping, HttpResponseError, Mapping__NS__DefaultModelWithMapping, Mapping__NS__decode, Mapping__NS__encode, Mapping__NS__getModelsMapping, Models__NS__BaseBody, Models__NS__BaseResponse, Models__NS__ErrorBody, Models__NS__HttpBody, Models__NS__HttpResponse, Resource, Rest, RestErrorResponseWrapper, RestHeaders, RestResponseWrapper, SimpleResource, buildInterceptorChain, interpolateParamsToUrl };
 //# sourceMappingURL=ng2-rest-browser.mjs.map