@nextgis/ngw-connector 3.0.0 → 3.1.1

package/lib/index.d.ts

@@ -665,7 +665,7 @@ interface BasemapWebmap {
 interface LookupTableResource {
     items: Record<string, string>;
 }
-type VectorFieldDatatype = 'STRING' | 'REAL' | 'DATE' | 'TIME' | 'DATETIME' | 'BIGINT' | 'INTEGER' | 'BOOLEAN';
+type VectorFieldDatatype = 'STRING' | 'REAL' | 'DATE' | 'TIME' | 'DATETIME' | 'BIGINT' | 'INTEGER' | 'BOOLEAN' | 'JSON';
 /** @deprecated - use {@link VectorFieldDatatype} instead */
 type ResourceItemDatatype = VectorFieldDatatype;
 interface FeatureLayerField {
@@ -681,7 +681,7 @@ interface FeatureLayerField {
 interface FeatureResource {
     fields: FeatureLayerField[];
 }
-type GeometryType = 'POINT' | 'LINESTRING' | 'POLYGON' | 'MULTIPOINT' | 'MULTILINESTRING' | 'MULTIPOLYGON' | 'POINTZ' | 'LINESTRINGZ' | 'POLYGONZ' | 'MULTIPOINTZ' | 'MULTILINESTRINGZ' | 'MULTIPOLYGONZ';
+type GeometryType = 'POINT' | 'LINESTRING' | 'POLYGON' | 'MULTIPOINT' | 'MULTILINESTRING' | 'MULTIPOLYGON' | 'POINTZ' | 'LINESTRINGZ' | 'POLYGONZ' | 'MULTIPOINTZ' | 'MULTILINESTRINGZ' | 'MULTIPOLYGONZ' | 'NONE';
 /** @deprecated use  VectorLayerRead from '@nextgisweb/resource/type/api' instead */
 interface VectorLayer {
     srs: {

package/lib/ngw-connector.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-connector; version: 3.0.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-connector; version: 3.1.1; author: NextGIS */
 'use strict';
 
 var utils = require('@nextgis/utils');
@@ -69,63 +69,7 @@ async function apiRequest(opt) {
 }
 
 var pkg = {
-	name: "@nextgis/ngw-connector",
-	version: "3.0.0",
-	_priority: 12,
-	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
-	main: "index.js",
-	module: "lib/ngw-connector.esm-bundler.js",
-	unpkg: "lib/ngw-connector.global.prod.js",
-	jsdelivr: "lib/ngw-connector.global.prod.js",
-	types: "lib/index.d.ts",
-	dependencies: {
-		"@nextgis/cache": "3.0.0",
-		"@nextgis/cancelable-promise": "3.0.0",
-		"@nextgis/utils": "3.0.0",
-		"@types/events": "^3.0.0",
-		events: "*",
-		"form-data": "^4.0.0"
-	},
-	devDependencies: {
-		"@nextgis/build-tools": "3.0.0"
-	},
-	scripts: {
-		clean: "rimraf ./lib",
-		dev: "node ../build-tools/lib/build.js",
-		prod: "npm run dev -- --release",
-		lint: "eslint ./src/**/*.ts --fix --c ../../.eslintrc",
-		watch: "npm run dev -- --watch",
-		"gen:types": "node ./scripts/generator"
-	},
-	buildOptions: {
-		name: "NgwConnector",
-		formats: [
-			"esm-bundler",
-			"esm-browser",
-			"cjs",
-			"global"
-		]
-	},
-	keywords: [
-		"NextGIS",
-		"MAP"
-	],
-	author: "NextGIS",
-	files: [
-		"index.js",
-		"lib"
-	],
-	license: "MIT",
-	homepage: "https://github.com/nextgis/nextgis_frontend/tree/master/packages/ngw-connector#readme",
-	repository: {
-		type: "git",
-		url: "git://github.com/nextgis/nextgis_frontend.git"
-	},
-	engines: {
-		node: ">=18.20.4"
-	},
-	gitHead: "edc68033f914f6c95c4125b9738bba6d36e990b4"
-};
+	version: "3.1.1"};
 
 class AbortError extends Error {
   constructor(message = "AbortError") {
@@ -883,7 +827,7 @@ class NgwConnector {
     credentials = credentials || this.options.auth;
     if (credentials) {
       const { login, password } = credentials;
-      const encodedStr = [login, password].map(encodeURIComponent).join(":");
+      const encodedStr = `${login}:${password}`;
       {
         return Buffer.from(encodedStr).toString("base64");
       }
@@ -1171,8 +1115,9 @@ class ResourcesControl {
             serialization: "full",
             ...query
           }
-        }).then((resources) => {
-          if ((requestOptions == null ? void 0 : requestOptions.cache) && resources) {
+        }).then((response) => {
+          const resources = Array.isArray(response) ? response : response.items;
+          if (requestOptions == null ? void 0 : requestOptions.cache) {
             for (const x of resources) {
               this.cache.add("resource.item", Promise.resolve(x), {
                 id: x.resource.id