@merchi/sdk 1.42.19 → 1.42.21

package/dist/entities/cart.test.js

@@ -1,3 +1,18 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 import { Merchi } from '../merchi.js';
 import { setup, mockFetch } from '../test_util.js';
 setup();
@@ -55,6 +70,60 @@ test('preserves isTest', function () {
     entity.fromJson({ id: 1, isTest: true });
     expect(entity.toJson()).toMatchObject({ isTest: true });
 });
+test('serialises a new cart when FormData has no set', function () {
+    var AppendOnlyFormData = /** @class */ (function () {
+        function AppendOnlyFormData() {
+            this.fields = new Map();
+        }
+        AppendOnlyFormData.prototype.append = function (name, value) {
+            this.fields.set(name, String(value));
+        };
+        AppendOnlyFormData.prototype.get = function (name) {
+            return this.fields.has(name) ? this.fields.get(name) : null;
+        };
+        AppendOnlyFormData.prototype.entries = function () {
+            return this.fields.entries();
+        };
+        return AppendOnlyFormData;
+    }());
+    var ReplacingFormData = /** @class */ (function (_super) {
+        __extends(ReplacingFormData, _super);
+        function ReplacingFormData() {
+            var _this = _super !== null && _super.apply(this, arguments) || this;
+            _this.ready = false;
+            return _this;
+        }
+        ReplacingFormData.prototype.append = function (name, value) {
+            if (!this.ready) {
+                throw new Error("delete was not called before append(".concat(name, ")"));
+            }
+            this.ready = false;
+            _super.prototype.append.call(this, name, value);
+        };
+        ReplacingFormData.prototype.delete = function () {
+            this.ready = true;
+        };
+        return ReplacingFormData;
+    }(AppendOnlyFormData));
+    var serialise = function (form) {
+        var merchi = new Merchi();
+        var cart = new merchi.Cart();
+        cart.isTest = false;
+        var domain = new merchi.Domain();
+        domain.id = 9;
+        cart.domain = domain;
+        cart.toFormData({ existing: form });
+        return form;
+    };
+    var appended = serialise(new AppendOnlyFormData());
+    expect(appended.get('isTest')).toBe('false');
+    expect(appended.get('domain-0-id')).toBe('9');
+    expect(appended.get('domain-count')).toBe('1');
+    var replaced = serialise(new ReplacingFormData());
+    expect(replaced.get('isTest')).toBe('false');
+    expect(replaced.get('domain-0-id')).toBe('9');
+    expect(replaced.get('domain-count')).toBe('1');
+});
 test('preserves source attribution', function () {
     var merchi = new Merchi();
     var entity = new merchi.Cart();

package/dist/entities/category.d.ts

@@ -1,4 +1,5 @@
 import { Domain } from './domain.js';
+import { DomainTag } from './domain_tag.js';
 import { Entity } from '../entity.js';
 import { MerchiFile } from './file.js';
 import { Product } from './product.js';
@@ -20,6 +21,8 @@ export declare class Category extends Entity {
     domain?: Domain;
     products?: Product[];
     users?: User[];
+    tags?: DomainTag[];
+    assigned?: User[];
     subcategories?: Category[];
     parent?: Category;
     image?: MerchiFile | null;

package/dist/entities/category.js

@@ -84,6 +84,14 @@ var Category = /** @class */ (function (_super) {
         Category.property({ arrayType: 'User' }),
         __metadata("design:type", Array)
     ], Category.prototype, "users", void 0);
+    __decorate([
+        Category.property({ arrayType: 'DomainTag' }),
+        __metadata("design:type", Array)
+    ], Category.prototype, "tags", void 0);
+    __decorate([
+        Category.property({ arrayType: 'User' }),
+        __metadata("design:type", Array)
+    ], Category.prototype, "assigned", void 0);
     __decorate([
         Category.property({ arrayType: 'Category' }),
         __metadata("design:type", Array)

package/dist/entities/category.test.js

@@ -33,6 +33,19 @@ test('can get and set product', function () {
     p1.categories = undefined;
     expect(p1.categories).toBe(undefined);
 });
+test('can set tags and assigned team members', function () {
+    var _a, _b;
+    var merchi = new Merchi();
+    var category = new merchi.Category();
+    var tag = new merchi.DomainTag();
+    var user = new merchi.User();
+    tag.id = 4;
+    user.id = 9;
+    category.tags = [tag];
+    category.assigned = [user];
+    expect((_a = category.tags) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.id; })).toEqual([4]);
+    expect((_b = category.assigned) === null || _b === void 0 ? void 0 : _b.map(function (item) { return item.id; })).toEqual([9]);
+});
 test('independence of entities', function () {
     var merchi = new Merchi();
     var c1 = new merchi.Category();

package/dist/entities/domain_tag.d.ts

@@ -1,3 +1,4 @@
+import { Category } from './category.js';
 import { Domain } from './domain.js';
 import { Entity } from '../entity.js';
 import { Invoice } from './invoice.js';
@@ -18,4 +19,5 @@ export declare class DomainTag extends Entity {
     products?: Product[];
     invoices?: Invoice[];
     shipments?: Shipment[];
+    categories?: Category[];
 }

package/dist/entities/domain_tag.js

@@ -72,6 +72,10 @@ var DomainTag = /** @class */ (function (_super) {
         DomainTag.property({ arrayType: 'Shipment' }),
         __metadata("design:type", Array)
     ], DomainTag.prototype, "shipments", void 0);
+    __decorate([
+        DomainTag.property({ arrayType: 'Category' }),
+        __metadata("design:type", Array)
+    ], DomainTag.prototype, "categories", void 0);
     return DomainTag;
 }(Entity));
 export { DomainTag };

package/dist/entities/domain_tag.test.js

@@ -4,3 +4,12 @@ test('can make DomainTag', function () {
     var domainTag = new merchi.DomainTag();
     expect(domainTag).toBeTruthy();
 });
+test('can set categories', function () {
+    var _a;
+    var merchi = new Merchi();
+    var domainTag = new merchi.DomainTag();
+    var category = new merchi.Category();
+    category.id = 3;
+    domainTag.categories = [category];
+    expect((_a = domainTag.categories) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.id; })).toEqual([3]);
+});

package/dist/entities/user.d.ts

@@ -90,6 +90,7 @@ export declare class User extends Entity {
     _companies?: UserCompany[];
     companiesNeedStripe?: Company[];
     categories?: Category[];
+    assignedCategories?: Category[];
     products?: Product[];
     profilePicture?: MerchiFile | null;
     phoneNumbers?: PhoneNumber[];

package/dist/entities/user.js

@@ -372,6 +372,10 @@ var User = /** @class */ (function (_super) {
         User.property({ arrayType: 'Category' }),
         __metadata("design:type", Array)
     ], User.prototype, "categories", void 0);
+    __decorate([
+        User.property({ arrayType: 'Category' }),
+        __metadata("design:type", Array)
+    ], User.prototype, "assignedCategories", void 0);
     __decorate([
         User.property({ arrayType: 'Product' }),
         __metadata("design:type", Array)

package/dist/entities/user.test.js

@@ -11,6 +11,15 @@ test('can make User', function () {
     var user = new merchi.User();
     expect(user).toBeTruthy();
 });
+test('can set assignedCategories', function () {
+    var _a;
+    var merchi = new Merchi();
+    var user = new merchi.User();
+    var category = new merchi.Category();
+    category.id = 3;
+    user.assignedCategories = [category];
+    expect((_a = user.assignedCategories) === null || _a === void 0 ? void 0 : _a.map(function (item) { return item.id; })).toEqual([3]);
+});
 test('can issue public create request to server', function () {
     var merchi = new Merchi();
     var user = new merchi.User();

package/dist/entity.js

@@ -302,6 +302,19 @@ var Entity = /** @class */ (function () {
             if (fileIndex === undefined) {
                 fileIndex = { value: 0 };
             }
+            // Prefer set so a repeated key is replaced. Fall back to append for
+            // FormData implementations that never added set.
+            var writeField = function (target, name, value) {
+                if (typeof target.set === 'function') {
+                    target.set(name, value);
+                    return;
+                }
+                var legacy = target;
+                if (typeof legacy.delete === 'function') {
+                    legacy.delete(name);
+                }
+                target.append(name, value);
+            };
             var appendData = function (name, value) {
                 /* istanbul ignore next */
                 if (name === undefined || value === undefined) {
@@ -311,10 +324,10 @@ var Entity = /** @class */ (function () {
                 if (prefix) {
                     name = prefix + '-' + name;
                 }
-                result.set(name, value);
+                writeField(result, name, value);
             };
             if (_this.fileData !== undefined) {
-                result.set(String(fileIndex.value), _this.fileData);
+                writeField(result, String(fileIndex.value), _this.fileData);
                 appendData('fileDataIndex', fileIndex.value);
                 fileIndex.value++;
             }

package/package.json

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

package/src/entities/cart.test.ts

@@ -63,6 +63,54 @@ test('preserves isTest', () => {
   expect(entity.toJson()).toMatchObject({ isTest: true });
 });
 
+test('serialises a new cart when FormData has no set', () => {
+  class AppendOnlyFormData {
+    fields = new Map<string, string>();
+    append(name: string, value: any) {
+      this.fields.set(name, String(value));
+    }
+    get(name: string) {
+      return this.fields.has(name) ? this.fields.get(name) : null;
+    }
+    entries() {
+      return this.fields.entries();
+    }
+  }
+  class ReplacingFormData extends AppendOnlyFormData {
+    private ready = false;
+    append(name: string, value: any) {
+      if (!this.ready) {
+        throw new Error(`delete was not called before append(${name})`);
+      }
+      this.ready = false;
+      super.append(name, value);
+    }
+    delete() {
+      this.ready = true;
+    }
+  }
+  const serialise = (form: AppendOnlyFormData) => {
+    const merchi = new Merchi();
+    const cart = new merchi.Cart();
+    cart.isTest = false;
+    const domain = new merchi.Domain();
+    domain.id = 9;
+    cart.domain = domain;
+    cart.toFormData({existing: form as unknown as FormData});
+    return form;
+  };
+
+  const appended = serialise(new AppendOnlyFormData());
+  expect(appended.get('isTest')).toBe('false');
+  expect(appended.get('domain-0-id')).toBe('9');
+  expect(appended.get('domain-count')).toBe('1');
+
+  const replaced = serialise(new ReplacingFormData());
+  expect(replaced.get('isTest')).toBe('false');
+  expect(replaced.get('domain-0-id')).toBe('9');
+  expect(replaced.get('domain-count')).toBe('1');
+});
+
 test('preserves source attribution', () => {
   const merchi = new Merchi();
   const entity = new merchi.Cart();

package/src/entities/category.test.ts

@@ -38,6 +38,19 @@ test('can get and set product', () => {
   expect(p1.categories).toBe(undefined);
 });
 
+test('can set tags and assigned team members', () => {
+  const merchi = new Merchi();
+  const category = new merchi.Category();
+  const tag = new merchi.DomainTag();
+  const user = new merchi.User();
+  tag.id = 4;
+  user.id = 9;
+  category.tags = [tag];
+  category.assigned = [user];
+  expect(category.tags?.map((item) => item.id)).toEqual([4]);
+  expect(category.assigned?.map((item) => item.id)).toEqual([9]);
+});
+
 test('independence of entities', () => {
   const merchi = new Merchi();
   const c1 = new merchi.Category();

package/src/entities/category.ts

@@ -1,4 +1,5 @@
 import { Domain } from './domain.js';
+import { DomainTag } from './domain_tag.js';
 import { Entity } from '../entity.js';
 import { MerchiFile } from './file.js';
 import { Product } from './product.js';
@@ -48,6 +49,12 @@ export class Category extends Entity {
   @Category.property({arrayType: 'User'})
   public users?: User[];
 
+  @Category.property({arrayType: 'DomainTag'})
+  public tags?: DomainTag[];
+
+  @Category.property({arrayType: 'User'})
+  public assigned?: User[];
+
   @Category.property({arrayType: 'Category'})
   public subcategories?: Category[];
 

package/src/entities/domain_tag.test.ts

@@ -5,3 +5,12 @@ test('can make DomainTag', () => {
   const domainTag = new merchi.DomainTag();
   expect(domainTag).toBeTruthy();
 });
+
+test('can set categories', () => {
+  const merchi = new Merchi();
+  const domainTag = new merchi.DomainTag();
+  const category = new merchi.Category();
+  category.id = 3;
+  domainTag.categories = [category];
+  expect(domainTag.categories?.map((item) => item.id)).toEqual([3]);
+});

package/src/entities/domain_tag.ts

@@ -1,3 +1,4 @@
+import { Category } from './category.js';
 import { Domain } from './domain.js';
 import { Entity } from '../entity.js';
 import { Invoice } from './invoice.js';
@@ -39,4 +40,7 @@ export class DomainTag extends Entity {
 
   @DomainTag.property({arrayType: 'Shipment'})
   public shipments?: Shipment[];
+
+  @DomainTag.property({arrayType: 'Category'})
+  public categories?: Category[];
 }

package/src/entities/user.test.ts

@@ -15,6 +15,15 @@ test('can make User', () => {
   expect(user).toBeTruthy();
 });
 
+test('can set assignedCategories', () => {
+  const merchi = new Merchi();
+  const user = new merchi.User();
+  const category = new merchi.Category();
+  category.id = 3;
+  user.assignedCategories = [category];
+  expect(user.assignedCategories?.map((item) => item.id)).toEqual([3]);
+});
+
 test('can issue public create request to server', () => {
   const merchi = new Merchi();
   const user = new merchi.User();

package/src/entities/user.ts

@@ -204,6 +204,9 @@ export class User extends Entity {
   @User.property({ arrayType: 'Category' })
   public categories?: Category[];
 
+  @User.property({ arrayType: 'Category' })
+  public assignedCategories?: Category[];
+
   @User.property({ arrayType: 'Product' })
   public products?: Product[];
 

package/src/entity.ts

@@ -928,6 +928,19 @@ export class Entity {
     if (fileIndex === undefined) {
       fileIndex = {value: 0};
     }
+    // Prefer set so a repeated key is replaced. Fall back to append for
+    // FormData implementations that never added set.
+    const writeField = (target: FormData, name: string, value: any) => {
+      if (typeof target.set === 'function') {
+        target.set(name, value);
+        return;
+      }
+      const legacy = target as FormData & {delete?: (field: string) => void};
+      if (typeof legacy.delete === 'function') {
+        legacy.delete(name);
+      }
+      target.append(name, value);
+    };
     const appendData = (name: string, value: any) => {
       /* istanbul ignore next */
       if (name === undefined || value === undefined) {
@@ -937,10 +950,10 @@ export class Entity {
       if (prefix) {
         name = prefix + '-' + name;
       }
-      result.set(name, value);
+      writeField(result, name, value);
     };
     if ((this as any).fileData !== undefined) {
-      result.set(String(fileIndex.value), (this as any).fileData);
+      writeField(result, String(fileIndex.value), (this as any).fileData);
       appendData('fileDataIndex', fileIndex.value);
       fileIndex.value++;
     }