@bisondesk/core-sdk 1.0.235 → 1.0.236

package/lib/{cjs/utils → utils}/leasing.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortContractClients = void 0;
-const dayjs_utils_1 = require("@bisondesk/commons-sdk/dayjs-utils");
+const dayjs_utils_1 = require("@bisondesk/commons-sdk/lib/dayjs-utils");
 const lodash_1 = require("lodash");
-const sortContractClients = (clients) => (0, lodash_1.sortBy)((0, lodash_1.map)((0, lodash_1.uniqBy)(clients, (c) => c.takeoverId), (c) => ({ ...c, since: (0, dayjs_utils_1.utc)(c.since).format('YYYY-MM-DD') })), (cli) => cli.since, (cli) => (cli.takeoverId ? parseInt(cli.takeoverId.replace(/[^0-9]/g, '')) : 0));
+/* sort from oldest to most recent client */
+const sortContractClients = (clients) => (0, lodash_1.sortBy)((0, lodash_1.map)((0, lodash_1.uniqBy)(clients, (c) => c.takeoverId), (c) => ({ ...c, since: (0, dayjs_utils_1.utc)(c.since).format('YYYY-MM-DD') }) // doing a map to also fix legacy data
+), (cli) => cli.since, (cli) => (cli.takeoverId ? parseInt(cli.takeoverId.replace(/[^0-9]/g, '')) : 0));
 exports.sortContractClients = sortContractClients;
 //# sourceMappingURL=leasing.js.map

package/lib/utils/leasing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"leasing.js","sourceRoot":"","sources":["../../src/utils/leasing.ts"],"names":[],"mappings":";;;AAAA,wEAA6D;AAC7D,mCAA6C;AAG7C,4CAA4C;AACrC,MAAM,mBAAmB,GAAG,CAAC,OAAgC,EAA2B,EAAE,CAC/F,IAAA,eAAM,EACJ,IAAA,YAAG,EACD,IAAA,eAAM,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,EACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,IAAA,iBAAG,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,sCAAsC;CACnG,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAClB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAChF,CAAC;AARS,QAAA,mBAAmB,uBAQ5B"}

package/lib/utils/slug.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"slug.d.ts","sourceRoot":"","sources":["../../src/utils/slug.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,eAAO,MAAM,cAAc,YAAa,OAAO,KAAG,MAejD,CAAC"}

package/lib/utils/slug.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slug.js","sourceRoot":"","sources":["../../src/utils/slug.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAGvB,MAAM,cAAc,GAAG,CAAC,OAAgB,EAAU,EAAE;IACzD,OAAO,IAAA,iBAAO,EACZ;QACE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW;QAC1F,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI;QAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS;QAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ;QACjC,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,EAAE;QAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ;QACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS;QAClC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,aAAa;KAClD;SACE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,cAAc,kBAezB"}

package/lib/utils/tenants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tenants.d.ts","sourceRoot":"","sources":["../../src/utils/tenants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAElD,eAAO,MAAM,SAAS,WAAY,MAAM,YAAY,MAAM,KAAG,MAO5D,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAY,MAAM,KAAG,MAAiC,CAAC"}

