@marcoappio/marco-config 2.0.478 → 2.0.480

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/marcoPublicConfig.d.ts +0 -5
  2. package/dist/marcoPublicConfig.d.ts.map +1 -1
  3. package/dist/marcoPublicConfig.js +0 -15
  4. package/dist/types/Zero.d.ts +3 -2
  5. package/dist/types/Zero.d.ts.map +1 -1
  6. package/dist/types/Zero.js +2 -1
  7. package/dist/zero/mutators/draftMutators/draftMutators.d.ts.map +1 -1
  8. package/dist/zero/mutators/draftMutators/draftMutators.js +7 -0
  9. package/dist/zero/mutators/draftMutators/draftMutators.test.js +68 -1
  10. package/package.json +1 -1
package/dist/marcoPublicConfig.d.ts CHANGED
@@ -8,11 +8,6 @@ type MarcoPublicConfig = {
8
8
  app: {
9
9
  baseUrl: string;
10
10
  };
11
- ws: {
12
- appId: string;
13
- host: string;
14
- key: string;
15
- };
16
11
  img: {
17
12
  baseUrl: string;
18
13
  bucketName: string;
package/dist/marcoPublicConfig.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marcoPublicConfig.d.ts","sourceRoot":"","sources":["../src/marcoPublicConfig.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,SAAS,GAAG,aAAa,CAAA;AAEvE,eAAO,MAAM,SAAS,kBAGP,CAAA;AAEf,KAAK,iBAAiB,GAAG;IACvB,KAAK,EAAE;QACL,GAAG,EAAE;YACH,OAAO,EAAE,MAAM,CAAA;SAChB,CAAA;QACD,GAAG,EAAE;YACH,OAAO,EAAE,MAAM,CAAA;SAChB,CAAA;QACD,EAAE,EAAE;YACF,KAAK,EAAE,MAAM,CAAA;YACb,IAAI,EAAE,MAAM,CAAA;YACZ,GAAG,EAAE,MAAM,CAAA;SACZ,CAAA;QACD,GAAG,EAAE;YACH,OAAO,EAAE,MAAM,CAAA;YACf,UAAU,EAAE,MAAM,CAAA;SACnB,CAAA;KACF,CAAA;IACD,KAAK,EAAE;QACL,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,MAAM,CAAA;YAChB,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;KACF,CAAA;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF,CAAA;AA2GD,eAAO,MAAM,iBAAiB,SAAS,gBAAgB,sBAAmC,CAAA"}
1
+ {"version":3,"file":"marcoPublicConfig.d.ts","sourceRoot":"","sources":["../src/marcoPublicConfig.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,SAAS,GAAG,aAAa,CAAA;AAEvE,eAAO,MAAM,SAAS,kBAGP,CAAA;AAEf,KAAK,iBAAiB,GAAG;IACvB,KAAK,EAAE;QACL,GAAG,EAAE;YACH,OAAO,EAAE,MAAM,CAAA;SAChB,CAAA;QACD,GAAG,EAAE;YACH,OAAO,EAAE,MAAM,CAAA;SAChB,CAAA;QACD,GAAG,EAAE;YACH,OAAO,EAAE,MAAM,CAAA;YACf,UAAU,EAAE,MAAM,CAAA;SACnB,CAAA;KACF,CAAA;IACD,KAAK,EAAE;QACL,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;QACD,OAAO,EAAE;YACP,QAAQ,EAAE,MAAM,CAAA;YAChB,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;KACF,CAAA;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF,CAAA;AA4FD,eAAO,MAAM,iBAAiB,SAAS,gBAAgB,sBAAmC,CAAA"}
package/dist/marcoPublicConfig.js CHANGED
@@ -14,11 +14,6 @@ const configMap = {
14
14
  baseUrl: 'https://img.staging.marcoapp.io',
15
15
  bucketName: 'raw-images-hvpu9tjyrwmpzi',
16
16
  },
17
- ws: {
18
- appId: 'marco-ws-staging',
19
- host: 'ws.staging.marcoapp.io',
20
- key: 'IuF65Dgky1rJ2Aua',
21
- },
22
17
  },
23
18
  oauth: {
24
19
  google: {
@@ -48,11 +43,6 @@ const configMap = {
48
43
  baseUrl: 'https://img.marcoapp.io',
49
44
  bucketName: 'marco-image-bucket-s3-qjw',
50
45
  },
51
- ws: {
52
- appId: 'marco-ws-production',
53
- host: 'ws.marcoapp.io',
54
- key: 'O8bc4c11yHuNNS',
55
- },
56
46
  },
57
47
  oauth: {
58
48
  google: {
@@ -82,11 +72,6 @@ const configMap = {
82
72
  baseUrl: 'https://img.staging.marcoapp.io',
83
73
  bucketName: 'raw-images-hvpu9tjyrwmpzi',
84
74
  },
85
- ws: {
86
- appId: 'marco-ws-staging',
87
- host: 'ws.staging.marcoapp.io',
88
- key: 'IuF65Dgky1rJ2Aua',
89
- },
90
75
  },
91
76
  oauth: {
92
77
  google: {
package/dist/types/Zero.d.ts CHANGED
@@ -16,7 +16,8 @@ export type MutatorMap<Defs extends MutatorDefinitions> = {
16
16
  [Name in keyof Defs]: (tx: Transaction<MarcoZeroSchema>, args: v.InferInput<Defs[Name]['delta']>) => Promise<void>;
17
17
  };
18
18
  export declare enum MutationError {
19
- ENTITY_NOT_FOUND = "MutationError/ENTITY_NOT_FOUND",
20
- AUTHENTICATION_REQUIRED = "MutationError/AUTHENTICATION_REQUIRED"
19
+ AUTHENTICATION_REQUIRED = "MutationError/AUTHENTICATION_REQUIRED",
20
+ ALREADY_APPLIED = "MutationError/ALREADY_APPLIED",
21
+ ENTITY_NOT_FOUND = "MutationError/ENTITY_NOT_FOUND"
21
22
  }
22
23
  //# sourceMappingURL=Zero.d.ts.map
package/dist/types/Zero.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Zero.d.ts","sourceRoot":"","sources":["../../src/types/Zero.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,KAAK,CAAC,MAAM,SAAS,CAAA;AAEjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEhE,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,CAAC,CAAC,aAAa,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AAElE,MAAM,MAAM,cAAc,CAAC,MAAM,SAAS,CAAC,CAAC,aAAa,IAAI,CAC3D,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,EAChC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KACxB,OAAO,CAAC,IAAI,CAAC,CAAA;AAElB,MAAM,MAAM,UAAU,CAAC,IAAI,SAAS,kBAAkB,IAAI;KACvD,IAAI,IAAI,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;CAC1D,CAAA;AAED,MAAM,MAAM,UAAU,CAAC,IAAI,SAAS,kBAAkB,IAAI;KACvD,IAAI,IAAI,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;CACnH,CAAA;AAED,oBAAY,aAAa;IACvB,gBAAgB,mCAAmC;IACnD,uBAAuB,0CAA0C;CAClE"}
1
+ {"version":3,"file":"Zero.d.ts","sourceRoot":"","sources":["../../src/types/Zero.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,KAAK,CAAC,MAAM,SAAS,CAAA;AAEjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAEhE,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,CAAC,CAAC,aAAa,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;AAElE,MAAM,MAAM,cAAc,CAAC,MAAM,SAAS,CAAC,CAAC,aAAa,IAAI,CAC3D,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,EAChC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KACxB,OAAO,CAAC,IAAI,CAAC,CAAA;AAElB,MAAM,MAAM,UAAU,CAAC,IAAI,SAAS,kBAAkB,IAAI;KACvD,IAAI,IAAI,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;CAC1D,CAAA;AAED,MAAM,MAAM,UAAU,CAAC,IAAI,SAAS,kBAAkB,IAAI;KACvD,IAAI,IAAI,MAAM,IAAI,GAAG,CAAC,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;CACnH,CAAA;AAED,oBAAY,aAAa;IACvB,uBAAuB,0CAA0C;IACjE,eAAe,kCAAkC;IACjD,gBAAgB,mCAAmC;CACpD"}
package/dist/types/Zero.js CHANGED
@@ -1,5 +1,6 @@
1
1
  export var MutationError;
2
2
  (function (MutationError) {
3
- MutationError["ENTITY_NOT_FOUND"] = "MutationError/ENTITY_NOT_FOUND";
4
3
  MutationError["AUTHENTICATION_REQUIRED"] = "MutationError/AUTHENTICATION_REQUIRED";
4
+ MutationError["ALREADY_APPLIED"] = "MutationError/ALREADY_APPLIED";
5
+ MutationError["ENTITY_NOT_FOUND"] = "MutationError/ENTITY_NOT_FOUND";
5
6
  })(MutationError || (MutationError = {}));
package/dist/zero/mutators/draftMutators/draftMutators.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"draftMutators.d.ts","sourceRoot":"","sources":["../../../../src/zero/mutators/draftMutators/draftMutators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,SAAS,CAAA;AAEjC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAiB,MAAM,qBAAqB,CAAA;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAE3E,MAAM,MAAM,qBAAqB,GAAG;KACjC,CAAC,IAAI,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACzC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KACzD,OAAO,CAAC,IAAI,CAAC;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,aACpB,QAAQ,GAAG,SAAS,cAClB,qBAAqB,KAChC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAiKvC,CAAA"}
1
+ {"version":3,"file":"draftMutators.d.ts","sourceRoot":"","sources":["../../../../src/zero/mutators/draftMutators/draftMutators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,SAAS,CAAA;AAEjC,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAiB,MAAM,qBAAqB,CAAA;AAEnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AAE3E,MAAM,MAAM,qBAAqB,GAAG;KACjC,CAAC,IAAI,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CACzC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KACzD,OAAO,CAAC,IAAI,CAAC;CACnB,CAAA;AAED,eAAO,MAAM,mBAAmB,aACpB,QAAQ,GAAG,SAAS,cAClB,qBAAqB,KAChC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CA2KvC,CAAA"}
package/dist/zero/mutators/draftMutators/draftMutators.js CHANGED
@@ -2,6 +2,13 @@ import { MutationError } from '../../../types';
2
2
  import { stringPatch } from '../../../utils';
3
3
  export const createDraftMutators = (authData, callbacks) => ({
4
4
  cancelSend: async (tx, args) => {
5
+ const draft = await tx.query.draft.where('id', args.id).one().run();
6
+ if (!draft) {
7
+ throw new Error(MutationError.ENTITY_NOT_FOUND);
8
+ }
9
+ if (draft.status === 'SEND_CONFIRMED') {
10
+ throw new Error(MutationError.ALREADY_APPLIED);
11
+ }
5
12
  await tx.mutate.draft.update({
6
13
  id: args.id,
7
14
  scheduledFor: null,
package/dist/zero/mutators/draftMutators/draftMutators.test.js CHANGED
@@ -77,6 +77,13 @@ describe('draftMutators', () => {
77
77
  });
78
78
  describe('cancelSend', () => {
79
79
  it('cancels draft send', async () => {
80
+ const draftRecord = {
81
+ id: 'test-draft-id-1',
82
+ status: 'SEND_REQUESTED',
83
+ };
84
+ const run = mock(async () => draftRecord);
85
+ const one = mock(() => ({ run }));
86
+ const where = mock(() => ({ one }));
80
87
  const draftUpdate = mock(async () => { });
81
88
  const transaction = {
82
89
  mutate: {
@@ -86,7 +93,11 @@ describe('draftMutators', () => {
86
93
  update: draftUpdate,
87
94
  },
88
95
  },
89
- query: {},
96
+ query: {
97
+ draft: {
98
+ where,
99
+ },
100
+ },
90
101
  };
91
102
  const mutators = createMutators();
92
103
  await mutators.draft.cancelSend(transaction, {
@@ -100,6 +111,62 @@ describe('draftMutators', () => {
100
111
  updatedAt: 5_000,
101
112
  });
102
113
  });
114
+ it('throws error when draft is already sent', async () => {
115
+ const draftRecord = {
116
+ id: 'test-draft-id-1',
117
+ status: 'SEND_CONFIRMED',
118
+ };
119
+ const run = mock(async () => draftRecord);
120
+ const one = mock(() => ({ run }));
121
+ const where = mock(() => ({ one }));
122
+ const draftUpdate = mock(async () => { });
123
+ const transaction = {
124
+ mutate: {
125
+ draft: {
126
+ delete: mock(async () => { }),
127
+ insert: mock(async () => { }),
128
+ update: draftUpdate,
129
+ },
130
+ },
131
+ query: {
132
+ draft: {
133
+ where,
134
+ },
135
+ },
136
+ };
137
+ const mutators = createMutators();
138
+ await expect(mutators.draft.cancelSend(transaction, {
139
+ id: 'test-draft-id-1',
140
+ updatedAt: 5_000,
141
+ })).rejects.toThrow('MutationError/ALREADY_APPLIED');
142
+ expect(draftUpdate).not.toHaveBeenCalled();
143
+ });
144
+ it('throws error when draft not found', async () => {
145
+ const run = mock(async () => null);
146
+ const one = mock(() => ({ run }));
147
+ const where = mock(() => ({ one }));
148
+ const draftUpdate = mock(async () => { });
149
+ const transaction = {
150
+ mutate: {
151
+ draft: {
152
+ delete: mock(async () => { }),
153
+ insert: mock(async () => { }),
154
+ update: draftUpdate,
155
+ },
156
+ },
157
+ query: {
158
+ draft: {
159
+ where,
160
+ },
161
+ },
162
+ };
163
+ const mutators = createMutators();
164
+ await expect(mutators.draft.cancelSend(transaction, {
165
+ id: 'test-draft-id-1',
166
+ updatedAt: 5_000,
167
+ })).rejects.toThrow('MutationError/ENTITY_NOT_FOUND');
168
+ expect(draftUpdate).not.toHaveBeenCalled();
169
+ });
103
170
  });
104
171
  describe('createAttachment', () => {
105
172
  it('creates draft attachment', async () => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@marcoappio/marco-config",
3
- "version": "2.0.478",
3
+ "version": "2.0.480",
4
4
  "author": "team@marcoapp.io",
5
5
  "main": "dist/index.js",
6
6
  "repository": "git@github.com:marcoappio/marco-config.git",