jason-rails 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0d37099f467ff5bd4ab868732ce57c53bf055e6ecb8d0f0506bb14ee723d77
-  data.tar.gz: 6912d141317dbc95edb96bc11ed29235a90fc6dd8575a4dcba18017b81a9964f
+  metadata.gz: e7f9c248374aaa06055ef47cfaed1c131b9341bee90708d215986e551ac4d9cc
+  data.tar.gz: 6e414392f9658ddcfe77b299c2edcd352977652d07f046d8d707d6d9b3b37d8b
 SHA512:
-  metadata.gz: 3cce0310a94bba9c73237d3d18bcd7aa949fb35905b7dd76c69c05b6d8259f1fc6d0b79da2a01b3db34b372cf438ea96777c14d2bd3bdbfacf9ba27578e81f19
-  data.tar.gz: f2460fea5f459d24966741cce29855b97b9361a900a848e8655ccdfb4cbaa03aa4d47135b2fa661961f7c8d46d37f5e9bc821ff97a6f5cdd22265f7a8d755758
+  metadata.gz: 34c5b26b7b909e8f4a24ce47b5c74ca584f9aca49d379c70972bdea1899c74a333acce67c4afdb21b86ef7c9ee31fb5cadfe4cbc91528380c37f5482d6f4ec1c
+  data.tar.gz: d6c760e610ddac664d3a95a60fce8c535b6485e745d3f58701bf67489f8a50f8b05d487af555e1ea392c8efaacaed8d8ca0f3fae36607d0bc90df129860398f9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.7.2
+- Add JasonContext to exports, for use in scenarios where you need to forward the context into some other React reconciler (e.g. `react-three-fiber`)
+- Fixed: Unneeded `reload` in Publisher resulting in extra database calls
+
 ## v0.7.1
 - Added: Authorization for REST endpoints. Previously these just inherited logic from ApplicationController. Pass a `update_authorization_service` option to the Jason initializer to use this.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.7.0)
+    jason-rails (0.7.1)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)
@@ -89,9 +89,10 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    mimemagic (0.3.8)
+    mimemagic (0.3.10)
       nokogiri (~> 1)
-    mini_mime (1.0.2)
+      rake
+    mini_mime (1.1.0)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
     nio4r (2.5.7)

