ng2-rest 21.0.11 → 21.0.15

package/lib-prod/rest.class.js

@@ -0,0 +1,145 @@
+"use strict";
+//#region import
+// import { Log, Level } from 'ng2-logger/src';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Rest = void 0;
+// const log = Log.create('rest.class', Level.__NOTHING)
+const lib_prod_1 = require("typescript-class-helpers/lib-prod");
+const content_type_1 = require("./content-type");
+const params_1 = require("./params");
+const rest_headers_1 = require("./rest-headers");
+//#endregion
+class Rest {
+    request;
+    meta;
+    customContentType;
+    mockHttp;
+    mock(mock) {
+        if (typeof mock === 'function' || typeof mock === 'object') {
+            this.mockHttp = mock;
+        }
+        else {
+            throw `[ng2-rest]
+      .model(...)
+      .mock( < BAD MOCK DATA > )
+      ...
+      `;
+        }
+        return this;
+    }
+    //#region  private fields
+    __meta_endpoint;
+    _endpointRest;
+    get endpoint() {
+        let e = this.__meta_endpoint;
+        if (this.restQueryParams !== void 0 &&
+            this._endpointRest !== void 0 &&
+            typeof this._endpointRest === 'string' &&
+            this._endpointRest.trim() !== '')
+            e = this._endpointRest;
+        return e;
+    }
+    restQueryParams;
+    set __rest_endpoint(endpoint) {
+        this._endpointRest = endpoint;
+        if (endpoint === void 0) {
+            this.restQueryParams = void 0;
+        }
+        else {
+            this.restQueryParams = (0, params_1.getRestParams)(endpoint, this.__meta_endpoint);
+        }
+    }
+    creatUrl(params, doNotSerializeParams = false) {
+        return `${this.endpoint}${(0, params_1.getParamsUrl)(params, doNotSerializeParams)}`;
+    }
+    //#endregion
+    //#region  constructor
+    _headers = rest_headers_1.RestHeaders.from(content_type_1.CONTENT_TYPE.APPLICATION_JSON);
+    get headers() {
+        return this._headers;
+    }
+    constructor(endpoint, request, meta, customContentType) {
+        this.request = request;
+        this.meta = meta;
+        this.customContentType = customContentType;
+        this.__meta_endpoint = endpoint;
+    }
+    //#endregion
+    //#region  req
+    req(method, requestBody, params, axiosOptions, isArray = false) {
+        axiosOptions = axiosOptions || {};
+        const modelUrl = this.creatUrl(params, !!axiosOptions.doNotSerializeParams);
+        const isFormData = lib_prod_1.CLASS.getNameFromObject(requestBody) === 'FormData';
+        const body = isFormData
+            ? requestBody
+            : requestBody
+                ? JSON.stringify(requestBody)
+                : void 0;
+        // console.log('this.customContentType', this.customContentType)
+        if (this.customContentType) {
+            const customHeaderKeys = this.customContentType.keys();
+            const currentHeaderKeys = this._headers.keys();
+            currentHeaderKeys
+                .filter(key => !customHeaderKeys.includes(key))
+                .forEach(key => {
+                this.customContentType.set(key, this._headers.get(key));
+            });
+            this._headers = this.customContentType;
+        }
+        else {
+            this._headers = rest_headers_1.RestHeaders.from(content_type_1.CONTENT_TYPE.APPLICATION_JSON);
+        }
+        // console.log("_headers", this.headers)
+        const result = this.request[method.toLowerCase()](modelUrl, body, this.headers, this.meta, isArray, this.mockHttp, axiosOptions);
+        this.mockHttp = void 0;
+        return result;
+    }
+    //#endregion
+    //#region http methods
+    array = {
+        get: (item, params = void 0, axiosOptions) => {
+            return this.req('get', item, params, axiosOptions, true);
+        },
+        head: (item, params = void 0, axiosOptions) => {
+            return this.req('head', item, params, axiosOptions, true);
+        },
+        post: (item, params, axiosOptions) => {
+            return this.req('post', item, params, axiosOptions, true);
+        },
+        put: (item, params, axiosOptions) => {
+            return this.req('put', item, params, axiosOptions, true);
+        },
+        patch: (item, params, axiosOptions) => {
+            return this.req('patch', item, params, axiosOptions, true);
+        },
+        delete: (item, params, axiosOptions) => {
+            return this.req('delete', item, params, axiosOptions, true);
+        },
+        jsonp: (item, params, axiosOptions) => {
+            return this.req('jsonp', item, params, axiosOptions, true);
+        },
+    };
+    get(item, params, axiosOptions) {
+        return this.req('get', item, params, axiosOptions);
+    }
+    head(item, params, axiosOptions) {
+        return this.req('head', item, params, axiosOptions);
+    }
+    post(item, params, axiosOptions) {
+        return this.req('post', item, params, axiosOptions);
+    }
+    put(item, params, axiosOptions) {
+        return this.req('put', item, params, axiosOptions);
+    }
+    patch(item, params, axiosOptions) {
+        return this.req('patch', item, params, axiosOptions);
+    }
+    delete(item, params, axiosOptions) {
+        return this.req('delete', item, params, axiosOptions);
+    }
+    jsonp(item, params, axiosOptions) {
+        return this.req('jsonp', item, params, axiosOptions);
+    }
+}
+exports.Rest = Rest;
+//# sourceMappingURL=rest.class.js.map

