jason-rails 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62faa4e4f1246fa42810c324eec1f8fe96b8026ccdbe12f5b8bd7bc2df3bd4a
-  data.tar.gz: e4f829ce397c7192c173ba6e712a4b5873bd065d687cebf5ad72025f0436f51a
+  metadata.gz: 2788ecafe67bc475346d83681912063b1081610e06b685405d4f3b332a665695
+  data.tar.gz: 6647cc3a7815a914b98a9477330c32a642fec64c809aa4195fa5c192a4b4b003
 SHA512:
-  metadata.gz: 6e3abfbfd6e0fbbe6c40dc7c0540448091cd440aaeec3580951a6148d6f1f92e61d5808b39ca02e8c564e1aa57beaf1de4d4cddb34e27b96ace09ca61d856d9a
-  data.tar.gz: b58a34f35981aea9b991f036cb83f9e059fa17a5932d9e9df78b6e86b5532484fe0dc115531365d5044d2f7df42355b5481a353233dcbd6744077b8fcbd58f18
+  metadata.gz: cf1b1ed464f9ef46cd5b3aa2dd7e8ebb982a3d6d3ebe68a3f92f2ad8b5ab31ea8476817fd16666346d358e9d5a635b4af792bba16e41105eefb7a789082567f1
+  data.tar.gz: a06afb2c5db05447d7eda5a6f17020a14fd1d486b50f17e14c155738e7166534a52c418f5463742c0956102d744429198ee0101569cef156366586eee3e7c058

data/client/lib/createJasonReducers.js

@@ -42,18 +42,17 @@ function generateJasonSlices(models) {
             setSubscriptionIds(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, ids } = payload;
-                console.log({ initialState });
-                s[model][subscriptionId] = ids;
+                s[model][subscriptionId] = ids.map(id => String(id));
             },
             addSubscriptionId(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, id } = payload;
-                s[model][subscriptionId] = lodash_1.default.union(s[model][subscriptionId] || [], [id]);
+                s[model][subscriptionId] = lodash_1.default.union(s[model][subscriptionId] || [], [String(id)]);
             },
             removeSubscriptionId(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, id } = payload;