data/client/lib/JasonProvider.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-declare const JasonProvider: ({ reducers, middleware, extraActions, children }: {
+declare const JasonProvider: ({ reducers, middleware, enhancers, extraActions, children }: {
     reducers?: any;
     middleware?: any;
+    enhancers?: any;
     extraActions?: any;
     children?: React.FC<{}> | undefined;
 }) => JSX.Element;

data/client/lib/JasonProvider.js

@@ -7,8 +7,8 @@ const react_1 = __importDefault(require("react"));
 const useJason_1 = __importDefault(require("./useJason"));
 const react_redux_1 = require("react-redux");
 const JasonContext_1 = __importDefault(require("./JasonContext"));
-const JasonProvider = ({ reducers, middleware, extraActions, children }) => {
-    const [store, value] = useJason_1.default({ reducers, middleware, extraActions });
+const JasonProvider = ({ reducers, middleware, enhancers, extraActions, children }) => {
+    const [store, value] = useJason_1.default({ reducers, middleware, enhancers, extraActions });
     if (!(store && value))
         return react_1.default.createElement("div", null); // Wait for async fetch of schema to complete
     return react_1.default.createElement(react_redux_1.Provider, { store: store },

data/client/lib/index.d.ts

@@ -2,9 +2,15 @@
 import _useAct from './useAct';
 import _useSub from './useSub';
 import _useEager from './useEager';
-export declare const JasonProvider: ({ reducers, middleware, extraActions, children }: {
+export declare const JasonContext: import("react").Context<{
+    actions: any;
+    subscribe: null;
+    eager: (entity: any, id: any, relations: any) => void;
+}>;
+export declare const JasonProvider: ({ reducers, middleware, enhancers, extraActions, children }: {
     reducers?: any;
     middleware?: any;
+    enhancers?: any;
     extraActions?: any;
     children?: import("react").FC<{}> | undefined;
 }) => JSX.Element;

data/client/lib/index.js

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useEager = exports.useSub = exports.useAct = exports.JasonProvider = void 0;
+exports.useEager = exports.useSub = exports.useAct = exports.JasonProvider = exports.JasonContext = void 0;
+const JasonContext_1 = __importDefault(require("./JasonContext"));
 const JasonProvider_1 = __importDefault(require("./JasonProvider"));
 const useAct_1 = __importDefault(require("./useAct"));
 const useSub_1 = __importDefault(require("./useSub"));
 const useEager_1 = __importDefault(require("./useEager"));
+exports.JasonContext = JasonContext_1.default;
 exports.JasonProvider = JasonProvider_1.default;
 exports.useAct = useAct_1.default;
 exports.useSub = useSub_1.default;

data/client/lib/useJason.d.ts

@@ -1,5 +1,6 @@
-export default function useJason({ reducers, middleware, extraActions }: {
+export default function useJason({ reducers, middleware, enhancers, extraActions }: {
     reducers?: any;
     middleware?: any[];
+    enhancers?: any[];
     extraActions?: any;
 }): any[];

data/client/lib/useJason.js

@@ -16,7 +16,7 @@ const humps_1 = require("humps");
 const blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = require("react");
-function useJason({ reducers, middleware = [], extraActions }) {
+function useJason({ reducers, middleware = [], enhancers = [], extraActions }) {
     const [store, setStore] = react_1.useState(null);
     const [value, setValue] = react_1.useState(null);
     react_1.useEffect(() => {
@@ -28,7 +28,7 @@ function useJason({ reducers, middleware = [], extraActions }) {
             const serverActionQueue = createServerActionQueue_1.default();
             const allReducers = Object.assign(Object.assign({}, reducers), createJasonReducers_1.default(schema));
             console.debug({ allReducers });
-            const store = toolkit_1.configureStore({ reducer: allReducers, middleware: [...middleware, pruneIdsMiddleware_1.default(schema)] });
+            const store = toolkit_1.configureStore({ reducer: allReducers, middleware: [...middleware, pruneIdsMiddleware_1.default(schema)], enhancers });
             const dispatch = store.dispatch;
             const optDis = createOptDis_1.default(schema, dispatch, restClient_1.default, serverActionQueue);
             const actions = createActions_1.default(schema, store, restClient_1.default, optDis, extraActions);

data/client/package.json

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

data/client/src/JasonProvider.tsx

@@ -3,8 +3,8 @@ import useJason from './useJason'
 import { Provider } from 'react-redux'
 import JasonContext from './JasonContext'
 
-const JasonProvider = ({ reducers, middleware, extraActions, children }: { reducers?: any, middleware?: any, extraActions?: any, children?: React.FC }) => {
-  const [store, value] = useJason({ reducers, middleware, extraActions })
+const JasonProvider = ({ reducers, middleware, enhancers, extraActions, children }: { reducers?: any, middleware?: any, enhancers?: any, extraActions?: any, children?: React.FC }) => {
+  const [store, value] = useJason({ reducers, middleware, enhancers, extraActions })
 
   if(!(store && value)) return <div /> // Wait for async fetch of schema to complete
 

data/client/src/index.ts

@@ -1,8 +1,10 @@
+import _JasonContext from './JasonContext'
 import _JasonProvider from './JasonProvider'
 import _useAct from './useAct'
 import _useSub from './useSub'
 import _useEager from './useEager'
 
+export const JasonContext = _JasonContext
 export const JasonProvider = _JasonProvider
 export const useAct = _useAct
 export const useSub = _useSub

data/client/src/useJason.ts

@@ -14,7 +14,7 @@ import md5 from 'blueimp-md5'
 import _ from 'lodash'
 import React, { useState, useEffect } from 'react'
 
-export default function useJason({ reducers, middleware = [], extraActions }: { reducers?: any, middleware?: any[], extraActions?: any }) {
+export default function useJason({ reducers, middleware = [], enhancers = [], extraActions }: { reducers?: any, middleware?: any[], enhancers?: any[], extraActions?: any }) {
   const [store, setStore] = useState(null as any)
   const [value, setValue] = useState(null as any)
 
@@ -35,7 +35,7 @@ export default function useJason({ reducers, middleware = [], extraActions }: {
 
       console.debug({ allReducers })
 
-      const store = configureStore({ reducer: allReducers, middleware: [...middleware, pruneIdsMiddleware(schema)] })
+      const store = configureStore({ reducer: allReducers, middleware: [...middleware, pruneIdsMiddleware(schema)], enhancers })
       const dispatch = store.dispatch
 
       const optDis = createOptDis(schema, dispatch, restClient, serverActionQueue)

data/lib/jason/consistency_checker.rb

@@ -21,6 +21,10 @@ class Jason::ConsistencyChecker
     check_all(fix: true)
   end
 
+  def wipe_all_subs
+
+  end
+
   def initialize(subscription)
     @subscription = subscription
     @inconsistent = false

data/lib/jason/publisher.rb

@@ -16,7 +16,7 @@ module Jason::Publisher
 
     # Exists
     if self.persisted? && (scope.blank? || self.class.unscoped.send(scope).exists?(self.id))
-      payload = self.reload.as_json(as_json_config)
+      payload = self.as_json(as_json_config)
       gidx = Jason::LuaGenerator.new.cache_json(self.class.name.underscore, self.id, payload)
       return [payload, gidx]
     # Has been destroyed
@@ -129,7 +129,7 @@ module Jason::Publisher
 
   class_methods do
     def cache_all
-      all.each(&:cache_json)
+      all.find_each(&:cache_json)
     end
 
     def has_jason?

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails