@golemio/core 1.2.2-dev.487919100 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/dist/integration-engine/models/PostgresModel.d.ts +2 -3
  2. package/dist/integration-engine/models/PostgresModel.js +6 -10
  3. package/dist/integration-engine/models/PostgresModel.js.map +1 -1
  4. package/dist/output-gateway/models/BaseModel.d.ts +1 -2
  5. package/dist/output-gateway/models/BaseModel.js.map +1 -1
  6. package/dist/output-gateway/models/GeoJsonModel.d.ts +24 -5
  7. package/dist/output-gateway/models/GeoJsonModel.js +2 -2
  8. package/dist/output-gateway/models/GeoJsonModel.js.map +1 -1
  9. package/dist/output-gateway/models/MongoModel.d.ts +1 -2
  10. package/dist/output-gateway/models/MongoModel.js +1 -5
  11. package/dist/output-gateway/models/MongoModel.js.map +1 -1
  12. package/dist/output-gateway/routes/BaseRouter.d.ts +2 -2
  13. package/dist/output-gateway/routes/BaseRouter.js +1 -1
  14. package/dist/output-gateway/routes/BaseRouter.js.map +1 -1
  15. package/dist/output-gateway/routes/GeoJsonRouter.d.ts +4 -4
  16. package/dist/output-gateway/routes/GeoJsonRouter.js +22 -20
  17. package/dist/output-gateway/routes/GeoJsonRouter.js.map +1 -1
  18. package/dist/output-gateway/routes/index.d.ts +0 -1
  19. package/dist/output-gateway/routes/index.js +0 -1
  20. package/dist/output-gateway/routes/index.js.map +1 -1
  21. package/dist/schema-definitions/index.d.ts +0 -1
  22. package/dist/schema-definitions/index.js +0 -1
  23. package/dist/schema-definitions/index.js.map +1 -1
  24. package/package.json +128 -128
  25. package/dist/output-gateway/models/interfaces/IBaseModel.d.ts +0 -5
  26. package/dist/output-gateway/models/interfaces/IBaseModel.js +0 -3
  27. package/dist/output-gateway/models/interfaces/IBaseModel.js.map +0 -1
  28. package/dist/output-gateway/models/interfaces/IGeoJsonModel.d.ts +0 -8
  29. package/dist/output-gateway/models/interfaces/IGeoJsonModel.js +0 -3
  30. package/dist/output-gateway/models/interfaces/IGeoJsonModel.js.map +0 -1
  31. package/dist/output-gateway/routes/interfaces/IGeoJsonAllFilterParameters.d.ts +0 -22
  32. package/dist/output-gateway/routes/interfaces/IGeoJsonAllFilterParameters.js +0 -3
  33. package/dist/output-gateway/routes/interfaces/IGeoJsonAllFilterParameters.js.map +0 -1
  34. package/dist/schema-definitions/SharedSchemaProvider.d.ts +0 -85
  35. package/dist/schema-definitions/SharedSchemaProvider.js +0 -91
  36. package/dist/schema-definitions/SharedSchemaProvider.js.map +0 -1
@@ -1,6 +1,6 @@
1
- import { IModel, ISequelizeSettings } from "./";
2
1
  import { JSONSchemaValidator, Validator } from "@golemio/validator";
3
- import { Model, ModelCtor, Sequelize, Transaction } from "sequelize";
2
+ import { ModelCtor, Transaction, Sequelize, Model } from "sequelize";
3
+ import { IModel, ISequelizeSettings } from "./";
4
4
  import { SyncOptions } from "sequelize/types/lib/sequelize";