-                s[model][subscriptionId] = lodash_1.default.remove(s[model][subscriptionId] || [], id);
+                s[model][subscriptionId] = lodash_1.default.difference(s[model][subscriptionId] || [], [String(id)]);
             },
             removeSubscription(s, a) {
                 const { payload: { subscriptionId } } = a;

data/client/lib/createPayloadHandler.js

@@ -36,7 +36,7 @@ function createPayloadHandler({ dispatch, serverActionQueue, transportAdapter, c
             }
             const { payload, destroy, id, type } = patchQueue[model][idx[model]];
             if (type === 'payload') {
-                dispatch({ type: `${pluralize_1.default(model)}/upsertMany`, payload });
+                dispatch({ type: `${pluralize_1.default(model)}/upsertMany`, payload: payload.map(m => (Object.assign(Object.assign({}, m), { id: String(m.id) }))) });
                 const ids = payload.map(instance => instance.id);
                 dispatch({ type: `jasonModels/setSubscriptionIds`, payload: { model, subscriptionId, ids } });
             }
@@ -45,7 +45,7 @@ function createPayloadHandler({ dispatch, serverActionQueue, transportAdapter, c
                 dispatch({ type: `jasonModels/removeSubscriptionId`, payload: { model, subscriptionId, id } });
             }
             else {
-                dispatch({ type: `${pluralize_1.default(model)}/upsert`, payload });
+                dispatch({ type: `${pluralize_1.default(model)}/upsert`, payload: Object.assign(Object.assign({}, payload), { id: String(payload.id) }) });
                 dispatch({ type: `jasonModels/addSubscriptionId`, payload: { model, subscriptionId, id } });
             }
             delete patchQueue[model][idx[model]];

data/client/lib/pruneIdsMiddleware.js

@@ -9,7 +9,7 @@ const pruneIdsMiddleware = schema => store => next => action => {
     const { type, payload } = action;
     const result = next(action);
     const state = store.getState();
-    if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionIds') {
+    if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionId') {
         const { model, ids } = payload;
         let idsInSubs = [];
         lodash_1.default.map(state.jasonModels[model], (subscribedIds, k) => {

data/client/lib/useJason.test.js

@@ -81,5 +81,37 @@ test('pruning IDs', () => __awaiter(void 0, void 0, void 0, function* () {
         idx: 2
     });
     // The ID 4 should have been pruned
-    expect(store.getState().posts.ids).toStrictEqual([5]);
+    expect(store.getState().posts.ids).toStrictEqual(['5']);
+}));
+test('pruning IDs by destroy', () => __awaiter(void 0, void 0, void 0, function* () {
+    const resp = { data: {
+            schema: { post: {} },
+            transportService: 'action_cable'
+        } };
+    // @ts-ignore
+    restClient_1.default.get.mockResolvedValue(resp);
+    const { result, waitForNextUpdate } = react_hooks_1.renderHook(() => useJason_1.default({ reducers: {
+            test: (s, a) => s || {}
+        } }));
+    yield waitForNextUpdate();
+    const [store, value, connected] = result.current;
+    const { handlePayload, subscribe } = value;
+    const subscription = subscribe({ post: {} });
+    handlePayload({
+        type: 'payload',
+        model: 'post',
+        payload: [{ id: 4, name: 'test' }, { id: 5, name: 'test it out' }],
+        md5Hash: subscription.md5Hash,
+        idx: 1
+    });
+    expect(store.getState().posts.ids).toStrictEqual(['4', '5']);
+    handlePayload({
+        destroy: true,
+        model: 'post',
+        id: 5,
+        md5Hash: subscription.md5Hash,
+        idx: 2
+    });
+    // The ID 4 should have been pruned
+    expect(store.getState().posts.ids).toStrictEqual(['4']);
 }));

data/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamesr2323/jason",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {

data/client/src/createJasonReducers.ts

@@ -42,18 +42,17 @@ function generateJasonSlices(models) {
       setSubscriptionIds(s,a) {
         const { payload } = a
         const { subscriptionId, model, ids } = payload
-        console.log({ initialState })
-        s[model][subscriptionId] = ids
+        s[model][subscriptionId] = ids.map(id => String(id))
       },
       addSubscriptionId(s,a) {
         const { payload } = a
         const { subscriptionId, model, id } = payload
-        s[model][subscriptionId] = _.union(s[model][subscriptionId] || [], [id])
+        s[model][subscriptionId] = _.union(s[model][subscriptionId] || [], [String(id)])
       },
       removeSubscriptionId(s,a) {
         const { payload } = a
         const { subscriptionId, model, id } = payload
-        s[model][subscriptionId] = _.remove(s[model][subscriptionId] || [], id)
+        s[model][subscriptionId] = _.difference(s[model][subscriptionId] || [], [String(id)])
       },
       removeSubscription(s, a) {
         const { payload: { subscriptionId } } = a

data/client/src/createPayloadHandler.ts

@@ -42,14 +42,14 @@ export default function createPayloadHandler({ dispatch, serverActionQueue, tran
       const { payload, destroy, id, type } = patchQueue[model][idx[model]]
 
       if (type === 'payload') {
-        dispatch({ type: `${pluralize(model)}/upsertMany`, payload })
+        dispatch({ type: `${pluralize(model)}/upsertMany`, payload: payload.map(m => ({ ...m, id: String(m.id) })) })
         const ids = payload.map(instance => instance.id)
         dispatch({ type: `jasonModels/setSubscriptionIds`, payload: { model, subscriptionId, ids }})
       } else if (destroy) {
         // Middleware will determine if this model should be removed if it isn't in any other subscriptions
         dispatch({ type: `jasonModels/removeSubscriptionId`, payload: { model, subscriptionId, id }})
       } else {
-        dispatch({ type: `${pluralize(model)}/upsert`, payload })
+        dispatch({ type: `${pluralize(model)}/upsert`, payload: { ...payload, id: String(payload.id) } })
         dispatch({ type: `jasonModels/addSubscriptionId`, payload: { model, subscriptionId, id }})
       }
 

data/client/src/pruneIdsMiddleware.ts

@@ -6,13 +6,14 @@ const pruneIdsMiddleware = schema => store => next => action => {
   const result = next(action)
 
   const state = store.getState()
-  if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionIds') {
+  if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionId') {
     const { model, ids } = payload
 
     let idsInSubs = []
     _.map(state.jasonModels[model], (subscribedIds, k) => {
       idsInSubs = _.union(idsInSubs, subscribedIds)
     })
+
     // Find IDs currently in Redux that aren't in any subscription
     const idsToRemove = _.difference(state[pluralize(model)].ids, idsInSubs)
     store.dispatch({ type: `${pluralize(model)}/removeMany`, payload: idsToRemove })

data/client/src/useJason.test.ts

@@ -83,5 +83,45 @@ test('pruning IDs', async () => {
   })
 
   // The ID 4 should have been pruned
-  expect(store.getState().posts.ids).toStrictEqual([5])
+  expect(store.getState().posts.ids).toStrictEqual(['5'])
+})
+
+test('pruning IDs by destroy', async () => {
+  const resp = { data: {
+    schema: { post: {} },
+    transportService: 'action_cable'
+  } };
+
+  // @ts-ignore
+  restClient.get.mockResolvedValue(resp);
+
+  const { result, waitForNextUpdate } = renderHook(() => useJason({ reducers: {
+    test: (s,a) => s || {}
+  }}));
+
+  await waitForNextUpdate()
+  const [store, value, connected] = result.current
+  const { handlePayload, subscribe } = value
+
+  const subscription = subscribe({ post: {} })
+
+  handlePayload({
+    type: 'payload',
+    model: 'post',
+    payload: [{ id: 4, name: 'test' }, { id: 5, name: 'test it out' }],
+    md5Hash: subscription.md5Hash,
+    idx: 1
+  })
+  expect(store.getState().posts.ids).toStrictEqual(['4', '5'])
+
+  handlePayload({
+    destroy: true,
+    model: 'post',
+    id: 5,
+    md5Hash: subscription.md5Hash,
+    idx: 2
+  })
+
+  // The ID 4 should have been pruned
+  expect(store.getState().posts.ids).toStrictEqual(['4'])
 })

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - James Rees