@merchi/sdk 1.42.16 → 1.42.18

package/dist/constants/roles.d.ts

@@ -9,7 +9,8 @@ export declare enum Role {
     ACCOUNTANT = 7,
     THEME_EDITOR = 8,
     REFERRER = 9,
-    FULFILLMENT = 10
+    FULFILLMENT = 10,
+    ANALYTICS = 11
 }
 export declare const DOMAIN_MANAGERS: Role[];
 export declare const MANAGEMENT_TEAM: Role[];

package/dist/constants/roles.js

@@ -36,6 +36,7 @@ export var Role;
     Role[Role["THEME_EDITOR"] = 8] = "THEME_EDITOR";
     Role[Role["REFERRER"] = 9] = "REFERRER";
     Role[Role["FULFILLMENT"] = 10] = "FULFILLMENT";
+    Role[Role["ANALYTICS"] = 11] = "ANALYTICS";
 })(Role || (Role = {}));
 export var DOMAIN_MANAGERS = [Role.ADMIN, Role.MANAGER];
 export var MANAGEMENT_TEAM = __spreadArray(__spreadArray([], __read(DOMAIN_MANAGERS), false), [
@@ -48,12 +49,14 @@ export var BUSINESS_ACCOUNTS = __spreadArray(__spreadArray([], __read(MANAGEMENT
     Role.FULFILLMENT,
     Role.THEME_EDITOR,
     Role.REFERRER,
+    Role.ANALYTICS,
 ], false);
 export var MANAGEMENT_ROLES = [Role.ADMIN, Role.MANAGER];
 export var THEME_ROLES = __spreadArray(__spreadArray([], __read(MANAGEMENT_ROLES), false), [Role.THEME_EDITOR], false);
 export var ROLES_RANK = [
     Role.PUBLIC,
     Role.CLIENT,
+    Role.ANALYTICS,
     Role.REFERRER,
     Role.THEME_EDITOR,
     Role.ACCOUNTANT,

package/dist/entities/cart_item.test.js

@@ -26,3 +26,28 @@ test('Get quote update job cost', function () {
         expect(item.totalCost).toEqual(100);
     });
 });
+test('a cart item preserves a job without a tax relationship', function () {
+    var merchi = new Merchi();
+    var job = new merchi.Job().fromJson({ quantity: 100, taxType: null });
+    var item = new merchi.CartItem();
+    // The cart transfers this nullable API value through its untyped entity adapter.
+    expect(function () { item.taxType = job.taxType; }).not.toThrow();
+    expect(item.toJson()).toMatchObject({ taxType: null });
+    expect(Array.from(item.toFormData().entries())).toEqual([
+        ['taxType-0-id', '-1'],
+        ['taxType-count', '1'],
+    ]);
+});
+test('clearing a cart tax relationship preserves normal entity linking', function () {
+    var merchi = new Merchi();
+    var item = new merchi.CartItem();
+    var tax = new merchi.CountryTax();
+    tax.id = 7;
+    item.taxType = tax;
+    expect(tax.backObjects.has(item)).toBe(true);
+    expect(function () { item.taxType = null; }).not.toThrow();
+    expect(item.toJson()).toMatchObject({ taxType: null });
+    item.taxType = tax;
+    expect(tax.backObjects.has(item)).toBe(true);
+    expect(item.taxType).toBe(tax);
+});

package/dist/entity.d.ts

@@ -198,7 +198,7 @@ export declare class Entity {
     toJson: () => any;
     protected forEachProperty: (fn: (i: PropertyInfo) => void) => void;
     toFormData: (options?: SerialiseOptions, fileIndex?: Counter) => FormData;
-    protected addBackObject: (remote?: Entity) => void;
+    protected addBackObject: (remote?: Entity | null) => void;
     protected addBackObjectList: (remotes?: Entity[]) => void;
     updateOrder: (property: string) => void;
     protected markDirty: (property: string, newValue: any) => void;

package/dist/entity.js

@@ -423,7 +423,7 @@ var Entity = /** @class */ (function () {
             return result;
         };
         this.addBackObject = function (remote) {
-            if (remote !== undefined) {
+            if (remote !== undefined && remote !== null) {
                 remote.backObjects.add(_this);
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merchi/sdk",
-  "version": "1.42.16",
+  "version": "1.42.18",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/constants/roles.ts

@@ -10,6 +10,7 @@ export enum Role {
   THEME_EDITOR = 8,
   REFERRER = 9,
   FULFILLMENT = 10,
+  ANALYTICS = 11,
 }
 
 export const DOMAIN_MANAGERS = [Role.ADMIN, Role.MANAGER];
@@ -27,6 +28,7 @@ export const BUSINESS_ACCOUNTS = [
   Role.FULFILLMENT,
   Role.THEME_EDITOR,
   Role.REFERRER,
+  Role.ANALYTICS,
 ];
 
 export const MANAGEMENT_ROLES = [Role.ADMIN, Role.MANAGER];
@@ -35,6 +37,7 @@ export const THEME_ROLES = [...MANAGEMENT_ROLES, Role.THEME_EDITOR];
 export const ROLES_RANK = [
   Role.PUBLIC,
   Role.CLIENT,
+  Role.ANALYTICS,
   Role.REFERRER,
   Role.THEME_EDITOR,
   Role.ACCOUNTANT,

package/src/entities/cart_item.test.ts

@@ -31,3 +31,33 @@ test('Get quote update job cost', () => {
     expect(item.totalCost).toEqual(100);
   });
 });
+
+
+test('a cart item preserves a job without a tax relationship', () => {
+  const merchi = new Merchi();
+  const job = new merchi.Job().fromJson({ quantity: 100, taxType: null });
+  const item = new merchi.CartItem();
+
+  // The cart transfers this nullable API value through its untyped entity adapter.
+  expect(() => { (item as any).taxType = job.taxType; }).not.toThrow();
+  expect(item.toJson()).toMatchObject({ taxType: null });
+  expect(Array.from((item.toFormData() as any).entries())).toEqual([
+    ['taxType-0-id', '-1'],
+    ['taxType-count', '1'],
+  ]);
+});
+
+test('clearing a cart tax relationship preserves normal entity linking', () => {
+  const merchi = new Merchi();
+  const item = new merchi.CartItem();
+  const tax = new merchi.CountryTax();
+  tax.id = 7;
+  item.taxType = tax;
+  expect(tax.backObjects.has(item)).toBe(true);
+
+  expect(() => { (item as any).taxType = null; }).not.toThrow();
+  expect(item.toJson()).toMatchObject({ taxType: null });
+  item.taxType = tax;
+  expect(tax.backObjects.has(item)).toBe(true);
+  expect(item.taxType).toBe(tax);
+});

package/src/entity.ts

@@ -347,7 +347,7 @@ export class Entity {
       const get = () => {
         return info.currentValue;
       };
-      const set = (newValue?: Entity) => {
+      const set = (newValue?: Entity | null) => {
         info.currentValue = newValue;
         this.addBackObject(newValue);
         this.markDirty(info.property, newValue);
@@ -1040,8 +1040,8 @@ export class Entity {
     return result;
   };
 
-  protected addBackObject = (remote?: Entity) => {
-    if (remote !== undefined) {
+  protected addBackObject = (remote?: Entity | null) => {
+    if (remote !== undefined && remote !== null) {
       remote.backObjects.add(this);
     }
   };