Latest Threat Research:SANDWORM_MODE: Shai-Hulud-Style npm Worm Hijacks CI Workflows and Poisons AI Toolchains.Details →
json-api-query
Advanced tools
json-api-query - npm Package Compare versions
Package version was removed
This package version has been unpublished, mostly likely due to security reasons
| import { IBookingException } from "./IBookingException"; | ||
| import { IProfileDetails } from "./IProfileDetails"; | ||
| import { IVenue } from "./IVenue"; | ||
| // export type RecurrenceFrequencyType = 'None' | 'Daily' |'Weekly' | 'Monthly' |'Yearly' | ||
| export enum RecurrenceFrequencyType{ | ||
| None = 0, | ||
| // Secondly = 1, | ||
| // Minutely = 2, | ||
| // Hourly = 3, | ||
| Daily = 4, | ||
| Weekly = 5, | ||
| Monthly = 6, | ||
| Yearly = 7, | ||
| } | ||
| export enum Frequency { | ||
| YEARLY = 0, | ||
| MONTHLY = 1, | ||
| WEEKLY = 2, | ||
| DAILY = 3, | ||
| HOURLY = 4, | ||
| MINUTELY = 5, | ||
| SECONDLY = 6 | ||
| } | ||
| // export enum RRulerFrequency { | ||
| // YEARLY = 0, | ||
| // MONTHLY = 1, | ||
| // WEEKLY = 2, | ||
| // DAILY = 3, | ||
| // HOURLY = 4, | ||
| // MINUTELY = 5, | ||
| // SECONDLY = 6 | ||
| // } | ||
| export class IBooking { | ||
| approvedBy: string; | ||
| id: string; | ||
| firstName: string; | ||
| lastName: string; | ||
| email: string; | ||
| stageName: string; | ||
| avatar: string; | ||
| dateRequested: Date; | ||
| approved: boolean; | ||
| rejected: boolean; | ||
| progress: number; | ||
| phone: string; | ||
| city: string; | ||
| artists: Array<IProfileDetails>; | ||
| recurrenceCount: number; | ||
| recurrenceFrequency: RecurrenceFrequencyType; | ||
| frequencyType: number; | ||
| startDate: string; | ||
| endDate: string; | ||
| duration: number; | ||
| venue: IVenue; | ||
| "booking-exceptions": Array<IBookingException>; | ||
| approvedDate: Date | ||
| calFile: string | ||
| recurrencePattern: string | ||
| } | ||
| import { IProfileDetails } from "./IProfileDetails"; | ||
| import { IBooking } from "./IBooking"; | ||
| export interface IBookingException { | ||
| id: string; | ||
| artists: Array<IProfileDetails>; | ||
| booking: IBooking; | ||
| exceptionDate: string; | ||
| "booking-id": string; | ||
| } |
| export class IConnectedAccounts { | ||
| google: boolean; | ||
| github: boolean; | ||
| stack: boolean; | ||
| } |
| export interface IDeactivateAccount { | ||
| confirm: boolean; | ||
| } |
| export interface IEmailPreferences { | ||
| successfulPayments: boolean; | ||
| payouts: boolean; | ||
| freeCollections: boolean; | ||
| customerPaymentDispute: boolean; | ||
| refundAlert: boolean; | ||
| invoicePayments: boolean; | ||
| webhookAPIEndpoints: boolean; | ||
| } |
| export interface IImage { | ||
| id: string; | ||
| url: string; | ||
| } |
| export interface INotifications { | ||
| notifications: { | ||
| email: boolean; | ||
| phone: boolean; | ||
| }; | ||
| billingUpdates: { | ||
| email: boolean; | ||
| phone: boolean; | ||
| }; | ||
| newTeamMembers: { | ||
| email: boolean; | ||
| phone: boolean; | ||
| }; | ||
| completeProjects: { | ||
| email: boolean; | ||
| phone: boolean; | ||
| }; | ||
| newsletters: { | ||
| email: boolean; | ||
| phone: boolean; | ||
| }; | ||
| } |
| import { ITown } from "./ITown"; | ||
| import { IImage } from "./IImage"; | ||
| import { IBooking } from "./IBooking"; | ||
| import { IBookingException } from "./IBookingException"; | ||
| export interface IProfileDetails { | ||
| id: string; | ||
| avatar: string; | ||
| firstName: string; | ||
| lastName: string; | ||
| email: string; | ||
| stageName: string; | ||
| isActive: boolean; | ||
| facebookUrl: string; | ||
| youTubeUrl: string; | ||
| instagramUrl: string; | ||
| legacyId: string; | ||
| images: IImage[]; | ||
| description: string; | ||
| mobile: string; | ||
| videoUrl: string; | ||
| biography: string; | ||
| keywords: string; | ||
| quote1: string; | ||
| quote2: string; | ||
| quote3: string; | ||
| quote4: string; | ||
| address1: string; | ||
| address2: string; | ||
| city: string; | ||
| postcode: string; | ||
| termsAcknowledged: boolean; | ||
| dbsApproved: boolean; | ||
| dbsExpires: Date; | ||
| pliApproved: boolean; | ||
| pliExpiry: Date; | ||
| caeApproved: boolean; | ||
| longitude: number; | ||
| latitude: number; | ||
| travelMiles: number; | ||
| rating: number; | ||
| town: ITown; | ||
| company: string; | ||
| contactPhone: string; | ||
| companySite: string; | ||
| country: string; | ||
| language: string; | ||
| timeZone: string; | ||
| currency: string; | ||
| communications: { | ||
| email: boolean | undefined; | ||
| phone: boolean | undefined; | ||
| }; | ||
| allowMarketing: boolean; | ||
| "booking-exceptions": IBookingException[] | ||
| } |
| export interface ITown { | ||
| id: string; | ||
| name: string; | ||
| } |
| export interface IUpdateEmail { | ||
| newEmail: string; | ||
| confirmPassword: string; | ||
| } |
| export interface IUpdatePassword { | ||
| currentPassword: string; | ||
| newPassword: string; | ||
| passwordConfirmation: string; | ||
| } |
| import { ITown } from "./ITown"; | ||
| export interface IVenue { | ||
| longitude: string; | ||
| latitude: string; | ||
| id: string; | ||
| name: string; | ||
| address1: string; | ||
| address2: string; | ||
| address3: string; | ||
| postCode: string; | ||
| email: string; | ||
| phone: string; | ||
| notes: string; | ||
| invoiceEmail: string; | ||
| xeroId: string; | ||
| town: ITown; | ||
| } |
| import { NestedTestClass } from "./NestedTestClass" | ||
| export interface TestClass { | ||
| property1: string | ||
| property2: boolean | ||
| nested: NestedTestClass | ||
| nestedArray: NestedTestClass[] | ||
| a: string | ||
| c: string | ||
| not1: string | ||
| or1: string | ||
| or3: string | ||
| PropertyAny: string | ||
| prop12: string | ||
| numProp: number | ||
| stageName: string | ||
| lastName: string | ||
| firstName: string | ||
| caeApproved: boolean | ||
| isActive: boolean | ||
| } | ||
| import { NestedTestClass } from "./NestedTestClass"; | ||
| export interface NestedNestedTestClass { | ||
| property1Nested: string; | ||
| property2Nested: boolean; | ||
| nested: NestedTestClass; | ||
| } |
| import { NestedNestedTestClass } from "./NestedNestedTestClass"; | ||
| export interface NestedTestClass { | ||
| property1Nested: string; | ||
| property2Nested: boolean; | ||
| nestedAgain: NestedNestedTestClass; | ||
| } |
| { | ||
| "$schema": "http://json-schema.org/draft-07/schema#", | ||
| "definitions": { | ||
| "Frequency": { | ||
| "enum": [ | ||
| 0, | ||
| 1, | ||
| 2, | ||
| 3, | ||
| 4, | ||
| 5, | ||
| 6 | ||
| ], | ||
| "type": "number" | ||
| }, | ||
| "IBooking": { | ||
| "properties": { | ||
| "approved": { | ||
| "type": "boolean" | ||
| }, | ||
| "approvedBy": { | ||
| "type": "string" | ||
| }, | ||
| "approvedDate": { | ||
| "format": "date-time", | ||
| "type": "string" | ||
| }, | ||
| "artists": { | ||
| "items": { | ||
| "$ref": "#/definitions/IProfileDetails" | ||
| }, | ||
| "type": "array" | ||
| }, | ||
| "avatar": { | ||
| "type": "string" | ||
| }, | ||
| "booking-exceptions": { | ||
| "items": { | ||
| "$ref": "#/definitions/IBookingException" | ||
| }, | ||
| "type": "array" | ||
| }, | ||
| "calFile": { | ||
| "type": "string" | ||
| }, | ||
| "city": { | ||
| "type": "string" | ||
| }, | ||
| "dateRequested": { | ||
| "format": "date-time", | ||
| "type": "string" | ||
| }, | ||
| "duration": { | ||
| "type": "number" | ||
| }, | ||
| "email": { | ||
| "type": "string" | ||
| }, | ||
| "endDate": { | ||
| "type": "string" | ||
| }, | ||
| "firstName": { | ||
| "type": "string" | ||
| }, | ||
| "frequencyType": { | ||
| "type": "number" | ||
| }, | ||
| "id": { | ||
| "type": "string" | ||
| }, | ||
| "lastName": { | ||
| "type": "string" | ||
| }, | ||
| "phone": { | ||
| "type": "string" | ||
| }, | ||
| "progress": { | ||
| "type": "number" | ||
| }, | ||
| "recurrenceCount": { | ||
| "type": "number" | ||
| }, | ||
| "recurrenceFrequency": { | ||
| "$ref": "#/definitions/RecurrenceFrequencyType" | ||
| }, | ||
| "recurrencePattern": { | ||
| "type": "string" | ||
| }, | ||
| "rejected": { | ||
| "type": "boolean" | ||
| }, | ||
| "stageName": { | ||
| "type": "string" | ||
| }, | ||
| "startDate": { | ||
| "type": "string" | ||
| }, | ||
| "venue": { | ||
| "$ref": "#/definitions/IVenue" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IBookingException": { | ||
| "properties": { | ||
| "artists": { | ||
| "items": { | ||
| "$ref": "#/definitions/IProfileDetails" | ||
| }, | ||
| "type": "array" | ||
| }, | ||
| "booking": { | ||
| "$ref": "#/definitions/IBooking" | ||
| }, | ||
| "booking-id": { | ||
| "type": "string" | ||
| }, | ||
| "exceptionDate": { | ||
| "type": "string" | ||
| }, | ||
| "id": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IConnectedAccounts": { | ||
| "properties": { | ||
| "github": { | ||
| "type": "boolean" | ||
| }, | ||
| "google": { | ||
| "type": "boolean" | ||
| }, | ||
| "stack": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IDeactivateAccount": { | ||
| "properties": { | ||
| "confirm": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IEmailPreferences": { | ||
| "properties": { | ||
| "customerPaymentDispute": { | ||
| "type": "boolean" | ||
| }, | ||
| "freeCollections": { | ||
| "type": "boolean" | ||
| }, | ||
| "invoicePayments": { | ||
| "type": "boolean" | ||
| }, | ||
| "payouts": { | ||
| "type": "boolean" | ||
| }, | ||
| "refundAlert": { | ||
| "type": "boolean" | ||
| }, | ||
| "successfulPayments": { | ||
| "type": "boolean" | ||
| }, | ||
| "webhookAPIEndpoints": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IImage": { | ||
| "properties": { | ||
| "id": { | ||
| "type": "string" | ||
| }, | ||
| "url": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "INotifications": { | ||
| "properties": { | ||
| "billingUpdates": { | ||
| "properties": { | ||
| "email": { | ||
| "type": "boolean" | ||
| }, | ||
| "phone": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "completeProjects": { | ||
| "properties": { | ||
| "email": { | ||
| "type": "boolean" | ||
| }, | ||
| "phone": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "newTeamMembers": { | ||
| "properties": { | ||
| "email": { | ||
| "type": "boolean" | ||
| }, | ||
| "phone": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "newsletters": { | ||
| "properties": { | ||
| "email": { | ||
| "type": "boolean" | ||
| }, | ||
| "phone": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "notifications": { | ||
| "properties": { | ||
| "email": { | ||
| "type": "boolean" | ||
| }, | ||
| "phone": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IProfileDetails": { | ||
| "properties": { | ||
| "address1": { | ||
| "type": "string" | ||
| }, | ||
| "address2": { | ||
| "type": "string" | ||
| }, | ||
| "allowMarketing": { | ||
| "type": "boolean" | ||
| }, | ||
| "avatar": { | ||
| "type": "string" | ||
| }, | ||
| "biography": { | ||
| "type": "string" | ||
| }, | ||
| "booking-exceptions": { | ||
| "items": { | ||
| "$ref": "#/definitions/IBookingException" | ||
| }, | ||
| "type": "array" | ||
| }, | ||
| "caeApproved": { | ||
| "type": "boolean" | ||
| }, | ||
| "city": { | ||
| "type": "string" | ||
| }, | ||
| "communications": { | ||
| "properties": { | ||
| "email": { | ||
| "type": "boolean" | ||
| }, | ||
| "phone": { | ||
| "type": "boolean" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "company": { | ||
| "type": "string" | ||
| }, | ||
| "companySite": { | ||
| "type": "string" | ||
| }, | ||
| "contactPhone": { | ||
| "type": "string" | ||
| }, | ||
| "country": { | ||
| "type": "string" | ||
| }, | ||
| "currency": { | ||
| "type": "string" | ||
| }, | ||
| "dbsApproved": { | ||
| "type": "boolean" | ||
| }, | ||
| "dbsExpires": { | ||
| "format": "date-time", | ||
| "type": "string" | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
| "email": { | ||
| "type": "string" | ||
| }, | ||
| "facebookUrl": { | ||
| "type": "string" | ||
| }, | ||
| "firstName": { | ||
| "type": "string" | ||
| }, | ||
| "id": { | ||
| "type": "string" | ||
| }, | ||
| "images": { | ||
| "items": { | ||
| "$ref": "#/definitions/IImage" | ||
| }, | ||
| "type": "array" | ||
| }, | ||
| "instagramUrl": { | ||
| "type": "string" | ||
| }, | ||
| "isActive": { | ||
| "type": "boolean" | ||
| }, | ||
| "keywords": { | ||
| "type": "string" | ||
| }, | ||
| "language": { | ||
| "type": "string" | ||
| }, | ||
| "lastName": { | ||
| "type": "string" | ||
| }, | ||
| "latitude": { | ||
| "type": "number" | ||
| }, | ||
| "legacyId": { | ||
| "type": "string" | ||
| }, | ||
| "longitude": { | ||
| "type": "number" | ||
| }, | ||
| "mobile": { | ||
| "type": "string" | ||
| }, | ||
| "pliApproved": { | ||
| "type": "boolean" | ||
| }, | ||
| "pliExpiry": { | ||
| "format": "date-time", | ||
| "type": "string" | ||
| }, | ||
| "postcode": { | ||
| "type": "string" | ||
| }, | ||
| "quote1": { | ||
| "type": "string" | ||
| }, | ||
| "quote2": { | ||
| "type": "string" | ||
| }, | ||
| "quote3": { | ||
| "type": "string" | ||
| }, | ||
| "quote4": { | ||
| "type": "string" | ||
| }, | ||
| "rating": { | ||
| "type": "number" | ||
| }, | ||
| "stageName": { | ||
| "type": "string" | ||
| }, | ||
| "termsAcknowledged": { | ||
| "type": "boolean" | ||
| }, | ||
| "timeZone": { | ||
| "type": "string" | ||
| }, | ||
| "town": { | ||
| "$ref": "#/definitions/ITown" | ||
| }, | ||
| "travelMiles": { | ||
| "type": "number" | ||
| }, | ||
| "videoUrl": { | ||
| "type": "string" | ||
| }, | ||
| "youTubeUrl": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "ITown": { | ||
| "properties": { | ||
| "id": { | ||
| "type": "string" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IUpdateEmail": { | ||
| "properties": { | ||
| "confirmPassword": { | ||
| "type": "string" | ||
| }, | ||
| "newEmail": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IUpdatePassword": { | ||
| "properties": { | ||
| "currentPassword": { | ||
| "type": "string" | ||
| }, | ||
| "newPassword": { | ||
| "type": "string" | ||
| }, | ||
| "passwordConfirmation": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "IVenue": { | ||
| "properties": { | ||
| "address1": { | ||
| "type": "string" | ||
| }, | ||
| "address2": { | ||
| "type": "string" | ||
| }, | ||
| "address3": { | ||
| "type": "string" | ||
| }, | ||
| "email": { | ||
| "type": "string" | ||
| }, | ||
| "id": { | ||
| "type": "string" | ||
| }, | ||
| "invoiceEmail": { | ||
| "type": "string" | ||
| }, | ||
| "latitude": { | ||
| "type": "string" | ||
| }, | ||
| "longitude": { | ||
| "type": "string" | ||
| }, | ||
| "name": { | ||
| "type": "string" | ||
| }, | ||
| "notes": { | ||
| "type": "string" | ||
| }, | ||
| "phone": { | ||
| "type": "string" | ||
| }, | ||
| "postCode": { | ||
| "type": "string" | ||
| }, | ||
| "town": { | ||
| "$ref": "#/definitions/ITown" | ||
| }, | ||
| "xeroId": { | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "type": "object" | ||
| }, | ||
| "RecurrenceFrequencyType": { | ||
| "enum": [ | ||
| 0, | ||
| 4, | ||
| 5, | ||
| 6, | ||
| 7 | ||
| ], | ||
| "type": "number" | ||
| } | ||
| } | ||
| } | ||
| import { IConnectedAccounts } from "./IConnectedAccounts" | ||
| import { IDeactivateAccount } from "./IDeactivateAccount" | ||
| import { IEmailPreferences } from "./IEmailPreferences" | ||
| import { INotifications } from "./INotifications" | ||
| import { IUpdateEmail } from "./IUpdateEmail" | ||
| import { IUpdatePassword } from "./IUpdatePassword" | ||
| export const updateEmail: IUpdateEmail = { | ||
| newEmail: 'support@keenthemes.com', | ||
| confirmPassword: '', | ||
| } | ||
| export const updatePassword: IUpdatePassword = { | ||
| currentPassword: '', | ||
| newPassword: '', | ||
| passwordConfirmation: '', | ||
| } | ||
| export const connectedAccounts: IConnectedAccounts = { | ||
| google: true, | ||
| github: true, | ||
| stack: false, | ||
| } | ||
| export const emailPreferences: IEmailPreferences = { | ||
| successfulPayments: false, | ||
| payouts: true, | ||
| freeCollections: false, | ||
| customerPaymentDispute: true, | ||
| refundAlert: false, | ||
| invoicePayments: true, | ||
| webhookAPIEndpoints: false, | ||
| } | ||
| export const notifications: INotifications = { | ||
| notifications: { | ||
| email: true, | ||
| phone: true, | ||
| }, | ||
| billingUpdates: { | ||
| email: true, | ||
| phone: true, | ||
| }, | ||
| newTeamMembers: { | ||
| email: true, | ||
| phone: false, | ||
| }, | ||
| completeProjects: { | ||
| email: false, | ||
| phone: true, | ||
| }, | ||
| newsletters: { | ||
| email: false, | ||
| phone: false, | ||
| }, | ||
| } | ||
| export const deactivateAccount: IDeactivateAccount = { | ||
| confirm: false, | ||
| } |
| { | ||
| "compilerOptions": { | ||
| "outDir": "dist", | ||
| "module": "commonjs", | ||
| "declaration": true, | ||
| "noImplicitAny": false, | ||
| "removeComments": true, | ||
| "noLib": false, | ||
| "emitDecoratorMetadata": true, | ||
| "experimentalDecorators": true, | ||
| "target": "es6", | ||
| "lib": ["es2017"], | ||
| "sourceMap": false, | ||
| "strict": false, | ||
| "strictPropertyInitialization": false, | ||
| "resolveJsonModule": true | ||
| }, | ||
| "include": ["test/Models"], | ||
| "exclude": ["node_modules","src"], | ||
| "compileOnSave": false, | ||
| "buildOnSave": false | ||
| } |
+4
-3
| { | ||
| "name": "json-api-query", | ||
| "version": "1.0.19", | ||
| "version": "2.0.1-next.1", | ||
| "description": "A query builder for JSONAPIDotNetCore", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "test": "nyc ./node_modules/.bin/_mocha 'test/**/*.test.ts'", | ||
| "test": "typescript-json-schema tsconfig.schema.json \"*\" > test/Models/schema.json && nyc ./node_modules/.bin/_mocha 'test/**/*.test.ts'", | ||
| "build": "tsc" | ||
@@ -29,4 +29,5 @@ }, | ||
| "prettier": "^2.6.2", | ||
| "source-map-support": "^0.5.21" | ||
| "source-map-support": "^0.5.21", | ||
| "typescript-json-schema": "^0.53.0" | ||
| } | ||
| } |
| import { IComparisonOperator } from '../../IComparisonOperator' | ||
| import * as TJS from "typescript-json-schema"; | ||
@@ -7,3 +8,3 @@ export class EqualsOperator implements IComparisonOperator { | ||
| constructor(public property: string, public value: string) { | ||
| constructor(public property: string, public value: string, public parent: string = null) { | ||
| this._property = property | ||
@@ -14,2 +15,12 @@ this._value = value | ||
| toString(): string { | ||
| // if(this.parent){ | ||
| // // special case for null | ||
| // if (this._value + '' != 'null' || this._value != null) { | ||
| // return `filter[${this.parent}]=equals(${this._property},'${this._value}')` | ||
| // } else { | ||
| // return `filter[${this.parent}]=equals(${this._property},${this._value})` | ||
| // } | ||
| // } | ||
| // special case for null | ||
@@ -16,0 +27,0 @@ if (this._value + '' != 'null' || this._value != null) { |
+60
-22
@@ -30,7 +30,10 @@ import { | ||
| import {SortField} from './SortField' | ||
| import {resolve} from "path"; | ||
| import * as TJS from "typescript-json-schema"; | ||
| import {Definition, DefinitionOrBoolean} from "typescript-json-schema"; | ||
| export class QueryBuilder<T> { | ||
| private _operators: Array<IComparisonOperator> = [] | ||
| private readonly _model: string = '' | ||
| private _pageInfo: IPageInfo | null = null | ||
@@ -40,11 +43,31 @@ private _includes: Array<string> = [] | ||
| private _fields: SparseFieldSet | null = null | ||
| private readonly _childQueryBuilder: QueryBuilder<T> | null = null | ||
| private _childQueryBuilders: QueryBuilder<T>[] = [] | ||
| private _findOptions: FindManyOptions<T> | undefined | ||
| private readonly _originalSchema: TJS.Definition | TJS.DefinitionOrBoolean; | ||
| constructor(public childQueryBuilder: QueryBuilder<T> | null = null, public model: string = '') { | ||
| this._childQueryBuilder = childQueryBuilder | ||
| this._model = model | ||
| constructor( | ||
| public property: string = '', | ||
| public modelType: string = '', | ||
| public schema: Definition | DefinitionOrBoolean = null, | ||
| public isToManyFromParent: boolean = false, | ||
| public parentQueryBuilder: QueryBuilder<T> | null = null, | ||
| public childQueryBuilder: QueryBuilder<T> | null = null, | ||
| ) { | ||
| this.childQueryBuilder = childQueryBuilder | ||
| this.property = property | ||
| this._originalSchema = schema | ||
| this.schema = (schema as TJS.Definition).definitions [modelType] | ||
| this.isToManyFromParent = isToManyFromParent | ||
| this.modelType = modelType | ||
| this.parentQueryBuilder = parentQueryBuilder | ||
| } | ||
| public getPrentPath(){ | ||
| if(this.parentQueryBuilder && this.parentQueryBuilder.getPrentPath() !== ""){ | ||
| return `${this.parentQueryBuilder.getPrentPath()}.${this.property}` | ||
| } | ||
| return this.property | ||
| } | ||
| /** | ||
@@ -78,3 +101,3 @@ * Finds entities that match given find options. | ||
| protected buildSorts(selects: FindOptionsOrder<T> | undefined): Sorts { | ||
| let fields = new Sorts(this._model) | ||
| let fields = new Sorts(this.property) | ||
| for (let key in selects) { | ||
@@ -129,3 +152,3 @@ if (typeof selects[key] === 'string') { | ||
| protected buildSparseFieldsets(selects: FindOptionsSelect<T>): SparseFieldSet { | ||
| let fields = new SparseFieldSet(this._model) | ||
| let fields = new SparseFieldSet(this.property) | ||
| for (let key in selects) { | ||
@@ -159,8 +182,2 @@ if (typeof selects[key] === 'boolean' && (selects[key] as boolean) == true) { | ||
| ...where.map((whereItem) => { | ||
| // for (let key in whereItem) { | ||
| // if (typeof whereItem[key] == "object" && !InstanceChecker.isFindOperator(whereItem[key])) { | ||
| // throw Error('You can\'t do an implicit OR using nested properties') | ||
| // } | ||
| // } | ||
| return this.buildWhere(whereItem) | ||
@@ -178,2 +195,9 @@ }), | ||
| if (where[key] === undefined || where[key] === null) continue | ||
| let isToMany = false | ||
| let schema = (this.schema as TJS.Definition).properties[key] as TJS.Definition | ||
| if (schema.type && schema.type === "array") isToMany = true | ||
| if (!InstanceChecker.isFindOperator(where[key])) { | ||
@@ -185,12 +209,26 @@ if (where[key] == null) { | ||
| // create the child QB otherwise we need to do Equals(parent.child,'something') | ||
| let cqb = new QueryBuilder(null, key) | ||
| let t = isToMany ? | ||
| ((this.schema as TJS.Definition).properties[key] as TJS.Definition).items['$ref'].replace('#/definitions/', '') | ||
| : ((this.schema as TJS.Definition).properties[key] as TJS.Definition)['$ref'].replace('#/definitions/', '') | ||
| let cqb = new QueryBuilder(key, t, this._originalSchema as TJS.Definition, isToMany, this, null) | ||
| cqb.find({where: where[key]}) | ||
| this._childQueryBuilders.push(cqb) | ||
| continue | ||
| this._childQueryBuilders.push(cqb) | ||
| continue | ||
| } else { | ||
| ops.push(new EqualsOperator(key, where[key])) | ||
| ops.push(new EqualsOperator(key, where[key], key)) | ||
| continue | ||
| } | ||
| } | ||
| let op: IComparisonOperator | null = this.getOperator(where[key], key) | ||
| let path = this.getPrentPath() | ||
| if(path && !this.isToManyFromParent) { | ||
| path = `${path}.${key}` | ||
| }else { | ||
| path = key | ||
| } | ||
| let op: IComparisonOperator | null = this.getOperator(where[key], `${path}`) | ||
| if (op) { | ||
@@ -304,4 +342,4 @@ ops.push(op) | ||
| if (!this.isNullOrWhiteSpace(this._model)) { | ||
| filterPropertyExpression = `filter[${this._model}]` | ||
| if (this.isToManyFromParent && this.property) { | ||
| filterPropertyExpression = `filter[${this.property}]` | ||
| } | ||
@@ -319,4 +357,4 @@ | ||
| if (this._childQueryBuilder) { | ||
| final += this._childQueryBuilder.build(final) | ||
| if (this.childQueryBuilder) { | ||
| final += this.childQueryBuilder.build(final) | ||
| } | ||
@@ -323,0 +361,0 @@ |
@@ -1,50 +0,8 @@ | ||
| import {suite, test, should, expect, chai} from './utility' | ||
| import {suite, test, should, expect, chai, timeout} from './utility' | ||
| import {QueryBuilder} from '../src' | ||
| import {AndOperator, AnyOperator, EqualsOperator, NotOperator, OrOperator} from '../src/operators/dialect' | ||
| import {GreaterThan} from '../src/operators/GreaterThan' | ||
| import {SparseFieldSet} from '../src' | ||
| import {Any} from '../src/operators/Any' | ||
| import {Contains} from '../src/operators/Contains' | ||
| import {EndsWith} from '../src/operators/EndsWith' | ||
| import {Has} from '../src/operators/Has' | ||
| import {StartsWith} from '../src/operators/StartsWith' | ||
| import {Or} from '../src/operators/Or' | ||
| import {Not} from '../src/operators/Not' | ||
| import {LessThanOrEqual} from '../src/operators/LessThanOrEqual' | ||
| import {LessThan} from '../src/operators/LessThan' | ||
| import {GreaterThanOrEqual} from '../src/operators/GreaterThanOrEqual' | ||
| import {Equals} from '../src/operators/Equals' | ||
| abstract class TestClass { | ||
| property1: string | ||
| property2: boolean | ||
| nested: NestedTestClass | ||
| nestedArray: NestedTestClass[] | ||
| a: string | ||
| c: string | ||
| not1: string | ||
| or1: string | ||
| or3: string | ||
| PropertyAny: string | ||
| prop12: string | ||
| numProp: number | ||
| stageName: string | ||
| lastName: string | ||
| firstName: string | ||
| caeApproved: boolean | ||
| isActive: boolean | ||
| } | ||
| class NestedNestedTestClass { | ||
| property1Nested: string | ||
| property2Nested: boolean | ||
| nested: NestedTestClass | ||
| } | ||
| class NestedTestClass { | ||
| property1Nested: string | ||
| property2Nested: boolean | ||
| nestedAgain: NestedNestedTestClass | ||
| } | ||
| import {GreaterThan, Any, Contains, EndsWith, Has, StartsWith, Or, Not, LessThanOrEqual, LessThan, GreaterThanOrEqual, Equals} from '../src' | ||
| import * as schema from "./Models/schema.json" | ||
| import * as TJS from "typescript-json-schema"; | ||
| import {TestClass} from "./Models/Models"; | ||
| import { IBooking } from 'Models/IBooking'; | ||
| should() | ||
@@ -56,9 +14,10 @@ | ||
| // todo: test with modelname | ||
| before() { | ||
| this.sut = new QueryBuilder<TestClass>() | ||
| this.sut = new QueryBuilder<TestClass>("", "TestClass", schema as TJS.Definition, false, null, null) | ||
| } | ||
| @test 'Can construct'() { | ||
| @timeout(40000) | ||
| @test 'Can construct'(done) { | ||
| expect(this.sut).should.be.not.undefined | ||
| done() | ||
| } | ||
@@ -302,3 +261,3 @@ | ||
| expect(result).to.equal("?filter[nested]=equals(property1Nested,'test')") | ||
| expect(result).to.equal("?filter=equals(nested.property1Nested,'test')") | ||
| } | ||
@@ -362,3 +321,3 @@ | ||
| expect(result).to.equal( | ||
| '?fields[nested]=property2Nested&fields[nested.nestedAgain]=property1Nested&fields=property2', | ||
| '?fields[nested]=property2Nested&fields[nestedAgain]=property1Nested&fields=property2', | ||
| ) | ||
@@ -445,3 +404,3 @@ } | ||
| .build() | ||
| expect(result).to.equal('?page[size]=0&page[number]=10') | ||
| expect(result).to.equal('?page[size]=10,something:20&page[number]=10,something:20') | ||
| } | ||
@@ -465,16 +424,2 @@ | ||
| // @test 'two wheres makes an or - nested - throws'() { | ||
| // expect(() => this.sut.find({ | ||
| // where: [{ | ||
| // nested: { | ||
| // property1Nested: "test" | ||
| // } | ||
| // }, { | ||
| // nested: { | ||
| // property2Nested: false | ||
| // } | ||
| // }] | ||
| // }).build()).to.throw('You can\'t do an implicit OR using nested properties') | ||
| // } | ||
| @test 'ors and and'() { | ||
@@ -522,2 +467,28 @@ let result = this.sut | ||
| @test | ||
| 'regression 20 may 2022'(){ | ||
| let sut = new QueryBuilder<IBooking>("", "IBooking", schema as TJS.Definition, false, null, null) | ||
| let result = sut | ||
| .find({ | ||
| size: 10, | ||
| number: 1, | ||
| where: { | ||
| approvedDate: Equals(null), | ||
| venue: { | ||
| name: StartsWith('Andy'), | ||
| }, | ||
| }, | ||
| relations: { | ||
| artists: { | ||
| images: true, | ||
| }, | ||
| venue: true | ||
| }, | ||
| }) | ||
| .build(); | ||
| expect(result).to.equal('?filter=equals(approvedDate,null)&include=artists.images,venue&page[size]=10&page[number]=1&filter=startsWith(venue.name,\'Andy\')') | ||
| } | ||
| @test | ||
| 'complex query works'() { | ||
@@ -597,5 +568,5 @@ let result = this.sut | ||
| expect(result).to.equal( | ||
| "?sort=property2&sort[nested]=property1Nested&filter=and(contains(a,'lol'),not(equals(not1,'not5')))&include=nested&fields=firstName,lastName&fields[nested]=property2Nested&page[size]=0&page[number]=10&filter[nested]=and(equals(property2Nested,'true'),has(property1Nested,one,two))&filter[nestedAgain]=endsWith(property1Nested,'wot')", | ||
| "?sort=property2&sort[nested]=property1Nested&filter=and(contains(a,'lol'),not(equals(not1,'not5')))&include=nested&fields=firstName,lastName&fields[nested]=property2Nested&page[size]=0&page[number]=10&filter=and(equals(property2Nested,'true'),has(nested.property1Nested,one,two))&filter=endsWith(nested.nestedAgain.property1Nested,'wot')", | ||
| ) | ||
| } | ||
| } |
@@ -1,2 +0,2 @@ | ||
| export { suite, test, params, skip, only } from '@testdeck/mocha' | ||
| export { suite, test, params, skip, only, timeout } from '@testdeck/mocha' | ||
@@ -3,0 +3,0 @@ import * as _chai from 'chai' |
+2
-1
@@ -15,3 +15,4 @@ { | ||
| "strict": false, | ||
| "strictPropertyInitialization": false | ||
| "strictPropertyInitialization": false, | ||
| "resolveJsonModule": true | ||
| }, | ||
@@ -18,0 +19,0 @@ "exclude": ["node_modules"], |
New alerts
Unpublished package
Supply chain riskPackage version was not found on the registry. It may exist on a different registry and need to be configured to pull from that registry.
Found 1 instance in 1 package
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
URL strings
Supply chain riskPackage contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.
Found 1 instance in 1 package
Fixed alerts
Unpopular package
QualityThis package is not very popular.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
97854
30.14%- Number of package files
102
21.43%- Lines of code
2791
41.1%- Number of medium quality alerts
0
-100%Worsened metrics
- Dependency count
5
25%- Number of low quality alerts
2
100%- Number of low supply chain risk alerts
2
100%- Number of medium supply chain risk alerts
1
Infinity%Dependency changes
+ Added
@cspotcode/source-map-support@0.8.1(transitive)+ Added
@jridgewell/trace-mapping@0.3.9(transitive)+ Added
@tsconfig/node10@1.0.12(transitive)+ Added
@tsconfig/node12@1.0.11(transitive)+ Added
@tsconfig/node14@1.0.3(transitive)+ Added
@tsconfig/node16@1.0.4(transitive)+ Added
@types/json-schema@7.0.15(transitive)+ Added
@types/node@16.18.126(transitive)+ Added
acorn@8.16.0(transitive)+ Added
acorn-walk@8.3.5(transitive)+ Added
arg@4.1.3(transitive)+ Added
balanced-match@1.0.2(transitive)+ Added
brace-expansion@1.1.12(transitive)+ Added
cliui@8.0.1(transitive)+ Added
concat-map@0.0.1(transitive)+ Added
create-require@1.1.1(transitive)+ Added
diff@4.0.4(transitive)+ Added
fs.realpath@1.0.0(transitive)+ Added
glob@7.2.3(transitive)+ Added
inflight@1.0.6(transitive)+ Added
inherits@2.0.4(transitive)+ Added
make-error@1.3.6(transitive)+ Added
minimatch@3.1.5(transitive)+ Added
once@1.4.0(transitive)+ Added
path-equal@1.1.2(transitive)+ Added
path-is-absolute@1.0.1(transitive)+ Added
safe-stable-stringify@2.5.0(transitive)+ Added
ts-node@10.9.2(transitive)+ Added
typescript@4.6.4(transitive)+ Added
typescript-json-schema@0.53.1(transitive)+ Added
v8-compile-cache-lib@3.0.1(transitive)+ Added
wrap-ansi@7.0.0(transitive)+ Added
wrappy@1.0.2(transitive)+ Added
y18n@5.0.8(transitive)+ Added
yargs@17.7.2(transitive)+ Added
yargs-parser@21.1.1(transitive)+ Added
yn@3.1.1(transitive)