0.66.1

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [0.66.0](https://gitlab.com/openstapps/core/compare/v0.65.1...v0.66.0) (2022-05-11)
+
+
+### Features
+
+* add geo filter envelope support ([484be6a](https://gitlab.com/openstapps/core/commit/484be6a890d743601efa5d40d33ea2c619f3126d))
+
+
+
+## [0.65.1](https://gitlab.com/openstapps/core/compare/v0.65.0...v0.65.1) (2022-04-04)
+
+
+
+# [0.65.0](https://gitlab.com/openstapps/core/compare/v0.64.0...v0.65.0) (2022-04-04)
+
+
+
+# [0.64.0](https://gitlab.com/openstapps/core/compare/v0.63.0...v0.64.0) (2022-03-21)
+
+
+
 # [0.63.0](https://gitlab.com/openstapps/core/compare/v0.62.0...v0.63.0) (2022-01-24)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstapps/core",
-  "version": "0.64.0",
+  "version": "0.66.1",
   "description": "StAppsCore - Generalized model of data",
   "keywords": [
     "Model",
@@ -18,7 +18,7 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md && git commit -m 'docs: update changelog'",
     "check-configuration": "openstapps-configuration",
     "compile": "rimraf lib && tsc",
-    "documentation": "typedoc --name \"@openstapps/core\" --includeVersion --out docs --readme README.md --listInvalidSymbolLinks src",
+    "documentation": "typedoc --name \"@openstapps/core\" --includeVersion --out docs --readme README.md --listInvalidSymbolLinks --entryPointStrategy expand src",
     "pack": "openstapps-core-tools pack",
     "postversion": "npm run changelog",
     "prepublishOnly": "npm ci && npm run build",
@@ -45,39 +45,39 @@
     "Wieland Schöbl"
   ],
   "dependencies": {
-    "@openstapps/core-tools": "0.29.0",
+    "@openstapps/core-tools": "0.30.1",
     "@types/geojson": "1.0.6",
     "@types/json-patch": "0.0.30",
-    "@types/json-schema": "7.0.10",
-    "@types/node": "14.18.3",
-    "fast-clone": "1.5.13",
+    "@types/json-schema": "7.0.11",
+    "@types/node": "14.18.18",
     "fast-deep-equal": "3.1.3",
     "http-status-codes": "2.2.0",
     "json-patch": "0.7.0",
     "json-schema": "0.4.0",
+    "rfdc": "1.3.0",
     "ts-optchain": "0.1.8"
   },
   "devDependencies": {
-    "@openstapps/configuration": "0.29.0",
-    "@openstapps/es-mapping-generator": "0.0.4",
-    "@openstapps/logger": "0.8.0",
+    "@openstapps/configuration": "0.29.1",
+    "@openstapps/es-mapping-generator": "0.1.0",
+    "@openstapps/logger": "0.8.1",
     "@testdeck/mocha": "0.2.0",
-    "@types/chai": "4.3.0",
-    "@types/lodash": "4.14.180",
-    "@types/mocha": "9.1.0",
+    "@types/chai": "4.3.1",
+    "@types/lodash": "4.14.182",
+    "@types/mocha": "9.1.1",
     "@types/rimraf": "3.0.2",
     "chai": "4.3.6",
     "conditional-type-checks": "1.0.5",
     "conventional-changelog-cli": "2.2.2",
     "lodash": "4.17.21",
-    "mocha": "9.2.2",
+    "mocha": "10.0.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
     "source-map-support": "0.5.21",
     "surge": "0.23.1",
-    "ts-node": "10.7.0",
+    "ts-node": "10.8.0",
     "tslint": "6.1.3",
-    "typedoc": "0.21.6",
+    "typedoc": "0.22.15",
     "typescript": "4.3.5"
   },
   "nyc": {

src/protocol/search/filters/geo.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 // tslint:disable-next-line:no-implicit-dependencies
-import {Polygon} from 'geojson';
+import {Polygon, Position} from 'geojson';
 import {SCThingsField} from '../../../meta';
 import {SCSearchAbstractFilter, SCSearchAbstractFilterArguments} from '../filter';
 
@@ -29,6 +29,24 @@ export interface SCGeoFilter extends SCSearchAbstractFilter<SCGeoFilterArguments
   type: 'geo';
 }
 
+/**
+ * A rectangular geo shape, representing the top-left and bottom-right corners
+ *
+ * This is an extension of the Geojson type
+ * http://geojson.org/geojson-spec.html
+ */
+export interface Envelope {
+  /**
+   * The top-left and bottom-right corners of the bounding box
+   */
+  coordinates: [Position, Position];
+
+  /**
+   * The type of the geometry
+   */
+  type: 'envelope';
+}
+
 /**
  * Arguments for filter instruction by geo data
  */
@@ -41,7 +59,7 @@ export interface SCGeoFilterArguments extends SCSearchAbstractFilterArguments {
   /**
    * Geo data to check up on
    */
-  shape: Polygon;
+  shape: Polygon | Envelope;
 
   /**
    * Spatial relation between the provided shape and the shape of the field.

src/translator.ts

@@ -12,8 +12,8 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-import clone = require('fast-clone');
 import equal = require('fast-deep-equal/es6');
+import clone = require('rfdc');
 import {Defined, TSOCType} from 'ts-optchain';
 import {SCLanguageCode} from './general/i18n';
 import {isThing} from './guards';
@@ -77,6 +77,13 @@ export class SCThingTranslator {
     this.sourceCache = new LRUCache(cacheCapacity);
     this._language = language;
     this.metaClasses = SCClasses;
+
+    // Initalize all meta classes once
+    if (typeof (this.metaClasses as any)[Object.keys(this.metaClasses)[0]] === 'function') {
+      for (const metaClass of Object.keys(this.metaClasses)) {
+        (this.metaClasses as any)[metaClass] = new (SCClasses as any)[metaClass]();
+      }
+    }
   }
 
   /**
@@ -143,7 +150,7 @@ export class SCThingTranslator {
    */
   private getMetaClassInstance(thingType: SCThingType): any {
     if (thingType in this.metaClasses) {
-      return new (this.metaClasses as any)[thingType]();
+      return this.metaClasses[thingType];
     }
 
     return undefined;
@@ -234,7 +241,7 @@ export class SCThingTranslator {
         return cachedInstance as T;
       }
     }
-    const translatedInstance = this.translateThingInPlaceDestructively(clone(thing));
+    const translatedInstance = this.translateThingInPlaceDestructively(clone()(thing));
     delete translatedInstance.translations;
     this.cache.putObject(translatedInstance);
     this.sourceCache.putObject(thing);
@@ -267,7 +274,7 @@ export class SCThingTranslator {
               return this.deeptranslate((objTranslatedFromCache as any)[key]);
             }
           }
-          const objTranslated = this.translateThingInPlaceDestructively(clone(obj));
+          const objTranslated = this.translateThingInPlaceDestructively(clone()(obj));
           this.cache.putObject(objTranslated);
           this.sourceCache.putObject(thing);
 

test/translator.spec.ts

@@ -13,7 +13,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {expect} from 'chai';
-import clone = require('fast-clone');
+import clone from 'rfdc';
 import {slow, suite, test, timeout} from '@testdeck/mocha';
 import {SCThingOriginType, SCThingType, SCThingRemoteOrigin} from '../src/things/abstract/thing';
 import {SCBuildingWithoutReferences} from '../src/things/building';
@@ -264,7 +264,7 @@ export class TranslationSpecInplace {
   @test
   public reaccessWithChangedSourceOmitsLRUCache() {
     const translatorDE = new SCThingTranslator('de');
-    const dishCopy = clone(dish);
+    const dishCopy = clone()(dish);
     const translatedDish = translatorDE.translatedAccess(dish);
     const distructivelyTranslatedDish = translatorDE.translate(dish);
 
@@ -330,7 +330,7 @@ export class MetaTranslationSpec {
 
   @test
   public thingWithoutMetaClass() {
-    const dishCopy = clone(dish);
+    const dishCopy = clone()(dish);
     const typeNonExistant = eval("(x) => x + 'typeNonExistant';");
     // this will assign a non existant SCThingType to dishCopy
     dishCopy.type = typeNonExistant();