samls-js-integration 1.0.35 → 1.0.37

package/dist/browser/samls.js

@@ -10,23 +10,28 @@ var samls = (function (exports, axios) {
     const requestConfig = { baseURL: URL.domain };
     const http = axios.create(requestConfig);
 
-    const PATH_SEGMENT$3 = 'AddressDetail';
+    const PATH_SEGMENT$2 = 'AddressDetail';
     class MlsClient {
-        GetMlsInfos() {
-            return http.get(`${PATH_SEGMENT$3}/Mls`);
+        getMlsInfos() {
+            return http.get(`${PATH_SEGMENT$2}/Mls`);
         }
-        GetMlsInfoById(id) {
-            return http.get(`${PATH_SEGMENT$3}/Mls/${id}`);
+        getMlsInfoById(id) {
+            return http.get(`${PATH_SEGMENT$2}/Mls/${id}`);
         }
     }
 
-    const PATH_SEGMENT$2 = 'Listing';
     class ListingsClient {
         getListingsByFilter(model) {
-            return http.post(`${PATH_SEGMENT$2}/filter`, model);
+            return http.post('Listing/filter', model);
         }
-        GetByMlsId(model) {
-            return http.post(`${PATH_SEGMENT$2}/mlsId`, model);
+        getByMlsId(model) {
+            return http.post('Listing/mlsId', model);
+        }
+        getByQuery(queryModel) {
+            return http.post('Listing/query', queryModel);
+        }
+        getListingTypeGroups() {
+            return http.get('Listing/type/groups');
         }
     }
 
@@ -64,14 +69,17 @@ var samls = (function (exports, axios) {
     }
 
     class GlobalQueryModel {
-        constructor() {
+        constructor(data) {
             this.skip = 0;
             this.take = 10;
-            this.filter = '';
-            this.fields = [];
             this.count = false;
-            this.orderings = [];
-            this.conditions = [];
+            this.filter = null;
+            this.order = null;
+            this.conditions = null;
+            this.fields = [];
+            if (data) {
+                Object.assign(this, data);
+            }
         }
     }
 
@@ -89,10 +97,27 @@ var samls = (function (exports, axios) {
         }
     }
 
+    class ConditionModel {
+        constructor(data) {
+            this.value = null;
+            this.isNot = false;
+            this.operator = null;
+            this.nextProperty = null;
+            this.subConditions = [];
+            this.subCondition = null;
+            this.nextCondition = null;
+            this.property = null;
+            if (data) {
+                Object.assign(this, data);
+            }
+        }
+    }
+
     class AddressQueryModel extends GlobalQueryModel {
-        constructor() {
-            super(...arguments);
+        constructor(fullAddress, data) {
+            super(data);
             this.fullAddress = '';
+            this.fullAddress = fullAddress;
         }
     }
 
@@ -1178,7 +1203,9 @@ var samls = (function (exports, axios) {
         constructor(data) {
             this.count = 0;
             this.type = null;
-            Object.assign(this, data);
+            if (data) {
+                Object.assign(this, data);
+            }
         }
     }
 
@@ -1207,7 +1234,9 @@ var samls = (function (exports, axios) {
             this.skipNullUrlKey = false;
             this.skipNullGeometry = false;
             this.limits = [];
-            Object.assign(this, data);
+            if (data) {
+                Object.assign(this, data);
+            }
         }
     }
 
@@ -1215,10 +1244,46 @@ var samls = (function (exports, axios) {
         constructor(data) {
             this.type = null;
             this.polygons = [];
-            Object.assign(this, data);
+            if (data) {
+                Object.assign(this, data);
+            }
+        }
+    }
+
+    exports.Operator = void 0;
+    (function (Operator) {
+        Operator[Operator["Eq"] = 0] = "Eq";
+        Operator[Operator["Gt"] = 1] = "Gt";
+        Operator[Operator["Ge"] = 2] = "Ge";
+        Operator[Operator["Lt"] = 3] = "Lt";
+        Operator[Operator["Le"] = 4] = "Le";
+        Operator[Operator["In"] = 5] = "In";
+        Operator[Operator["Sw"] = 6] = "Sw";
+        Operator[Operator["Ew"] = 7] = "Ew";
+        Operator[Operator["Like"] = 8] = "Like";
+        Operator[Operator["IsNull"] = 9] = "IsNull";
+        Operator[Operator["Any"] = 10] = "Any";
+        Operator[Operator["All"] = 11] = "All";
+    })(exports.Operator || (exports.Operator = {}));
+
+    class OrderingModel {
+        constructor() {
+            this.property = null;
+            this.isDescending = false;
+            this.matchedConditions = [];
+        }
+        toString() {
+            const direction = this.isDescending ? 'desc' : 'asc';
+            return this.property !== null ? `p=${this.property},d=${direction}` : `c=${''},d=${direction}`; //TODO c
         }
     }
 
+    exports.Condition = void 0;
+    (function (Condition) {
+        Condition[Condition["And"] = 0] = "And";
+        Condition[Condition["Or"] = 1] = "Or";
+    })(exports.Condition || (exports.Condition = {}));
+
     exports.AddressDetail = AddressDetail;
     exports.AddressDetailModel = AddressDetailModel;
     exports.AddressPolygon = AddressPolygon;
@@ -1226,6 +1291,7 @@ var samls = (function (exports, axios) {
     exports.AgentInfoModel = AgentInfoModel;
     exports.AgentModel = AgentModel;
     exports.CategoryModel = CategoryModel;
+    exports.ConditionModel = ConditionModel;
     exports.Entity = Entity;
     exports.FeatureModel = FeatureModel;
     exports.GetAgentRequestModel = GetAgentRequestModel;
@@ -1242,6 +1308,7 @@ var samls = (function (exports, axios) {
     exports.MlsInfoModel = MlsInfoModel;
     exports.OfficeModel = OfficeModel;
     exports.OpenHouseModel = OpenHouseModel;
+    exports.OrderingModel = OrderingModel;
     exports.PaginationOptions = PaginationOptions;
     exports.PhotoModel = PhotoModel;
     exports.Point = Point;

package/dist/node/samls.cjs

@@ -11,23 +11,28 @@ const URL = {
 const requestConfig = { baseURL: URL.domain };
 const http = axios.create(requestConfig);
 
-const PATH_SEGMENT$3 = 'AddressDetail';
+const PATH_SEGMENT$2 = 'AddressDetail';
 class MlsClient {
-    GetMlsInfos() {
-        return http.get(`${PATH_SEGMENT$3}/Mls`);
+    getMlsInfos() {
+        return http.get(`${PATH_SEGMENT$2}/Mls`);
     }
-    GetMlsInfoById(id) {
-        return http.get(`${PATH_SEGMENT$3}/Mls/${id}`);
+    getMlsInfoById(id) {
+        return http.get(`${PATH_SEGMENT$2}/Mls/${id}`);
     }
 }
 
-const PATH_SEGMENT$2 = 'Listing';
 class ListingsClient {
     getListingsByFilter(model) {
-        return http.post(`${PATH_SEGMENT$2}/filter`, model);
+        return http.post('Listing/filter', model);
     }
-    GetByMlsId(model) {
-        return http.post(`${PATH_SEGMENT$2}/mlsId`, model);
+    getByMlsId(model) {
+        return http.post('Listing/mlsId', model);
+    }
+    getByQuery(queryModel) {
+        return http.post('Listing/query', queryModel);
+    }
+    getListingTypeGroups() {
+        return http.get('Listing/type/groups');
     }
 }
 
@@ -65,14 +70,17 @@ class Point {
 }
 
 class GlobalQueryModel {
-    constructor() {
+    constructor(data) {
         this.skip = 0;
         this.take = 10;
-        this.filter = '';
-        this.fields = [];
         this.count = false;
-        this.orderings = [];
-        this.conditions = [];
+        this.filter = null;
+        this.order = null;
+        this.conditions = null;
+        this.fields = [];
+        if (data) {
+            Object.assign(this, data);
+        }
     }
 }
 
@@ -90,10 +98,27 @@ class PaginationOptions {
     }
 }
 
+class ConditionModel {
+    constructor(data) {
+        this.value = null;
+        this.isNot = false;
+        this.operator = null;
+        this.nextProperty = null;
+        this.subConditions = [];
+        this.subCondition = null;
+        this.nextCondition = null;
+        this.property = null;
+        if (data) {
+            Object.assign(this, data);
+        }
+    }
+}
+
 class AddressQueryModel extends GlobalQueryModel {
-    constructor() {
-        super(...arguments);
+    constructor(fullAddress, data) {
+        super(data);
         this.fullAddress = '';
+        this.fullAddress = fullAddress;
     }
 }
 
@@ -1179,7 +1204,9 @@ class LimitModel {
     constructor(data) {
         this.count = 0;
         this.type = null;
-        Object.assign(this, data);
+        if (data) {
+            Object.assign(this, data);
+        }
     }
 }
 
@@ -1208,7 +1235,9 @@ class PolygonFilterRequestModel {
         this.skipNullUrlKey = false;
         this.skipNullGeometry = false;
         this.limits = [];
-        Object.assign(this, data);
+        if (data) {
+            Object.assign(this, data);
+        }
     }
 }
 
@@ -1216,10 +1245,46 @@ class PolygonFilterResponseModel {
     constructor(data) {
         this.type = null;
         this.polygons = [];
-        Object.assign(this, data);
+        if (data) {
+            Object.assign(this, data);
+        }
+    }
+}
+
+exports.Operator = void 0;
+(function (Operator) {
+    Operator[Operator["Eq"] = 0] = "Eq";
+    Operator[Operator["Gt"] = 1] = "Gt";
+    Operator[Operator["Ge"] = 2] = "Ge";
+    Operator[Operator["Lt"] = 3] = "Lt";
+    Operator[Operator["Le"] = 4] = "Le";
+    Operator[Operator["In"] = 5] = "In";
+    Operator[Operator["Sw"] = 6] = "Sw";
+    Operator[Operator["Ew"] = 7] = "Ew";
+    Operator[Operator["Like"] = 8] = "Like";
+    Operator[Operator["IsNull"] = 9] = "IsNull";
+    Operator[Operator["Any"] = 10] = "Any";
+    Operator[Operator["All"] = 11] = "All";
+})(exports.Operator || (exports.Operator = {}));
+
+class OrderingModel {
+    constructor() {
+        this.property = null;
+        this.isDescending = false;
+        this.matchedConditions = [];
+    }
+    toString() {
+        const direction = this.isDescending ? 'desc' : 'asc';
+        return this.property !== null ? `p=${this.property},d=${direction}` : `c=${''},d=${direction}`; //TODO c
     }
 }
 
+exports.Condition = void 0;
+(function (Condition) {
+    Condition[Condition["And"] = 0] = "And";
+    Condition[Condition["Or"] = 1] = "Or";
+})(exports.Condition || (exports.Condition = {}));
+
 exports.AddressDetail = AddressDetail;
 exports.AddressDetailModel = AddressDetailModel;
 exports.AddressPolygon = AddressPolygon;
@@ -1227,6 +1292,7 @@ exports.AddressQueryModel = AddressQueryModel;
 exports.AgentInfoModel = AgentInfoModel;
 exports.AgentModel = AgentModel;
 exports.CategoryModel = CategoryModel;
+exports.ConditionModel = ConditionModel;
 exports.Entity = Entity;
 exports.FeatureModel = FeatureModel;
 exports.GetAgentRequestModel = GetAgentRequestModel;
@@ -1243,6 +1309,7 @@ exports.LocationModel = LocationModel;
 exports.MlsInfoModel = MlsInfoModel;
 exports.OfficeModel = OfficeModel;
 exports.OpenHouseModel = OpenHouseModel;
+exports.OrderingModel = OrderingModel;
 exports.PaginationOptions = PaginationOptions;
 exports.PhotoModel = PhotoModel;
 exports.Point = Point;

package/lib/clients/ListingsClient.ts

@@ -2,21 +2,30 @@
   ListingModel,
   GetByMlsIdRequestModel,
   GetListingsByFilterRequestModel,
+  GlobalQueryModel,
+  ListingTypeClassEnum,
+  ListingTypeEnum,
 } from '../models';
 import { http, IPagination, IApiResponse } from '../globals';
 
-const PATH_SEGMENT = 'Listing';
-
 export class ListingsClient {
   getListingsByFilter(
     model: GetListingsByFilterRequestModel,
   ): Promise<IApiResponse<IPagination<ListingModel>>> {
-    return http.post(`${PATH_SEGMENT}/filter`, model);
+    return http.post('Listing/filter', model);
+  }
+
+  getByMlsId(model: GetByMlsIdRequestModel): Promise<IApiResponse<Partial<ListingModel>[]>> {
+    return http.post('Listing/mlsId', model);
+  }
+
+  getByQuery(queryModel: GlobalQueryModel): Promise<IApiResponse<IPagination<ListingModel>>> {
+    return http.post('Listing/query', queryModel);
   }
 
-  GetByMlsId(
-    model: GetByMlsIdRequestModel,
-  ): Promise<IApiResponse<Partial<ListingModel>[]>> {
-    return http.post(`${PATH_SEGMENT}/mlsId`, model);
+  getListingTypeGroups(): Promise<
+    IApiResponse<Record<keyof typeof ListingTypeClassEnum, (keyof typeof ListingTypeEnum)[]>>
+  > {
+    return http.get('Listing/type/groups');
   }
 }

package/lib/clients/MlsClient.ts

@@ -4,11 +4,11 @@ import { http, IApiResponse } from '../globals';
 const PATH_SEGMENT = 'AddressDetail';
 
 export class MlsClient {
-  GetMlsInfos(): Promise<IApiResponse<MlsInfoModel[]>> {
+  getMlsInfos(): Promise<IApiResponse<MlsInfoModel[]>> {
     return http.get(`${PATH_SEGMENT}/Mls`);
   }
 
-  GetMlsInfoById(id: number): Promise<IApiResponse<MlsInfoModel>> {
+  getMlsInfoById(id: number): Promise<IApiResponse<MlsInfoModel>> {
     return http.get(`${PATH_SEGMENT}/Mls/${id}`);
   }
 }

package/lib/globals/index.ts

@@ -1,3 +1,3 @@
 export * from './HttpModule';
-export * from './interfaces';
+export * from './models';
 export * from './constants/url';

package/lib/globals/models/ObjectPropertyPathChecker.ts

@@ -0,0 +1,3 @@
+export type Leaves<T> = T extends object
+  ? { [K in keyof T]: `${Exclude<K, symbol>}${Leaves<T[K]> extends never ? '' : `.${Leaves<T[K]>}`}` }[keyof T]
+  : never;

package/lib/globals/models/index.ts

@@ -0,0 +1,3 @@
+export * from '../../models/PData/models/IPagination';
+export * from './IApiResponse';
+export * from './ObjectPropertyPathChecker';

package/lib/models/Address/AddressQueryModel.ts

@@ -2,4 +2,9 @@ import { GlobalQueryModel } from '../Common';
 
 export class AddressQueryModel extends GlobalQueryModel {
   fullAddress: string = '';
+
+  constructor(fullAddress: string, data?: Partial<GlobalQueryModel>) {
+    super(data);
+    this.fullAddress = fullAddress;
+  }
 }

package/lib/models/Common/GlobalQueryModel.ts

@@ -1,14 +1,17 @@
-//TODO
-//GlobalQueryModel extends Query in samls-dotnet-integration
-type ConditionModel = object;
-type OrderingModel = object;
+import { ConditionModel, OrderingModel } from '../PData';
 
 export class GlobalQueryModel {
-  skip?: number = 0;
-  take?: number = 10;
-  filter?: string = '';
-  fields?: string[] = [];
+  skip: number | null = 0;
+  take: number | null = 10;
   count: boolean = false;
-  orderings?: OrderingModel[] = [];
-  conditions?: ConditionModel[] = [];
+  filter: string | null = null;
+  order: OrderingModel[] | null = null;
+  conditions: ConditionModel[] | null = null;
+  fields: string[] = [];
+
+  constructor(data?: Partial<GlobalQueryModel>) {
+    if (data) {
+      Object.assign(this, data);
+    }
+  }
 }

package/lib/models/Common/index.ts

@@ -2,3 +2,4 @@ export * from './Point';
 export * from './GlobalQueryModel';
 export * from './LocationModel';
 export * from './PaginationOptions';
+export * from '../PData/models/ConditionModel';

package/lib/models/Enums/index.ts

@@ -1,23 +1,22 @@
-//TODO combine all enums in this namespace
-export * from "./AgentTypeEnum";
-export * from "./AssociationFeeFrequencyEnum";
-export * from "./AuthenticationTypeEnum";
-export * from "./CurrencyEnum";
-export * from "./DirectionFacesEnum";
-export * from "./FeatureSourceEnum";
-export * from "./GeometryTypeEnum";
-export * from "./ListingStatusEnum";
-export * from "./ListingTypeClassEnum";
-export * from "./ListingTypeEnum";
-export * from "./MLSEnum";
-export * from "./OrderByOptions";
-export * from "./OwnershipTypeEnum";
-export * from "./PhysicalPropertyTypeEnum";
-export * from "./PhysicalPropertyClassEnum";
-export * from "./PlatformEnum";
-export * from "./ProcessingStatusEnum";
-export * from "./ProcessingTypeEnum";
-export * from "./PropertyConditionEnum";
-export * from "./PropertyLevelEnum";
-export * from "./StreetSuffixEnum";
-export * from "./StreetDirectionEnum";
+export * from './AgentTypeEnum';
+export * from './AssociationFeeFrequencyEnum';
+export * from './AuthenticationTypeEnum';
+export * from './CurrencyEnum';
+export * from './DirectionFacesEnum';
+export * from './FeatureSourceEnum';
+export * from './GeometryTypeEnum';
+export * from './ListingStatusEnum';
+export * from './ListingTypeClassEnum';
+export * from './ListingTypeEnum';
+export * from './MLSEnum';
+export * from './OrderByOptions';
+export * from './OwnershipTypeEnum';
+export * from './PhysicalPropertyTypeEnum';
+export * from './PhysicalPropertyClassEnum';
+export * from './PlatformEnum';
+export * from './ProcessingStatusEnum';
+export * from './ProcessingTypeEnum';
+export * from './PropertyConditionEnum';
+export * from './PropertyLevelEnum';
+export * from './StreetSuffixEnum';
+export * from './StreetDirectionEnum';

package/lib/models/Listing/ListingModel.ts

@@ -38,7 +38,7 @@ export class ListingModel {
   listingService: string = '';
   listingStatus: ListingStatusEnum | null = null;
   listingTerms: string = '';
-  listingType: ListingTypeEnum | null = null;
+  listingType: keyof typeof ListingTypeEnum | null = null;
   listPrice: number | null = null;
   pricePerSqFeet: number | null = null;
   listPriceOriginal: number | null = null;

package/lib/models/PData/index.ts

@@ -0,0 +1 @@
+export * from './models';

package/lib/models/PData/models/Condition.ts

@@ -0,0 +1,4 @@
+export enum Condition {
+  And,
+  Or,
+}

package/lib/models/PData/models/ConditionModel.ts

@@ -0,0 +1,20 @@
+import { Operator } from './Operator';
+import { Condition } from './Condition';
+import { Leaves } from '../../../globals';
+
+export class ConditionModel<T = any> {
+  value: string | null = null;
+  isNot: boolean = false;
+  operator: Operator | null = null;
+  nextProperty: string | null = null;
+  subConditions: ConditionModel<T>[] = [];
+  subCondition: Condition | null = null;
+  nextCondition: Condition | null = null;
+  property: (T extends any ? Leaves<T> : string) | null = null;
+
+  constructor(data?: Partial<ConditionModel<T>>) {
+    if (data) {
+      Object.assign(this, data);
+    }
+  }
+}

package/lib/models/PData/models/Operator.ts

@@ -0,0 +1,14 @@
+export enum Operator {
+  Eq,
+  Gt,
+  Ge,
+  Lt,
+  Le,
+  In,
+  Sw,
+  Ew,
+  Like,
+  IsNull,
+  Any,
+  All,
+}

package/lib/models/PData/models/Ordering.ts

@@ -0,0 +1,12 @@
+import { ConditionModel } from './ConditionModel';
+
+export class OrderingModel {
+  property: string | null = null;
+  isDescending: boolean = false;
+  matchedConditions: ConditionModel[] = [];
+
+  toString(): string {
+    const direction = this.isDescending ? 'desc' : 'asc';
+    return this.property !== null ? `p=${this.property},d=${direction}` : `c=${''},d=${direction}`; //TODO c
+  }
+}

package/lib/models/PData/models/index.ts

@@ -0,0 +1,5 @@
+export * from './Operator';
+export * from './Ordering';
+export * from './Condition';
+export * from './IPagination';
+export * from './ConditionModel';

package/lib/models/Polygon/LimitModel.ts

@@ -5,6 +5,8 @@ export class LimitModel {
   type: GeometryTypeEnum | null = null;
 
   constructor(data?: Partial<LimitModel>) {
-    Object.assign(this, data);
+    if (data) {
+      Object.assign(this, data);
+    }
   }
 }

package/lib/models/Polygon/PolygonFilterRequestModel.ts

@@ -8,6 +8,8 @@ export class PolygonFilterRequestModel {
   limits: LimitModel[] = [];
 
   constructor(data?: Partial<PolygonFilterRequestModel>) {
-    Object.assign(this, data);
+    if (data) {
+      Object.assign(this, data);
+    }
   }
 }

package/lib/models/Polygon/PolygonFilterResponseModel.ts

@@ -8,6 +8,8 @@ export class PolygonFilterResponseModel {
   polygons: PolygonLiteResponseModel[] = [];
 
   constructor(data?: Partial<PolygonFilterResponseModel>) {
-    Object.assign(this, data);
+    if (data) {
+      Object.assign(this, data);
+    }
   }
 }

package/lib/models/Polygon/index.ts

@@ -1,4 +1,4 @@
 export { LimitModel } from './LimitModel';
 export { PolygonLiteResponseModel } from './PolygonLiteResponseModel';
 export { PolygonFilterRequestModel } from './PolygonFilterRequestModel';
-export { PolygonFilterResponseModel } from './PolygonFilterResponseModel';
+export { PolygonType, PolygonFilterResponseModel } from './PolygonFilterResponseModel';

package/lib/models/index.ts

@@ -8,3 +8,5 @@ export * from './Feature';
 export * from './Mls';
 export * from './Listing';
 export * from './Polygon';
+export * from './PData';
+export * from '../globals/models';

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "samls-js-integration",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "samls npm package",
   "main": "dist/node/samls.cjs",
   "types": "lib/index.ts",
   "scripts": {
     "type-check": "tsc",
     "build": "rollup --config rollup.config.ts --configPlugin typescript",
-    "publish-local": "npm run type-check && npm run build && npm publish --registry http://localhost:4873"
+    "publish-local": "npm run build && npm publish --registry http://localhost:4873"
   },
   "type": "module",
   "keywords": [

package/lib/globals/interfaces/index.ts

@@ -1,2 +0,0 @@
-export * from './IPagination';
-export * from './IApiResponse';