package/lib/{cjs/utils → utils}/tenants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultBranch = exports.getBranch = void 0;
-const errors_1 = require("@bisondesk/commons-sdk/errors");
+const errors_1 = require("@bisondesk/commons-sdk/lib/errors");
 const lodash_1 = require("lodash");
 const getBranch = (tenant, branchId) => {
     const branch = tenant.branches.find((branch) => branch.id === branchId);

package/lib/utils/tenants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../src/utils/tenants.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAC3D,mCAA+B;AAGxB,MAAM,SAAS,GAAG,CAAC,MAAc,EAAE,QAAgB,EAAU,EAAE;IACpE,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;IAChF,IAAI,MAAM,IAAI,IAAI,EAAE;QAClB,MAAM,IAAI,eAAM,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;KACjF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAPW,QAAA,SAAS,aAOpB;AAEK,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC,IAAA,cAAK,EAAC,MAAM,CAAC,QAAQ,CAAE,CAAC;AAAvE,QAAA,gBAAgB,oBAAuD"}

package/lib/utils/vehicles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vehicles.d.ts","sourceRoot":"","sources":["../../src/utils/vehicles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAEpF,eAAO,MAAM,kBAAkB,YAAa,OAAO,KAAG,iBAAiB,EAYtE,CAAC;AAEF,eAAO,MAAM,qBAAqB,YAAa,mBAAmB,KAAG,MAAM,EA+B1E,CAAC;AAEF,eAAO,MAAM,gBAAgB;UAOrB,MAAM;cACF,MAAM;;;;MAId,MAcH,CAAC;AAGF,eAAO,MAAM,sBAAsB,QAAS,MAAM,KAAG,MAYpD,CAAC"}

package/lib/{cjs/utils → utils}/vehicles.js

@@ -58,6 +58,7 @@ const getInternalTitle = ({ make, category, modelName, bodywork, modelTypeName,
         .trim();
 };
 exports.getInternalTitle = getInternalTitle;
+// example: 1 -> A, 2 -> B, 26 -> Z, 27 -> AA, 28 -> AB, 52 -> AZ, 53 -> BA, 54 -> BB, 702 -> ZZ, 703 -> AAA
 const convertNumberToLetters = (num) => {
     const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     const lettersLength = letters.length;

package/lib/utils/vehicles.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vehicles.js","sourceRoot":"","sources":["../../src/utils/vehicles.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@bisondesk/core-sdk",
-  "version": "1.0.235",
+  "version": "1.0.236",
   "description": "",
   "scripts": {
     "clean": "rm -rf build dist lib *.tsbuildinfo",
     "unittest": "echo \"No test specified\"",
     "integrationtest": "echo \"No test specified\"",
-    "build": "npx tsc --build tsconfig.cjs.json & npx tsc --build tsconfig.esm.json",
+    "build": "npx tsc --build",
     "watch": "npx tsc --build --watch"
   },
   "author": "TheTruckCompany",
   "dependencies": {
-    "@bisondesk/commons-sdk": "1.0.235",
+    "@bisondesk/commons-sdk": "1.0.236",
     "joi": "17.4.0",
     "decimal.js": "10.3.1",
     "slugify": "1.6.5"
@@ -19,21 +19,5 @@
   "devDependencies": {
     "@types/node": "16.11.7",
     "typescript": "4.7.4"
-  },
-
-  "main": "./lib/cjs/*",
-  "module": "./lib/esm/*",
-  "exports": {
-    "./*": {
-     "import": ["./lib/esm/*.js", "./lib/esm/*/*.js"],
-     "require": ["./lib/cjs/*.js", "./lib/cjs/*/*.js"]
-    }
-  },
-  "typesVersions": {
-    "*": {
-      "*": [
-        "lib/types/*"
-      ]
-    }
   }
-}
+}

package/src/apis/crm.ts

@@ -1,6 +1,9 @@
-import { SERVICE_ID_ADMIN_HEADER, TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
-import { PaginatedList } from '@bisondesk/commons-sdk/types';
+import {
+  SERVICE_ID_ADMIN_HEADER,
+  TENANT_ID_ADMIN_HEADER,
+} from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
+import { PaginatedList } from '@bisondesk/commons-sdk/lib/types';
 import type { Patch } from 'immer';
 import fetch, { Response } from 'node-fetch';
 import {

package/src/apis/documents.ts

@@ -1,5 +1,5 @@
-import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
+import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import { FinanceBooking, FinanceDocument } from '../types/documents';
 import { getAdminAuth } from './utils';

package/src/apis/internet-vehicles.ts

@@ -1,4 +1,4 @@
-import { XError } from '@bisondesk/commons-sdk/errors';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import { SearchInternetVehicle } from '../types/internet-vehicles';
 import { getAdminAuth } from './utils';

package/src/apis/leasing-administration.ts

@@ -1,5 +1,8 @@
-import { SERVICE_ID_ADMIN_HEADER, TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
+import {
+  SERVICE_ID_ADMIN_HEADER,
+  TENANT_ID_ADMIN_HEADER,
+} from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import {
   LeasingAdminUpload,

package/src/apis/leasing.ts

@@ -1,5 +1,8 @@
-import { SERVICE_ID_ADMIN_HEADER, TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
+import {
+  SERVICE_ID_ADMIN_HEADER,
+  TENANT_ID_ADMIN_HEADER,
+} from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import {
   AmortizationDocs,

package/src/apis/opportunities.ts

@@ -1,5 +1,5 @@
-import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
+import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import { AmortizationTable, AmortizationTableRequest } from '../types/leasing';
 import { LeasingQuoteParams } from '../types/leasing-settings';

package/src/apis/picklists.ts

@@ -1,5 +1,5 @@
-import { XError } from '@bisondesk/commons-sdk/errors';
-import { Option } from '@bisondesk/commons-sdk/types';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
+import { Option } from '@bisondesk/commons-sdk/lib/types';
 import fetch, { Response } from 'node-fetch';
 import {
   AdHocPicklistRequest,

package/src/apis/tenants.ts

@@ -1,4 +1,4 @@
-import { XError } from '@bisondesk/commons-sdk/errors';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import { Tenant, TenantSyncSettings } from '../types/tenants';
 import { getAdminAuth } from './utils';

package/src/apis/users.ts

@@ -1,5 +1,5 @@
-import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
+import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import { User } from '../types/users';
 import { cleanHeaders, getAdminAuth } from './utils';

package/src/apis/utils.ts

@@ -1,5 +1,5 @@
-import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { InvalidArgumentsError } from '@bisondesk/commons-sdk/errors';
+import { TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/lib/constants';
+import { InvalidArgumentsError } from '@bisondesk/commons-sdk/lib/errors';
 import type { HeadersInit } from 'node-fetch';
 
 export const getAdminAuth = async (): Promise<string> => {

package/src/apis/vehicles.ts

@@ -1,5 +1,8 @@
-import { SERVICE_ID_ADMIN_HEADER, TENANT_ID_ADMIN_HEADER } from '@bisondesk/commons-sdk/constants';
-import { XError } from '@bisondesk/commons-sdk/errors';
+import {
+  SERVICE_ID_ADMIN_HEADER,
+  TENANT_ID_ADMIN_HEADER,
+} from '@bisondesk/commons-sdk/lib/constants';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import fetch, { Response } from 'node-fetch';
 import { DataRecord } from '../types/utils';
 import { NewVehicle, Vehicle, VehicleMarketing, VehiclePurchase } from '../types/vehicles';

package/src/constants.ts

@@ -1,6 +1,6 @@
 import { VehicleAxle } from './types/vehicles';
 
-export { BusinessEntityIds } from '@bisondesk/commons-sdk/constants';
+export { BusinessEntityIds } from '@bisondesk/commons-sdk/lib/constants';
 
 //
 // STATIC PICKLIST IDS

package/src/types/crm.ts

@@ -3,7 +3,7 @@ import {
   PhoneNumberRawValue,
   PhoneNumberValue,
   SearchPermissions,
-} from '@bisondesk/commons-sdk/types';
+} from '@bisondesk/commons-sdk/lib/types';
 import { PublicSearchDefinition } from './definitions';
 import { LeasingContract } from './leasing';
 import { ReferenceData } from './utils';

package/src/types/documents.ts

@@ -1,4 +1,4 @@
-import { AttachmentValue, SearchPermissions } from '@bisondesk/commons-sdk/types';
+import { AttachmentValue, SearchPermissions } from '@bisondesk/commons-sdk/lib/types';
 import { Organization } from './crm';
 import { PublicSearchDefinition } from './definitions';
 

package/src/types/internet-vehicles.ts

@@ -1,4 +1,4 @@
-import { LocationValue, PhoneNumberValue } from '@bisondesk/commons-sdk/types';
+import { LocationValue, PhoneNumberValue } from '@bisondesk/commons-sdk/lib/types';
 import { PublicSearchDefinition } from './definitions';
 import { AggregationRequest } from './search';
 import { Vehicle } from './vehicles';

package/src/types/leads.ts

@@ -2,7 +2,7 @@ import {
   PhoneNumberRawValue,
   PhoneNumberValue,
   SearchPermissions,
-} from '@bisondesk/commons-sdk/types';
+} from '@bisondesk/commons-sdk/lib/types';
 import { PublicSearchDefinition } from './definitions';
 import { ReferenceData } from './utils';
 import { SearchVehicle } from './vehicles';

package/src/types/leasing-administration.ts

@@ -1,4 +1,4 @@
-import { AttachmentValue } from '@bisondesk/commons-sdk/types';
+import { AttachmentValue } from '@bisondesk/commons-sdk/lib/types';
 import { LeasingAdminUploadHandlers } from '../constants';
 
 export type LeasingAdminUploadStatus = 'success' | 'processing' | 'error';

package/src/types/leasing-search.ts

@@ -1,5 +1,5 @@
-import { InsuranceEntry } from '@bisondesk/commons-sdk/insurance';
-import { SearchPermissions } from '@bisondesk/commons-sdk/types';
+import { InsuranceEntry } from '@bisondesk/commons-sdk/lib/insurance';
+import { SearchPermissions } from '@bisondesk/commons-sdk/lib/types';
 import { Organization } from './crm';
 import { PublicSearchDefinition } from './definitions';
 import { LeasingContract } from './leasing';

package/src/types/leasing-settings.ts

@@ -1,5 +1,5 @@
-import { MultiLangValue } from '@bisondesk/commons-sdk/types';
-import { Categories } from '../constants';
+import { MultiLangValue } from '@bisondesk/commons-sdk/lib/types';
+import { Categories, OpportunityType } from '../constants';
 import { SortFilter } from './search';
 
 export type LeasingQuoteParams = { id: string; name: string; modifiedAt: string } & {
@@ -55,6 +55,7 @@ type BaseLeasingQuoteExtraSettings = {
   vehicleCategoryRestrictions: Categories[];
   departments: string[];
   departmentTitles?: { [department: string]: string };
+  opportunityTypeRestrictions: OpportunityType[];
 };
 
 export type BaseLeasingQuoteExtraInput = {
@@ -106,4 +107,5 @@ export type LeasingQuoteExtrasRequest = {
   offset?: number;
   limit?: number;
   sortBy?: SortFilter;
+  opportunityType?: OpportunityType;
 };

package/src/types/leasing.ts

@@ -1,5 +1,10 @@
-import { EmailMessage } from '@bisondesk/commons-sdk/messages';
-import { AttachmentValue, Document, LinkValue, PaginatedList } from '@bisondesk/commons-sdk/types';
+import { EmailMessage } from '@bisondesk/commons-sdk/lib/messages';
+import {
+  AttachmentValue,
+  Document,
+  LinkValue,
+  PaginatedList,
+} from '@bisondesk/commons-sdk/lib/types';
 import { SortFilter } from './search';
 import { ReferenceData } from './utils';
 
@@ -82,7 +87,7 @@ export type LeasingContractBisondesk = {
   opportunities: OpportunityRef[];
 };
 
-export type LeasingContract = {
+export type LeasingContract<T = LeasingContractHyperportal | LeasingContractBisondesk> = {
   id: string;
   createdAt: string;
   updatedAt: string;
@@ -101,21 +106,26 @@ export type LeasingContract = {
   };
   status: LeasingContractStatus;
   documents: Document[];
-} & (LeasingContractHyperportal | LeasingContractBisondesk);
+} & T;
 
-export type ConditionsRef = {
+type BaseRef = {
   id: string;
-  validSince: string;
+  depositAmount: string;
+  durationInMonths: number;
+  saleAmount: string; // includes the extras
+  interestRate: string;
+  residualAmount: string;
   leasingMonthlyAmount: string; //Value excluding VAT
+  otherMonthlyAmounts: string; //Value excluding VAT
   totalMonthlyAmount: string; //Value excluding VAT
 };
 
-export type OpportunityRef = {
-  id: string;
+export type ConditionsRef = BaseRef & {
+  validSince: string;
+};
+
+export type OpportunityRef = BaseRef & {
   createdAt: string;
-  leasingMonthlyAmount: string; //Value excluding VAT
-  otherAmounts: string; //Value excluding VAT
-  totalMonthlyAmount: string; //Value excluding VAT
   quoteId: string;
   //Since VAT is client specific and contracts can be transferred between clients, we always handle values without VAT
 };

package/src/types/opportunities.ts

@@ -1,4 +1,4 @@
-import { Document } from '@bisondesk/commons-sdk/types';
+import { Document } from '@bisondesk/commons-sdk/lib/types';
 import { OpportunityType } from '../constants';
 import { Contact, Organization } from './crm';
 import { Interest } from './leads';

package/src/types/picklists.ts

@@ -1,4 +1,4 @@
-import { MultiLangValue } from '@bisondesk/commons-sdk/types';
+import { MultiLangValue } from '@bisondesk/commons-sdk/lib/types';
 
 export type PicklistValueUpdateRequest = {
   picklistId: string;

package/src/types/quotes.ts

@@ -1,4 +1,4 @@
-import { AttachmentValue } from '@bisondesk/commons-sdk/types';
+import { AttachmentValue } from '@bisondesk/commons-sdk/lib/types';
 import { OpportunityType } from '../constants';
 import {
   CustomLeasingQuoteExtraInput,

package/src/types/recently-viewed.ts

@@ -1,4 +1,4 @@
-import { AttachmentValue, Requester } from '@bisondesk/commons-sdk/types';
+import { AttachmentValue, Requester } from '@bisondesk/commons-sdk/lib/types';
 import { BusinessEntityIds } from '../constants';
 
 export type ViewedItemsRequest = {

package/src/types/search.ts

@@ -2,7 +2,7 @@
 // Generic stuff
 ///////////////////////////////////////////////////////
 
-import { MultiLangValue } from '@bisondesk/commons-sdk/types';
+import { MultiLangValue } from '@bisondesk/commons-sdk/lib/types';
 import { FieldTypes, NumberMeta } from './fields';
 
 export enum ConditionType {

package/src/types/storage.ts

@@ -1 +1 @@
-export * from '@bisondesk/commons-sdk/storage';
+export * from '@bisondesk/commons-sdk/lib/storage';

package/src/types/tenants.ts

@@ -1,4 +1,4 @@
-import { Region } from '@bisondesk/commons-sdk/types';
+import { Region } from '@bisondesk/commons-sdk/lib/types';
 
 export type PublicTenant = {
   defaultCountry: string;

package/src/types/users.ts

@@ -1,9 +1,9 @@
-import { AppRoles } from '@bisondesk/commons-sdk/constants';
+import { AppRoles } from '@bisondesk/commons-sdk/lib/constants';
 import {
   AttachmentValue,
   PhoneNumberRawValue,
   PhoneNumberValue,
-} from '@bisondesk/commons-sdk/types';
+} from '@bisondesk/commons-sdk/lib/types';
 
 export type NewUserRequest = {
   email: string;

package/src/types/utils.ts

@@ -1,4 +1,4 @@
-import { MultiLangValue } from '@bisondesk/commons-sdk/types';
+import { MultiLangValue } from '@bisondesk/commons-sdk/lib/types';
 import { AdHocPicklistValueDisplay } from './picklists';
 
 export type CountryInfo = {

package/src/types/vehicles.ts

@@ -4,7 +4,7 @@ import {
   LocationValue,
   MultiLangValue,
   SearchPermissions,
-} from '@bisondesk/commons-sdk/types';
+} from '@bisondesk/commons-sdk/lib/types';
 
 type BaseVehicleEvent = {
   id: string;

package/src/types/website.ts

@@ -1,4 +1,4 @@
-import { PhoneNumberRawValue, PhoneNumberValue } from '@bisondesk/commons-sdk/types';
+import { PhoneNumberRawValue, PhoneNumberValue } from '@bisondesk/commons-sdk/lib/types';
 
 export type ContactFormRequest = {
   email: string;

package/src/utils/leasing.ts

@@ -1,4 +1,4 @@
-import { utc } from '@bisondesk/commons-sdk/dayjs-utils';
+import { utc } from '@bisondesk/commons-sdk/lib/dayjs-utils';
 import { map, sortBy, uniqBy } from 'lodash';
 import { LeasingContractClient } from '../types/leasing';
 

package/src/utils/tenants.ts

@@ -1,4 +1,4 @@
-import { XError } from '@bisondesk/commons-sdk/errors';
+import { XError } from '@bisondesk/commons-sdk/lib/errors';
 import { first } from 'lodash';
 import { Branch, Tenant } from '../types/tenants';
 

package/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "extends": "../../tsconfig.json",
+  "include": ["src"],
   "compilerOptions": {
+    "composite": true,
     "declaration": true,
     "declarationMap": true,
-    "sourceMap": true,
-    "composite": true,
+    "outDir": "lib",
     "rootDir": "src",
-    "declarationDir": "lib/types"
+    "sourceMap": true
   },
-  "include": ["src"]
+  "references": [{ "path": "../commons-sdk" }]
 }