package/lib-prod/rest.class.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rest.class.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng2-rest",
-  "version": "21.0.11",
+  "version": "21.0.15",
   "scripts": {
     "taon init": "taon init",
     "taon start": "taon start",
@@ -30,14 +30,16 @@
     "url": "https://github.com/darekf77/ng2-rest/issues"
   },
   "dependencies": {
-    "@types/diff": "~5.2.3",
-    "diff": "~4.0.2",
     "axios": "~1.13.2",
-    "lodash": "~4.17.21",
-    "@types/lodash": "4.14.92",
+    "diff": "~4.0.2",
+    "express": "~4.22.1",
+    "form-data": "~4.0.5",
+    "rxjs": "~7.8.2",
+    "json10": "~21.0.0",
+    "lodash-walk-object": "~21.0.0",
     "ng2-logger": "~21.0.0",
-    "json5": "~2.2.3",
-    "json10": "~21.0.0"
+    "tnp-core": "~21.0.0",
+    "typescript-class-helpers": "~21.0.0"
   },
   "description": "Description for ng2-rest. Hello world!",
   "keywords": [

package/tmp-environment.json

@@ -8,7 +8,11 @@
   "container": {
     "only": []
   },
-  "ports": {},
+  "ports": {
+    "ngNormalAppPort": 4245,
+    "ngWebsqlAppPort": 4246,
+    "nodeBeAppPort": 4120
+  },
   "init": {},
   "build": {
     "pwa": {},
@@ -26,12 +30,12 @@
     "releaseType": "manual",
     "targetArtifact": "npm-lib-and-cli-tool",
     "envName": "__",
-    "resolvedNewVersion": "19.0.23"
+    "resolvedNewVersion": "19.0.21"
   },
   "copyToManager": {},
   "buildInfo": {
-    "date": "2025-05-29T20:31:23.000Z",
-    "hash": "90550ec50dcb4ba363573058503cfbc7f053abbb"
+    "date": "2025-05-28T01:49:22.000Z",
+    "hash": "ac8fd77b08f971ae984b26605f9d468c12f27334"
   },
   "currentProjectName": "ng2-rest",
   "currentProjectType": "isomorphic-lib",

package/websql/fesm2022/ng2-rest-websql.mjs

@@ -1,6 +1,6 @@
 import { from, firstValueFrom, Subject, Observable } from 'rxjs';
-import { _, UtilsOs, CoreHelpers, CoreModels, Helpers as Helpers$1 } from 'tnp-core/websql';
 import { diffChars } from 'diff';
+import { _, UtilsOs, CoreHelpers, CoreModels, Helpers as Helpers$1 } from 'tnp-core/websql';
 import { Log, Level } from 'ng2-logger/websql';
 import { walk } from 'lodash-walk-object/websql';
 import { CLASS, SYMBOL, Models as Models$1 } from 'typescript-class-helpers/websql';
@@ -992,6 +992,7 @@ class RestRequest {
         //#endregion
         this.replaySubjects = {};
     }
+    //#region fields
     static { this.jobId = 0; }
     handlerResult(options, sourceRequest) {
         if (_.isUndefined(options)) {
@@ -1231,8 +1232,10 @@ class RestRequest {
                     next: a => observer.next(a),
                     error: a => observer.error(a),
                     complete: () => {
-                        sub.unsubscribe();
-                        observer.complete();
+                        setTimeout(() => {
+                            sub.unsubscribe();
+                            observer.complete();
+                        });
                     },
                 });
             });
@@ -1477,9 +1480,6 @@ class Resource {
     }
     static { this.enableWarnings = true; }
     //#region private mthods and fields
-    static initAngularNgZone(zone) {
-        RestRequest.zone = zone;
-    }
     checkNestedModels(model, allModels) {
         // if (model.indexOf('/') !== -1) { //TODO make this better, becouse now I unecesary checking shit
         for (let p in allModels) {
@@ -1557,9 +1557,11 @@ 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$1.log('Cannot use map function at the same API endpoint again (' +
-                Resource.endpoints[e].url +
-                ')');
+            // Helpers.log(
+            //   'Cannot use map function at the same API endpoint again (' +
+            //     Resource.endpoints[e].url +
+            //     ')',
+            // );
             return false;
         }
         Resource.endpoints[e] = {