5
5
  export declare class PostgresModel implements IModel {
6
6
  /** Model name */
@@ -19,7 +19,6 @@ export declare class PostgresModel implements IModel {
19
19
  protected schema: string;
20
20
  constructor(name: string, settings: ISequelizeSettings, validator: Validator | JSONSchemaValidator);
21
21
  save: (data: any, useTmpTable?: boolean) => Promise<any>;
22
- validate: (data: any) => Promise<boolean>;
23
22
  query: (query: string) => Promise<[unknown[], unknown]>;
24
23
  saveBySqlFunction: (data: any, primaryKeys: string[], useTmpTable?: boolean, transaction?: Transaction | null, connection?: Sequelize | null, batchId?: number | null) => Promise<any>;
25
24
  truncate: (useTmpTable?: boolean) => Promise<any>;
@@ -10,23 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.PostgresModel = void 0;
13
- const connectors_1 = require("../connectors");
14
- const helpers_1 = require("../helpers");
15
13
  const errors_1 = require("@golemio/errors");
16
14
  const sequelize_1 = require("sequelize");
15
+ const connectors_1 = require("../connectors");
16
+ const helpers_1 = require("../helpers");
17
17
  class PostgresModel {
18
18
  constructor(name, settings, validator) {
19
19
  this.save = (data, useTmpTable = false) => __awaiter(this, void 0, void 0, function* () {
20
20
  // data validation
21
- yield this.validate(data);
22
- const model = yield this.getSequelizeModelSafely(useTmpTable);
23
- // calling the method based on savingType (this.insertOnly() or this.insertOrUpdate())
24
- return this[this.savingType](model, data);
25
- });
26
- this.validate = (data) => __awaiter(this, void 0, void 0, function* () {
27
21
  if (this.validator) {
28
22
  try {
29
- return yield this.validator.Validate(data);
23
+ yield this.validator.Validate(data);
30
24
  }
31
25
  catch (err) {
32
26
  throw new errors_1.CustomError("Error while validating data.", true, this.name, 4005, err);
@@ -34,8 +28,10 @@ class PostgresModel {
34
28
  }
35
29
  else {
36
30
  helpers_1.log.warn(this.name + ": Model validator is not set.");
37
- return true;
38
31
  }
32
+ const model = yield this.getSequelizeModelSafely(useTmpTable);
33
+ // calling the method based on savingType (this.insertOnly() or this.insertOrUpdate())
34
+ return this[this.savingType](model, data);
39
35
  });
40
36
  this.query = (query) => __awaiter(this, void 0, void 0, function* () {
41
37
  return yield connectors_1.PostgresConnector.getConnection().query(query);
@@ -1 +1 @@
1
- {"version":3,"file":"PostgresModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/PostgresModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PostgresModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/PostgresModel.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,10 @@
1
- import { IBaseModel } from "./interfaces/IBaseModel";
2
1
  /**
3
2
  * Base model class, defines basic structure of a model. GetAll, GetOne functions, mandatory name
4
3
  *
5
4
  * Model /DATA ACCESS LAYER/: Defines data structure, connects to DB storage and retrieves data directly from database.
6
5
  * Performs database queries.
7
6
  */
8
- export declare abstract class BaseModel implements IBaseModel {
7
+ export declare abstract class BaseModel {
9
8
  /** Name of the model */
10
9
  protected name: string;
11
10
  protected constructor(name: string);
@@ -1 +1 @@
1
- {"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BaseModel.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,MAAsB,SAAS;IAI3B,YAAsB,IAAY;QAO3B,YAAO,GAAG,GAAW,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,CAAC;QARE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CAQJ;AAdD,8BAcC"}
1
+ {"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/BaseModel.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,MAAsB,SAAS;IAI3B,YAAsB,IAAY;QAO3B,YAAO,GAAG,GAAW,EAAE;YAC1B,OAAO,IAAI,CAAC,IAAI,CAAC;QACrB,CAAC,CAAC;QARE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CAQJ;AAdD,8BAcC"}
@@ -1,9 +1,7 @@
1
+ import { SchemaDefinition } from "mongoose";
1
2
  import { IGeoJSONFeature } from "../Geo";
2
3
  import { MongoModel } from "./";
3
4
  import { IPropertyResponseModel } from "./response";
4
- import { IGeoJsonAllFilterParameters } from "../routes/interfaces/IGeoJsonAllFilterParameters";
5
- import { SchemaDefinition } from "mongoose";
6
- import { IGeoJsonModel } from "./interfaces/IGeoJsonModel";
7
5
  /**
8
6
  * General model for GeoJSON data. Geo-spatial indexing and querying. Implements general GetAll and GetOne functions
9
7
  *
@@ -18,7 +16,7 @@ import { IGeoJsonModel } from "./interfaces/IGeoJsonModel";
18
16
  * Model /DATA ACCESS LAYER/: Defines data structure, connects to DB storage and retrieves data directly from database.
19
17
  * Performs database queries.
20
18
  */
21
- export declare class GeoJsonModel extends MongoModel implements IGeoJsonModel {
19
+ export declare class GeoJsonModel extends MongoModel {
22
20
  /**
23
21
  * Creates a model with specified schema definition
24
22
  * @param inName Name of the model - corresponding with mongo collection name (eg. "parkings" for "Parking" model)
@@ -39,7 +37,28 @@ export declare class GeoJsonModel extends MongoModel implements IGeoJsonModel {
39
37
  * @param options.additionalFilters Object with additional filter conditions to be added to the selection
40
38
  * @returns GeoJSON FeatureCollection with all retrieved objects in "features"
41
39
  */
42
- GetAll(options?: IGeoJsonAllFilterParameters): Promise<any>;
40
+ GetAll(options?: {
41
+ /** Latitude to sort results by (by proximity) */
42
+ lat?: number;
43
+ /** Longitute to sort results by */
44
+ lng?: number;
45
+ /** Maximum range from specified latLng. Only data within this range will be returned. */
46
+ range?: number;
47
+ /** Limit (can be used for pagination). Evaluated last, after all filters applied. */
48
+ limit?: number;
49
+ /** Offset (can be used for pagination). Evaluated last, after all filters applied. */
50
+ offset?: number;
51
+ /** Filters out all results with older updated_at than this parameter
52
+ * (filters not-updated data)
53
+ */
54
+ updatedSince?: string;
55
+ /** Filters the data to include only these with one of the specified "district" value */
56
+ districts?: string[];
57
+ /** Filters the data to include only specified IDs */
58
+ ids?: number[];
59
+ /** Object with additional filter conditions to be added to the selection */
60
+ additionalFilters?: object;
61
+ }): Promise<any>;
43
62
  /** Retrieves one record from database
44
63
  * @param inId Id of the record to be retrieved
45
64
  * @returns Object of the retrieved record or null
@@ -13,11 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.GeoJsonModel = void 0;
16
+ const errors_1 = require("@golemio/errors");
17
+ const moment_timezone_1 = __importDefault(require("moment-timezone"));
16
18
  const Geo_1 = require("../Geo");
17
19
  const Logger_1 = require("../Logger");
18
20
  const models_1 = require("./");
19
- const errors_1 = require("@golemio/errors");
20
- const moment_timezone_1 = __importDefault(require("moment-timezone"));
21
21
  /**
22
22
  * General model for GeoJSON data. Geo-spatial indexing and querying. Implements general GetAll and GetOne functions
23
23
  *
@@ -1 +1 @@
1
- {"version":3,"file":"GeoJsonModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/GeoJsonModel.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GeoJsonModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/GeoJsonModel.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { BaseModel } from "./";
2
1
  import { Model, Schema, SchemaDefinition } from "mongoose";
2
+ import { BaseModel } from "./";
3
3
  /**
4
4
  * General model for data stored in MongoDB.
5
5
  *
@@ -34,7 +34,6 @@ export declare abstract class MongoModel extends BaseModel {
34
34
  * Searches by this selection in FindOne()
35
35
  */
36
36
  PrimaryIdentifierSelection: (inId: any) => object;
37
- IsPrimaryIdNumber: (idKey: string) => Promise<boolean>;
38
37
  /**
39
38
  * Adds a new selection condition to filter the retrieved results by
40
39
  * @param newCondition New condition/filter object to be added to the "where" clause
@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.MongoModel = void 0;
13
- const models_1 = require("./");
14
13
  const mongoose_1 = require("mongoose");
14
+ const models_1 = require("./");
15
15
  /**
16
16
  * General model for data stored in MongoDB.
17
17
  *
@@ -47,10 +47,6 @@ class MongoModel extends models_1.BaseModel {
47
47
  this.PrimaryIdentifierSelection = (inId) => {
48
48
  return { "properties.id": inId };
49
49
  };
50
- this.IsPrimaryIdNumber = (idKey) => __awaiter(this, void 0, void 0, function* () {
51
- const schema = yield this.GetSchema();
52
- return schema.path(idKey) instanceof mongoose_1.Schema.Types.Number;
53
- });
54
50
  /**
55
51
  * Adds a new selection condition to filter the retrieved results by
56
52
  * @param newCondition New condition/filter object to be added to the "where" clause
@@ -1 +1 @@
1
- {"version":3,"file":"MongoModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/MongoModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAuC;AACvC,uCAAkE;AAElE;;;;;GAKG;AACH,MAAsB,UAAW,SAAQ,kBAAS;IAY9C;;;;;;OAMG;IACH,YAAmB,MAAc,EAAE,QAA0B,EAAE,gBAAyB;QACpF,KAAK,CAAC,MAAM,CAAC,CAAC;QAblB,uDAAuD;QAC7C,cAAS,GAAW,EAAE,CAAC;QACjC,oEAAoE;QAC1D,eAAU,GAAW,EAAE,CAAC;QA4BlC;;WAEG;QACI,cAAS,GAAG,GAAS,EAAE;YAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC,CAAA,CAAC;QAEF,qGAAqG;QACrG,wFAAwF;QACxF;;;WAGG;QACI,+BAA0B,GAAG,CAAC,IAAS,EAAU,EAAE;YACtD,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACrC,CAAC,CAAC;QAEK,sBAAiB,GAAG,CAAO,KAAa,EAAoB,EAAE;YACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YAEtC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,iBAAM,CAAC,KAAK,CAAC,MAAM,CAAC;QAC7D,CAAC,CAAA,CAAC;QAEF;;;WAGG;QACO,iBAAY,GAAG,CAAC,YAAoB,EAAE,EAAE;YAC9C,IAAI,CAAC,SAAS,mCAAQ,IAAI,CAAC,SAAS,GAAK,YAAY,CAAE,CAAC;QAC5D,CAAC,CAAC;QAEF;;;WAGG;QACO,kBAAa,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC5C,IAAI,CAAC,UAAU,mCAAQ,IAAI,CAAC,UAAU,GAAK,SAAS,CAAE,CAAC;QAC3D,CAAC,CAAC;QAtDE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,gBAAgB,EAAE;YAClB,IAAI,CAAC,cAAc,GAAG,gBAAgB,CAAC;SAC1C;QACD,gDAAgD;QAChD,IAAI;YACA,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;SACnD;QAAC,OAAO,KAAK,EAAE;YACZ,gGAAgG;YAChG,sDAAsD;YACtD,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACnE;QACD,6DAA6D;QAC7D,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;CAwCJ;AA5ED,gCA4EC"}
1
+ {"version":3,"file":"MongoModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/MongoModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkE;AAClE,+BAAuC;AAEvC;;;;;GAKG;AACH,MAAsB,UAAW,SAAQ,kBAAS;IAY9C;;;;;;OAMG;IACH,YAAmB,MAAc,EAAE,QAA0B,EAAE,gBAAyB;QACpF,KAAK,CAAC,MAAM,CAAC,CAAC;QAblB,uDAAuD;QAC7C,cAAS,GAAW,EAAE,CAAC;QACjC,oEAAoE;QAC1D,eAAU,GAAW,EAAE,CAAC;QA4BlC;;WAEG;QACI,cAAS,GAAG,GAAS,EAAE;YAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC,CAAA,CAAC;QAEF,qGAAqG;QACrG,wFAAwF;QACxF;;;WAGG;QACI,+BAA0B,GAAG,CAAC,IAAS,EAAU,EAAE;YACtD,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;QACrC,CAAC,CAAC;QAEF;;;WAGG;QACO,iBAAY,GAAG,CAAC,YAAoB,EAAE,EAAE;YAC9C,IAAI,CAAC,SAAS,mCAAQ,IAAI,CAAC,SAAS,GAAK,YAAY,CAAE,CAAC;QAC5D,CAAC,CAAC;QAEF;;;WAGG;QACO,kBAAa,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC5C,IAAI,CAAC,UAAU,mCAAQ,IAAI,CAAC,UAAU,GAAK,SAAS,CAAE,CAAC;QAC3D,CAAC,CAAC;QAhDE,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,gBAAgB,EAAE;YAClB,IAAI,CAAC,cAAc,GAAG,gBAAgB,CAAC;SAC1C;QACD,gDAAgD;QAChD,IAAI;YACA,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;SACnD;QAAC,OAAO,KAAK,EAAE;YACZ,gGAAgG;YAChG,sDAAsD;YACtD,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACnE;QACD,6DAA6D;QAC7D,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;CAkCJ;AAtED,gCAsEC"}
@@ -1,12 +1,12 @@
1
- import { IBaseModel } from "../models/interfaces/IBaseModel";
2
1
  import { Router } from "express";
2
+ import { BaseModel } from "../models";
3
3
  /**
4
4
  * Router /WEB LAYER/: maps routes to specific model functions, passes request parameters and handles responses.
5
5
  * Handles web logic (http request, response). Sets response headers, handles error responses.
6
6
  */
7
7
  export declare class BaseRouter {
8
8
  router: Router;
9
- protected model?: IBaseModel;
9
+ protected model?: BaseModel;
10
10
  /**
11
11
  * Converts a single value of `any` type to an array containing this element
12
12
  */
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.BaseRouter = void 0;
4
- const Logger_1 = require("../Logger");
5
4
  const express_1 = require("express");
5
+ const Logger_1 = require("../Logger");
6
6
  /**
7
7
  * Router /WEB LAYER/: maps routes to specific model functions, passes request parameters and handles responses.
8
8
  * Handles web logic (http request, response). Sets response headers, handles error responses.
@@ -1 +1 @@
1
- {"version":3,"file":"BaseRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/BaseRouter.ts"],"names":[],"mappings":";;;AAAA,sCAAiC;AAEjC,qCAAiC;AAEjC;;;GAGG;AACH,MAAa,UAAU;IAAvB;QACI,iDAAiD;QAC1C,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAIjC;;WAEG;QACI,mBAAc,GAAG,CAAC,SAAc,EAAE,EAAE;YACvC,IAAI,CAAC,CAAC,SAAS,YAAY,KAAK,CAAC,EAAE;gBAC/B,YAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,SAAS,GAAG,aAAa,CAAC,CAAC;gBAC5D,OAAO,CAAC,SAAS,CAAC,CAAC;aACtB;YACD,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC;IACN,CAAC;CAAA;AAhBD,gCAgBC"}
1
+ {"version":3,"file":"BaseRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/BaseRouter.ts"],"names":[],"mappings":";;;AACA,qCAAiC;AAEjC,sCAAiC;AAGjC;;;GAGG;AACH,MAAa,UAAU;IAAvB;QACI,iDAAiD;QAC1C,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAIjC;;WAEG;QACI,mBAAc,GAAG,CAAC,SAAc,EAAE,EAAE;YACvC,IAAI,CAAC,CAAC,SAAS,YAAY,KAAK,CAAC,EAAE;gBAC/B,YAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,SAAS,GAAG,aAAa,CAAC,CAAC;gBAC5D,OAAO,CAAC,SAAS,CAAC,CAAC;aACtB;YACD,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC;IACN,CAAC;CAAA;AAhBD,gCAgBC"}
@@ -1,7 +1,7 @@
1
- import { IGeoJsonModel } from "../models/interfaces/IGeoJsonModel";
2
- import { BaseRouter } from "./BaseRouter";
3
1
  import { NextFunction, Request, Response, Router } from "express";
4
2
  import { ValidationChain } from "express-validator/check";
3
+ import { GeoJsonModel } from "../models/GeoJsonModel";
4
+ import { BaseRouter } from "./BaseRouter";
5
5
  /**
6
6
  * Router for data in GeoJSON format using GeoJSON model -
7
7
  * binds / and /:id to GetAll and GetOne methods of GeoJsonModel.
@@ -11,9 +11,9 @@ import { ValidationChain } from "express-validator/check";
11
11
  */
12
12
  export declare class GeoJsonRouter extends BaseRouter {
13
13
  router: Router;
14
- protected model: IGeoJsonModel;
14
+ protected model: GeoJsonModel;
15
15
  protected standardParams: ValidationChain[];
16
- constructor(inModel: IGeoJsonModel);
16
+ constructor(inModel: GeoJsonModel);
17
17
  /**
18
18
  * Initiates all routes. Should respond with correct data to a HTTP requests to all routes.
19
19
  * @param {number|string} expire TTL for the caching middleware
@@ -10,14 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.GeoJsonRouter = void 0;
13
+ const express_1 = require("express");
14
+ const check_1 = require("express-validator/check");
15
+ const mongoose_1 = require("mongoose");
16
+ const lodash_1 = require("lodash");
13
17
  const Geo_1 = require("../Geo");
14
18
  const Logger_1 = require("../Logger");
15
19
  const redis_1 = require("../redis");
16
- const BaseRouter_1 = require("./BaseRouter");
17
20
  const Validation_1 = require("../Validation");
18
- const express_1 = require("express");
19
- const check_1 = require("express-validator/check");
20
- const lodash_1 = require("lodash");
21
+ const BaseRouter_1 = require("./BaseRouter");
21
22
  /**
22
23
  * Router for data in GeoJSON format using GeoJSON model -
23
24
  * binds / and /:id to GetAll and GetOne methods of GeoJsonModel.
@@ -91,22 +92,23 @@ class GeoJsonRouter extends BaseRouter_1.BaseRouter {
91
92
  };
92
93
  this.GetIdQueryParamWithCorrectType = () => __awaiter(this, void 0, void 0, function* () {
93
94
  let idParam;
94
- // Get the primary ID of the schema (the attribute name)
95
- const idKey = Object.keys(this.model.PrimaryIdentifierSelection("0"))[0];
96
- let message = "Created model " + this.model.GetName() + " has ID `" + idKey + "` of type ";
97
- const isPrimaryIdNumber = yield this.model.IsPrimaryIdNumber(idKey);
98
- if (isPrimaryIdNumber) {
99
- message += "number.";
100
- // Create a url parameter for detail route with type number
101
- idParam = (0, check_1.param)("id").exists().isNumeric();
102
- }
103
- else {
104
- message += "string.";
105
- // Create a url parameter for detail route with type string
106
- idParam = (0, check_1.param)("id").exists().isString();
107
- }
108
- Logger_1.log.silly(message);
109
- return idParam;
95
+ return yield this.model.GetSchema().then((schema) => {
96
+ // Get the primary ID of the schema (the attribute name)
97
+ const idKey = Object.keys(this.model.PrimaryIdentifierSelection("0"))[0];
98
+ let message = "Created model " + this.model.GetName() + " has ID `" + idKey + "` of type ";
99
+ if (schema.path(idKey) instanceof mongoose_1.Schema.Types.Number) {
100
+ message += "number.";
101
+ // Create a url parameter for detail route with type number
102
+ idParam = (0, check_1.param)("id").exists().isNumeric();
103
+ }
104
+ else {
105
+ message += "string.";
106
+ // Create a url parameter for detail route with type string
107
+ idParam = (0, check_1.param)("id").exists().isString();
108
+ }
109
+ Logger_1.log.silly(message);
110
+ return idParam;
111
+ });
110
112
  });
111
113
  this.model = inModel;
112
114
  }
@@ -1 +1 @@
1
- {"version":3,"file":"GeoJsonRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/GeoJsonRouter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GeoJsonRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/GeoJsonRouter.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
1
  export * from "./GeoJsonRouter";
2
2
  export * from "./HistoryRouter";
3
3
  export * from "./RouterBuilder";
4
- export * from "./interfaces/IGeoJsonAllFilterParameters";
@@ -13,5 +13,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
13
13
  __exportStar(require("./GeoJsonRouter"), exports);
14
14
  __exportStar(require("./HistoryRouter"), exports);
15
15
  __exportStar(require("./RouterBuilder"), exports);
16
- __exportStar(require("./interfaces/IGeoJsonAllFilterParameters"), exports);
17
16
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC;AAChC,2EAAyD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAgC;AAChC,kDAAgC;AAChC,kDAAgC"}
@@ -1,2 +1 @@
1
1
  export * from "./ErrorLog";
2
- export * from "./SharedSchemaProvider";
@@ -12,5 +12,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  /* sch/index.ts */
14
14
  __exportStar(require("./ErrorLog"), exports);
15
- __exportStar(require("./SharedSchemaProvider"), exports);
16
15
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema-definitions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kBAAkB;AAClB,6CAA2B;AAC3B,yDAAuC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema-definitions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kBAAkB;AAClB,6CAA2B"}
package/package.json CHANGED
@@ -1,130 +1,130 @@
1
1
  {
2
- "name": "@golemio/core",
3
- "version": "1.2.2-dev.487919100",
4
- "description": "Golemio Core Module",
5
- "main": "dist/index.js",
6
- "types": "dist/index.d.ts",
7
- "bin": {
8
- "golemio-import-test-data": "bin/import-test-data.js"
9
- },
10
- "scripts": {
11
- "build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
12
- "build-minimal": "run-s 'build --sourceMap false --declaration false'",
13
- "build-watch": "run-s 'build --watch --preserveWatchOutput'",
14
- "test": "cross-env NODE_ENV=test TS_NODE_COMPILER='ttypescript' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
15
- "test-debug": "run-s 'test --inspect-brk=9230'",
16
- "code-coverage": "nyc run-s 'test -r source-map-support/register'",
17
- "generate-docs": "typedoc --out docs/typedoc src",
18
- "lint": "eslint \"{src,test}/**/*.ts\""
19
- },
20
- "keywords": [
21
- "golemio"
22
- ],
23
- "author": "Operator ICT, a.s.",
24
- "license": "MIT",
25
- "repository": {
26
- "type": "git",
27
- "url": "https://gitlab.com/operator-ict/golemio/code/modules/core"
28
- },
29
- "devDependencies": {
30
- "@commitlint/cli": "^11.0.0",
31
- "@commitlint/config-conventional": "^11.0.0",
32
- "@golemio/eslint-config": "^1.0.2",
33
- "@types/amqplib": "^0.5.17",
34
- "@types/apicache": "^1.2.3",
35
- "@types/chai": "4.2.3",
36
- "@types/chai-as-promised": "7.1.2",
37
- "@types/content-type": "^1.1.3",
38
- "@types/debug": "0.0.31",
39
- "@types/decompress": "^4.2.3",
40
- "@types/ioredis": "^4.17.10",
41
- "@types/lodash": "^4.14.165",
42
- "@types/mocha": "^8.2.0",
43
- "@types/morgan": "^1.9.2",
44
- "@types/node": "^14.14.20",
45
- "@types/redis": "^2.8.28",
46
- "@types/sinon": "7.0.13",
47
- "@types/ssh2-sftp-client": "^5.3.1",
48
- "@types/supertest": "^2.0.11",
49
- "@zerollup/ts-transform-paths": "^1.7.18",
50
- "chai": "4.2.0",
51
- "chai-as-promised": "7.1.1",
52
- "cross-env": "^7.0.3",
53
- "eslint": "^7.17.0",
54
- "husky": "^4.3.7",
55
- "mocha": "^9.1.2",
56
- "nock": "^13.0.5",
57
- "npm-run-all": "^4.1.5",
58
- "nyc": "^15.1.0",
59
- "prettier": "^2.2.1",
60
- "pretty-quick": "^3.1.0",
61
- "rimraf": "^3.0.2",
62
- "sinon": "7.1.1",
63
- "source-map-support": "0.5.9",
64
- "supertest": "^6.1.6",
65
- "ts-node": "^9.1.1",
66
- "ttypescript": "^1.5.12",
67
- "typedoc": "^0.21.4",
68
- "typescript": "^4.1.3"
69
- },
70
- "dependencies": {
71
- "@golemio/errors": "^1.0.1",
72
- "@golemio/utils": "^1.0.0",
73
- "@golemio/validator": "0.2.0",
74
- "@google-cloud/storage": "^5.18.0",
75
- "@opentelemetry/api": "^1.0.2",
76
- "@opentelemetry/exporter-jaeger": "^0.24.0",
77
- "@opentelemetry/instrumentation-express": "^0.24.0",
78
- "@opentelemetry/instrumentation-http": "^0.24.0",
79
- "@opentelemetry/instrumentation-ioredis": "^0.24.0",
80
- "@opentelemetry/node": "^0.24.0",
81
- "@opentelemetry/resources": "^0.24.0",
82
- "@opentelemetry/tracing": "^0.24.0",
83
- "@sentry/node": "^6.11.0",
84
- "@sentry/tracing": "^6.11.0",
85
- "@types/express": "^4.16.0",
86
- "@types/request-promise": "^4.1.45",
87
- "ajv": "^8.10.0",
88
- "amqplib": "^0.7.1",
89
- "apicache": "^1.6.3",
90
- "aws-sdk": "^2.823.0",
91
- "axios": "^0.24.0",
92
- "basic-ftp": "^4.6.6",
93
- "content-type": "^1.0.4",
94
- "debug": "3.1.0",
95
- "decompress": "^4.2.1",
96
- "dotenv": "^8.2.0",
97
- "express": "^4.16.4",
98
- "express-validator": "^5.3.1",
99
- "fast-csv": "^4.3.6",
100
- "fast-glob": "^3.2.5",
101
- "iconv-lite": "^0.6.2",
102
- "influx": "^5.6.3",
103
- "ioredis": "^4.19.4",
104
- "lightship": "^6.7.2",
105
- "lodash": "^4.17.21",
106
- "moment-timezone": "^0.5.26",
107
- "mongodb-restore-dump": "1.0.1",
108
- "mongoose": "^5.3.6",
109
- "morgan": "^1.10.0",
110
- "opentelemetry-instrumentation-amqplib": "^0.24.0",
111
- "opentelemetry-instrumentation-aws-sdk": "^0.24.1",
112
- "opentelemetry-instrumentation-mongoose": "^0.24.0",
113
- "opentelemetry-instrumentation-sequelize": "^0.24.0",
114
- "path-to-regexp": "^6.2.0",
115
- "pg": "^8.6.0",
116
- "prom-client": "^14.0.0",
117
- "redis": "^3.1.1",
118
- "request": "2.88.0",
119
- "request-promise": "^4.2.5",
120
- "sequelize": "^6.6.5",
121
- "ssh2-sftp-client": "^7.1.0",
122
- "winston": "^3.3.3",
123
- "xml2js-es6-promise": "^1.1.1"
124
- },
125
- "resolutions": {
126
- "mpath": "^0.8.4",
127
- "**/axios/follow-redirects": "^1.14.7",
128
- "url-parse": "^1.5.6"
129
- }
2
+ "name": "@golemio/core",
3
+ "version": "1.2.2",
4
+ "description": "Golemio Core Module",
5
+ "main": "dist/index.js",
6
+ "types": "dist/index.d.ts",
7
+ "bin": {
8
+ "golemio-import-test-data": "bin/import-test-data.js"
9
+ },
10
+ "scripts": {
11
+ "build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
12
+ "build-minimal": "run-s 'build --sourceMap false --declaration false'",
13
+ "build-watch": "run-s 'build --watch --preserveWatchOutput'",
14
+ "test": "cross-env NODE_ENV=test TS_NODE_COMPILER='ttypescript' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
15
+ "test-debug": "run-s 'test --inspect-brk=9230'",
16
+ "code-coverage": "nyc run-s 'test -r source-map-support/register'",
17
+ "generate-docs": "typedoc --out docs/typedoc src",
18
+ "lint": "eslint \"{src,test}/**/*.ts\""
19
+ },
20
+ "keywords": [
21
+ "golemio"
22
+ ],
23
+ "author": "Operator ICT, a.s.",
24
+ "license": "MIT",
25
+ "repository": {
26
+ "type": "git",
27
+ "url": "https://gitlab.com/operator-ict/golemio/code/modules/core"
28
+ },
29
+ "devDependencies": {
30
+ "@commitlint/cli": "^11.0.0",
31
+ "@commitlint/config-conventional": "^11.0.0",
32
+ "@golemio/eslint-config": "^1.0.2",
33
+ "@types/amqplib": "^0.5.17",
34
+ "@types/apicache": "^1.2.3",
35
+ "@types/chai": "4.2.3",
36
+ "@types/chai-as-promised": "7.1.2",
37
+ "@types/content-type": "^1.1.3",
38
+ "@types/debug": "0.0.31",
39
+ "@types/decompress": "^4.2.3",
40
+ "@types/ioredis": "^4.17.10",
41
+ "@types/lodash": "^4.14.165",
42
+ "@types/mocha": "^8.2.0",
43
+ "@types/morgan": "^1.9.2",
44
+ "@types/node": "^14.14.20",
45
+ "@types/redis": "^2.8.28",
46
+ "@types/sinon": "7.0.13",
47
+ "@types/ssh2-sftp-client": "^5.3.1",
48
+ "@types/supertest": "^2.0.11",
49
+ "@zerollup/ts-transform-paths": "^1.7.18",
50
+ "chai": "4.2.0",
51
+ "chai-as-promised": "7.1.1",
52
+ "cross-env": "^7.0.3",
53
+ "eslint": "^7.17.0",
54
+ "husky": "^4.3.7",
55
+ "mocha": "^9.1.2",
56
+ "nock": "^13.0.5",
57
+ "npm-run-all": "^4.1.5",
58
+ "nyc": "^15.1.0",
59
+ "prettier": "^2.2.1",
60
+ "pretty-quick": "^3.1.0",
61
+ "rimraf": "^3.0.2",
62
+ "sinon": "7.1.1",
63
+ "source-map-support": "0.5.9",
64
+ "supertest": "^6.1.6",
65
+ "ts-node": "^9.1.1",
66
+ "ttypescript": "^1.5.12",
67
+ "typedoc": "^0.21.4",
68
+ "typescript": "^4.1.3"
69
+ },
70
+ "dependencies": {
71
+ "@golemio/errors": "^1.0.1",
72
+ "@golemio/utils": "^1.0.0",
73
+ "@golemio/validator": "0.2.0",
74
+ "@google-cloud/storage": "^5.18.0",
75
+ "@opentelemetry/api": "^1.0.2",
76
+ "@opentelemetry/exporter-jaeger": "^0.24.0",
77
+ "@opentelemetry/instrumentation-express": "^0.24.0",
78
+ "@opentelemetry/instrumentation-http": "^0.24.0",
79
+ "@opentelemetry/instrumentation-ioredis": "^0.24.0",
80
+ "@opentelemetry/node": "^0.24.0",
81
+ "@opentelemetry/resources": "^0.24.0",
82
+ "@opentelemetry/tracing": "^0.24.0",
83
+ "@sentry/node": "^6.11.0",
84
+ "@sentry/tracing": "^6.11.0",
85
+ "@types/express": "^4.16.0",
86
+ "@types/request-promise": "^4.1.45",
87
+ "ajv": "^8.10.0",
88
+ "amqplib": "^0.7.1",
89
+ "apicache": "^1.6.3",
90
+ "aws-sdk": "^2.823.0",
91
+ "axios": "^0.24.0",
92
+ "basic-ftp": "^4.6.6",
93
+ "content-type": "^1.0.4",
94
+ "debug": "3.1.0",
95
+ "decompress": "^4.2.1",
96
+ "dotenv": "^8.2.0",
97
+ "express": "^4.16.4",
98
+ "express-validator": "^5.3.1",
99
+ "fast-csv": "^4.3.6",
100
+ "fast-glob": "^3.2.5",
101
+ "iconv-lite": "^0.6.2",
102
+ "influx": "^5.6.3",
103
+ "ioredis": "^4.19.4",
104
+ "lightship": "^6.7.2",
105
+ "lodash": "^4.17.21",
106
+ "moment-timezone": "^0.5.26",
107
+ "mongodb-restore-dump": "1.0.1",
108
+ "mongoose": "^5.3.6",
109
+ "morgan": "^1.10.0",
110
+ "opentelemetry-instrumentation-amqplib": "^0.24.0",
111
+ "opentelemetry-instrumentation-aws-sdk": "^0.24.1",
112
+ "opentelemetry-instrumentation-mongoose": "^0.24.0",
113
+ "opentelemetry-instrumentation-sequelize": "^0.24.0",
114
+ "path-to-regexp": "^6.2.0",
115
+ "pg": "^8.6.0",
116
+ "prom-client": "^14.0.0",
117
+ "redis": "^3.1.1",
118
+ "request": "2.88.0",
119
+ "request-promise": "^4.2.5",
120
+ "sequelize": "^6.6.5",
121
+ "ssh2-sftp-client": "^7.1.0",
122
+ "winston": "^3.3.3",
123
+ "xml2js-es6-promise": "^1.1.1"
124
+ },
125
+ "resolutions": {
126
+ "mpath": "^0.8.4",
127
+ "**/axios/follow-redirects": "^1.14.7",
128
+ "url-parse": "^1.5.6"
129
+ }
130
130
  }
@@ -1,5 +0,0 @@
1
- export interface IBaseModel {
2
- GetAll(options?: any): Promise<any>;
3
- GetOne(id: any): Promise<any>;
4
- GetName(): string;
5
- }
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=IBaseModel.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"IBaseModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/models/interfaces/IBaseModel.ts"],"names":[],"mappings":""}
@@ -1,8 +0,0 @@
1
- import { IBaseModel } from "./IBaseModel";
2
- export interface IGeoJsonModel extends IBaseModel {
3
- GetAll(options?: any): Promise<any>;
4
- GetOne(id: string): Promise<any>;
5
- GetName(): string;
6
- IsPrimaryIdNumber(idKey: string): Promise<boolean>;
7
- PrimaryIdentifierSelection(arg0: string): object;
8
- }
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=IGeoJsonModel.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"IGeoJsonModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/models/interfaces/IGeoJsonModel.ts"],"names":[],"mappings":""}
@@ -1,22 +0,0 @@
1
- export interface IGeoJsonAllFilterParameters {
2
- /** Latitude to sort results by (by proximity) */
3
- lat?: number;
4
- /** Longitute to sort results by */
5
- lng?: number | undefined | null;
6
- /** Maximum range from specified latLng. Only data within this range will be returned. */
7
- range?: number;
8
- /** Limit (can be used for pagination). Evaluated last, after all filters applied. */
9
- limit?: number;
10
- /** Offset (can be used for pagination). Evaluated last, after all filters applied. */
11
- offset?: number;
12
- /** Filters out all results with older updated_at than this parameter
13
- * (filters not-updated data)
14
- */
15
- updatedSince?: string;
16
- /** Filters the data to include only these with one of the specified "district" value */
17
- districts?: string[];
18
- /** Filters the data to include only specified IDs */
19
- ids?: number[];
20
- /** Object with additional filter conditions to be added to the selection */
21
- additionalFilters?: object;
22
- }
@@ -1,3 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=IGeoJsonAllFilterParameters.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"IGeoJsonAllFilterParameters.js","sourceRoot":"","sources":["../../../../src/output-gateway/routes/interfaces/IGeoJsonAllFilterParameters.ts"],"names":[],"mappings":""}
@@ -1,85 +0,0 @@
1
- export declare class SharedSchemaProvider {
2
- static Geometry: {
3
- $id: string;
4
- title: string;
5
- description: string;
6
- type: string;
7
- required: string[];
8
- oneOf: ({
9
- title: string;
10
- properties: {
11
- type: {
12
- enum: string[];
13
- };
14
- coordinates: {
15
- $ref: string;
16
- type?: undefined;
17
- items?: undefined;
18
- };
19
- };
20
- } | {
21
- title: string;
22
- properties: {
23
- type: {
24
- enum: string[];
25
- };
26
- coordinates: {
27
- type: string;
28
- items: {
29
- $ref: string;
30
- };
31
- $ref?: undefined;
32
- };
33
- };
34
- })[];
35
- definitions: {
36
- position: {
37
- description: string;
38
- type: string;
39
- minItems: number;
40
- items: {
41
- type: string;
42
- }[];
43
- additionalItems: boolean;
44
- };
45
- positionArray: {
46
- description: string;
47
- type: string;
48
- items: {
49
- $ref: string;
50
- };
51
- };
52
- lineString: {
53
- description: string;
54
- allOf: ({
55
- $ref: string;
56
- type?: undefined;
57
- minItems?: undefined;
58
- } | {
59
- type: string;
60
- minItems: number;
61
- $ref?: undefined;
62
- })[];
63
- };
64
- linearRing: {
65
- description: string;
66
- allOf: ({
67
- $ref: string;
68
- type?: undefined;
69
- minItems?: undefined;
70
- } | {
71
- type: string;
72
- minItems: number;
73
- $ref?: undefined;
74
- })[];
75
- };
76
- polygon: {
77
- description: string;
78
- type: string;
79
- items: {
80
- $ref: string;
81
- };
82
- };
83
- };
84
- };
85
- }
@@ -1,91 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.SharedSchemaProvider = void 0;
4
- class SharedSchemaProvider {
5
- }
6
- exports.SharedSchemaProvider = SharedSchemaProvider;
7
- SharedSchemaProvider.Geometry = {
8
- $id: "geometrySchema.json",
9
- title: "geometry",
10
- description: "One geometry as defined by GeoJSON. Licensed as per original source is https://github.com/fge/sample-json-schemas/blob/master/geojson/geometry.json",
11
- type: "object",
12
- required: ["type", "coordinates"],
13
- oneOf: [
14
- {
15
- title: "Point",
16
- properties: {
17
- type: { enum: ["Point"] },
18
- coordinates: { $ref: "#/definitions/position" },
19
- },
20
- },
21
- {
22
- title: "MultiPoint",
23
- properties: {
24
- type: { enum: ["MultiPoint"] },
25
- coordinates: { $ref: "#/definitions/positionArray" },
26
- },
27
- },
28
- {
29
- title: "LineString",
30
- properties: {
31
- type: { enum: ["LineString"] },
32
- coordinates: { $ref: "#/definitions/lineString" },
33
- },
34
- },
35
- {
36
- title: "MultiLineString",
37
- properties: {
38
- type: { enum: ["MultiLineString"] },
39
- coordinates: {
40
- type: "array",
41
- items: { $ref: "#/definitions/lineString" },
42
- },
43
- },
44
- },
45
- {
46
- title: "Polygon",
47
- properties: {
48
- type: { enum: ["Polygon"] },
49
- coordinates: { $ref: "#/definitions/polygon" },
50
- },
51
- },
52
- {
53
- title: "MultiPolygon",
54
- properties: {
55
- type: { enum: ["MultiPolygon"] },
56
- coordinates: {
57
- type: "array",
58
- items: { $ref: "#/definitions/polygon" },
59
- },
60
- },
61
- },
62
- ],
63
- definitions: {
64
- position: {
65
- description: "A single position",
66
- type: "array",
67
- minItems: 2,
68
- items: [{ type: "number" }, { type: "number" }],
69
- additionalItems: false,
70
- },
71
- positionArray: {
72
- description: "An array of positions",
73
- type: "array",
74
- items: { $ref: "#/definitions/position" },
75
- },
76
- lineString: {
77
- description: "An array of two or more positions",
78
- allOf: [{ $ref: "#/definitions/positionArray" }, { type: "array", minItems: 2 }],
79
- },
80
- linearRing: {
81
- description: "An array of four positions where the first equals the last",
82
- allOf: [{ $ref: "#/definitions/positionArray" }, { type: "array", minItems: 4 }],
83
- },
84
- polygon: {
85
- description: "An array of linear rings",
86
- type: "array",
87
- items: { $ref: "#/definitions/linearRing" },
88
- },
89
- },
90
- };
91
- //# sourceMappingURL=SharedSchemaProvider.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"SharedSchemaProvider.js","sourceRoot":"","sources":["../../src/schema-definitions/SharedSchemaProvider.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;;AAAjC,oDAsFC;AArFiB,6BAAQ,GAAG;IACrB,GAAG,EAAE,qBAAqB;IAC1B,KAAK,EAAE,UAAU;IACjB,WAAW,EACP,qJAAqJ;IACzJ,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC;IACjC,KAAK,EAAE;QACH;YACI,KAAK,EAAE,OAAO;YACd,UAAU,EAAE;gBACR,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE;gBACzB,WAAW,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;aAClD;SACJ;QACD;YACI,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE;gBACR,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE;gBAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,6BAA6B,EAAE;aACvD;SACJ;QACD;YACI,KAAK,EAAE,YAAY;YACnB,UAAU,EAAE;gBACR,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,YAAY,CAAC,EAAE;gBAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE;aACpD;SACJ;QACD;YACI,KAAK,EAAE,iBAAiB;YACxB,UAAU,EAAE;gBACR,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,iBAAiB,CAAC,EAAE;gBACnC,WAAW,EAAE;oBACT,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE;iBAC9C;aACJ;SACJ;QACD;YACI,KAAK,EAAE,SAAS;YAChB,UAAU,EAAE;gBACR,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE;gBAC3B,WAAW,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE;aACjD;SACJ;QACD;YACI,KAAK,EAAE,cAAc;YACrB,UAAU,EAAE;gBACR,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,cAAc,CAAC,EAAE;gBAChC,WAAW,EAAE;oBACT,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,EAAE,IAAI,EAAE,uBAAuB,EAAE;iBAC3C;aACJ;SACJ;KACJ;IACD,WAAW,EAAE;QACT,QAAQ,EAAE;YACN,WAAW,EAAE,mBAAmB;YAChC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC;YACX,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YAC/C,eAAe,EAAE,KAAK;SACzB;QACD,aAAa,EAAE;YACX,WAAW,EAAE,uBAAuB;YACpC,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;SAC5C;QACD,UAAU,EAAE;YACR,WAAW,EAAE,mCAAmC;YAChD,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,6BAA6B,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SACnF;QACD,UAAU,EAAE;YACR,WAAW,EAAE,4DAA4D;YACzE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,6BAA6B,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SACnF;QACD,OAAO,EAAE;YACL,WAAW,EAAE,0BAA0B;YACvC,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE;SAC9C;KACJ;CACJ,CAAC"}