@kaspernj/api-maker 1.0.446 → 1.0.447

package/src/table/column-content.jsx

@@ -1,6 +1,6 @@
 import {digs} from "diggerize"
 import * as inflection from "inflection"
-import modelCallbackArgs from "./model-callback-args.mjs"
+import modelCallbackArgs from "./model-callback-args"
 import MoneyFormatter from "../money-formatter"
 import Text from "../utils/text"
 

package/src/table/filters/filter-form.jsx

@@ -12,7 +12,7 @@ import {ActivityIndicator, View} from "react-native"
 import ReflectionElement from "./reflection-element"
 import ScopeElement from "./scope-element"
 import Select from "../../inputs/select"
-import Services from "../../services.mjs"
+import Services from "../../services"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import Text from "../../utils/text"
 

package/src/table/filters/index.jsx

@@ -6,12 +6,14 @@ import LoadSearchModal from "./load-search-modal"
 import SaveSearchModal from "./save-search-modal"
 import PropTypes from "prop-types"
 import memo from "set-state-compare/src/memo"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {TableSearch} from "../../models.mjs.erb"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
+import {shapeComponent} from "set-state-compare/src/shape-component"
+import models from "../../models"
+import useI18n from "i18n-on-steroids/src/use-i18n"
 import useQueryParams from "on-location-changed/src/use-query-params"
 import {View} from "react-native"
 
+const {TableSearch} = models
+
 export default memo(shapeComponent(class ApiMakerTableFilters extends BaseComponent {
   static propTypes = {
     currentUser: PropTypes.object,

package/src/table/filters/load-search-modal.jsx

@@ -1,14 +1,16 @@
-import apiMakerConfig from "@kaspernj/api-maker/src/config.mjs"
+import apiMakerConfig from "@kaspernj/api-maker/build/config"
 import BaseComponent from "../../base-component"
 import classNames from "classnames"
 import {digg} from "diggerize"
 import memo from "set-state-compare/src/memo"
 import {useMemo} from "react"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {TableSearch} from "../../models.mjs.erb"
+import {shapeComponent} from "set-state-compare/src/shape-component"
+import models from "../../models"
 import {Pressable, View} from "react-native"
 import Text from "../../utils/text"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
+import useI18n from "i18n-on-steroids/src/use-i18n"
+
+const {TableSearch} = models
 
 const SearchLink = memo(shapeComponent(class SearchLink extends BaseComponent {
   render() {

package/src/table/filters/save-search-modal.jsx

@@ -1,13 +1,13 @@
-import apiMakerConfig from "@kaspernj/api-maker/src/config.mjs"
+import apiMakerConfig from "@kaspernj/api-maker/build/config"
 import BaseComponent from "../../base-component"
 import Checkbox from "../../bootstrap/checkbox"
 import {digg} from "diggerize"
 import {Form} from "../../form"
 import Input from "../../bootstrap/input"
-import modelClassRequire from "../../model-class-require.mjs"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import modelClassRequire from "../../model-class-require"
+import {shapeComponent} from "set-state-compare/src/shape-component"
 import memo from "set-state-compare/src/memo"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
+import useI18n from "i18n-on-steroids/src/use-i18n"
 
 const TableSearch = modelClassRequire("TableSearch")
 

package/src/table/header-select.jsx

@@ -8,7 +8,7 @@ import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import Text from "../utils/text"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
+import useI18n from "i18n-on-steroids/src/use-i18n"
 import useSorting from "./use-sorting"
 
 export default memo(shapeComponent(class ApiMakerTableHeaderSelect extends BaseComponent {

package/src/table/model-column.jsx

@@ -3,7 +3,7 @@ import BaseComponent from "../base-component"
 import classNames from "classnames"
 import Column from "./components/column"
 import ColumnContent from "./column-content"
-import columnIdentifier from "./column-identifier.mjs"
+import columnIdentifier from "./column-identifier"
 import EventEmitter from "events"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"

package/src/table/model-row.jsx

@@ -1,11 +1,11 @@
 import {Pressable} from "react-native"
 import BaseComponent from "../base-component"
 import Column from "./components/column"
-import columnIdentifier from "./column-identifier.mjs"
+import columnIdentifier from "./column-identifier"
 import EventEmitter from "events"
 import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
 import * as inflection from "inflection"
-import modelCallbackArgs from "./model-callback-args.mjs"
+import modelCallbackArgs from "./model-callback-args"
 import Link from "../link"
 import ModelColumn from "./model-column"
 import PropTypes from "prop-types"

package/src/table/{select-calculator.mjs → select-calculator.js}

@@ -1,6 +1,6 @@
 import {digg, digs} from "diggerize"
 import * as inflection from "inflection"
-import modelClassRequire from "../model-class-require.mjs"
+import modelClassRequire from "../model-class-require"
 
 class SelectCalculator {
   constructor({table}) {

package/src/table/settings/column-row.jsx

@@ -1,10 +1,10 @@
 import BaseComponent from "../../base-component"
-import columnIdentifier from "../column-identifier.mjs"
+import columnIdentifier from "../column-identifier"
 import memo from "set-state-compare/src/memo"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {useEffect, useRef} from "react"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent} from "set-state-compare/src/shape-component"
 import Text from "../../utils/text"
 import {View} from "react-native"
 

package/src/table/settings/download-action.jsx

@@ -1,14 +1,14 @@
 import BaseComponent from "../../base-component"
 import ColumnContent from "../column-content"
-import columnIdentifier from "../column-identifier.mjs"
-import columnVisible from "../column-visible.mjs"
+import columnIdentifier from "../column-identifier"
+import columnVisible from "../column-visible"
 import {saveAs} from "file-saver"
 import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
 import memo from "set-state-compare/src/memo"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {renderToString} from "react-dom/server"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent} from "set-state-compare/src/shape-component"
 import {Pressable} from "react-native"
 import Text from "../../utils/text"
 

package/src/table/settings/index.jsx

@@ -1,5 +1,5 @@
 import BaseComponent from "../../base-component"
-import columnIdentifier from "../column-identifier.mjs"
+import columnIdentifier from "../column-identifier"
 import ColumnRow from "./column-row"
 import DownloadAction from "./download-action"
 import {useRef} from "react"
@@ -7,10 +7,10 @@ import memo from "set-state-compare/src/memo"
 import Modal from "../../modal"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent} from "set-state-compare/src/shape-component"
 import {View} from "react-native"
 import Text from "../../utils/text"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
+import useI18n from "i18n-on-steroids/src/use-i18n"
 
 export default memo(shapeComponent(class ApiMakerTableSettings extends BaseComponent {
   static propTypes = propTypesExact({

package/src/table/table-settings.js

@@ -1,14 +1,15 @@
-import columnIdentifier from "./column-identifier.mjs"
-import columnVisible from "./column-visible.mjs"
+import columnIdentifier from "./column-identifier"
+import columnVisible from "./column-visible"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
-import Logger from "../logger.mjs"
+import Logger from "../logger"
 import {ReadersWriterLock} from "epic-locks"
 import {serialize as objectToFormData} from "object-to-formdata"
-import {TableSetting} from "../models.mjs.erb"
+import models from "../models"
 import {v4 as uuidv4} from "uuid"
 
 const logger = new Logger({name: "ApiMaker / TableSettings"})
+const {TableSetting} = models
 
 // Have a lock for each unique table identifier
 const tableSettingsLocks = {}

package/src/table/table.jsx

@@ -5,9 +5,9 @@ import BaseComponent from "../base-component"
 import Card from "../bootstrap/card"
 import classNames from "classnames"
 import Collection from "../collection"
-import columnVisible from "./column-visible.mjs"
+import columnVisible from "./column-visible"
 import debounce from "debounce"
-import DraggableSort from "../draggable-sort/index.jsx"
+import DraggableSort from "../draggable-sort/index"
 import EventEmitter from "events"
 import Filters from "./filters"
 import FlatList from "./components/flat-list"
@@ -18,7 +18,7 @@ import HeaderColumn from "./header-column"
 import HeaderSelect from "./header-select"
 import * as inflection from "inflection"
 import memo from "set-state-compare/src/memo"
-import modelClassRequire from "../model-class-require.mjs"
+import modelClassRequire from "../model-class-require"
 import ModelRow from "./model-row"
 import Paginate from "../bootstrap/paginate"
 import Params from "../params"
@@ -26,17 +26,17 @@ import PropTypes from "prop-types"
 import Row from "./components/row"
 import selectCalculator from "./select-calculator"
 import Select from "../inputs/select"
-import Settings from "./settings"
+import Settings from "./settings/index"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import TableSettings from "./table-settings"
 import Text from "../utils/text"
 import uniqunize from "uniqunize"
 import useBreakpoint from "../use-breakpoint"
 import useCollection from "../use-collection"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
-import useEventEmitter from "../use-event-emitter.mjs"
-import useModelEvent from "../use-model-event.js"
-import useQueryParams from "on-location-changed/src/use-query-params.js"
+import useI18n from "i18n-on-steroids/src/use-i18n"
+import useEventEmitter from "../use-event-emitter"
+import useModelEvent from "../use-model-event"
+import useQueryParams from "on-location-changed/src/use-query-params"
 import Widths from "./widths"
 
 const paginationOptions = [30, 60, 90, ["All", "all"]]

package/src/table/{use-sorting.mjs → use-sorting.js}

@@ -1,5 +1,5 @@
 import {camelize} from "inflection"
-import useQueryParams from "on-location-changed/src/use-query-params.js"
+import useQueryParams from "on-location-changed/src/use-query-params"
 
 const calculateQParams = (defaultParams, queryParams, searchKey) => {
   if (searchKey in queryParams) {

package/src/table/worker-plugins-check-all-checkbox.jsx

@@ -1,13 +1,13 @@
 import {useEffect, useMemo, useRef} from "react"
 import BaseComponent from "../base-component"
 import classNames from "classnames"
-import Collection from "../collection.mjs"
+import Collection from "../collection"
 import memo from "set-state-compare/src/memo"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import {simpleObjectDifferent} from "set-state-compare/src/diff-utils"
-import useModelEvent from "../use-model-event.js"
+import useModelEvent from "../use-model-event"
 
 const Checkbox = memo(shapeComponent(class Checkbox extends BaseComponent {
   render() {

package/src/table/worker-plugins-checkbox.jsx

@@ -2,12 +2,12 @@ import BaseComponent from "../base-component"
 import classNames from "classnames"
 import {digg} from "diggerize"
 import memo from "set-state-compare/src/memo"
-import modelClassRequire from "../model-class-require.mjs"
+import modelClassRequire from "../model-class-require"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import {useMemo} from "react"
 import {shapeComponent} from "set-state-compare/src/shape-component"
-import useModelEvent from "../use-model-event.js"
+import useModelEvent from "../use-model-event"
 
 const Workplace = modelClassRequire("Workplace")
 

package/src/{translated-collections.mjs → translated-collections.js}

@@ -1,5 +1,5 @@
 import {digg} from "diggerize"
-import translatedCollectionsData from "./translated-collections-data.mjs.erb"
+import translatedCollectionsData from "../src/translated-collections-data.js.erb"
 
 export default class ApiMakerTranslatedCollections {
   static get (modelClass, collectionName) {

package/src/updated-attribute.jsx

@@ -1,5 +1,5 @@
 import {digg} from "diggerize"
-import ModelEvents from "./model-events.mjs"
+import ModelEvents from "./model-events"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import React from "react"

package/src/{use-breakpoint.mjs → use-breakpoint.js}

@@ -1,7 +1,7 @@
 import {useCallback, useLayoutEffect} from "react"
-import apiMakerConfig from "@kaspernj/api-maker/src/config.mjs"
+import apiMakerConfig from "@kaspernj/api-maker/build/config"
 import {Dimensions} from "react-native"
-import useShape from "set-state-compare/src/use-shape.js"
+import useShape from "set-state-compare/src/use-shape"
 
 const calculateBreakPoint = (window) => {
   const windowWidth = window.width

package/src/use-can-can.js

@@ -0,0 +1,55 @@
+import CanCan from "./can-can"
+import {useCallback, useMemo, useState} from "react"
+import useCurrentUser from "./use-current-user"
+import useEventEmitter from "./use-event-emitter"
+import useShape from "set-state-compare/src/use-shape"
+
+const useCanCan = (abilitiesCallback, dependencies) => {
+  const currentUser = useCurrentUser()
+  const s = useShape({abilitiesCallback})
+
+  s.useStates({
+    canCan: null,
+    lastUpdate: new Date()
+  })
+
+  if (!dependencies) {
+    dependencies = [currentUser?.id()]
+  }
+
+  const loadAbilities = useCallback(async () => {
+    const canCan = CanCan.current()
+    const abilities = s.p.abilitiesCallback()
+
+    await canCan.loadAbilities(abilities)
+
+    s.set({canCan, lastUpdate: new Date()})
+  }, [])
+
+  const onResetAbilities = useCallback(async () => {
+    s.set({canCan: null}, {silent: true})
+    await loadAbilities()
+  }, [])
+
+  const loadAbilitiesOnNew = useCallback(async () => {
+    const canCan = s.s.canCan
+
+    s.set({canCan: null}, {silent: true})
+
+    if (canCan) {
+      await canCan?.resetAbilities()
+    } else {
+      await loadAbilities()
+    }
+  }, [])
+
+  useMemo(() => {
+    loadAbilitiesOnNew()
+  }, dependencies)
+
+  useEventEmitter(CanCan.current().events, "onResetAbilities", onResetAbilities)
+
+  return s.s.canCan
+}
+
+export default useCanCan

package/src/{use-collection.mjs → use-collection.js}

@@ -1,11 +1,11 @@
 import debounce from "debounce"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
-import ModelEvents from "./model-events.mjs"
+import ModelEvents from "./model-events"
 import {useCallback, useLayoutEffect, useMemo} from "react"
-import useCreatedEvent from "./use-created-event.mjs"
-import useShape from "set-state-compare/src/use-shape.js"
-import useQueryParams from "on-location-changed/src/use-query-params.js"
+import useCreatedEvent from "./use-created-event"
+import useShape from "set-state-compare/src/use-shape"
+import useQueryParams from "on-location-changed/src/use-query-params"
 
 const useCollection = (props, cacheKeys = []) => {
   const {

package/src/{use-created-event.mjs → use-created-event.js}

@@ -1,9 +1,9 @@
 import debounceFunction from "debounce"
-import ModelEvents from "./model-events.mjs"
+import ModelEvents from "./model-events"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {useCallback, useLayoutEffect} from "react"
-import useShape from "set-state-compare/src/use-shape.js"
+import useShape from "set-state-compare/src/use-shape"
 
 const ApiMakerUseCreatedEvent = (modelClass, onCreated, args = {}) => {
   const {active = true, debounce} = args

package/src/{use-current-user.mjs → use-current-user.js}

@@ -1,10 +1,11 @@
 import {useCallback, useMemo} from "react"
 import {camelize} from "inflection"
-import Devise from "./devise.mjs"
-import Logger from "./logger.mjs"
-import Services from "./services.mjs"
-import useEventEmitter from "./use-event-emitter.mjs"
-import useShape from "set-state-compare/src/use-shape.js"
+import Devise from "./devise"
+import {digg} from "diggerize"
+import Logger from "./logger"
+import Services from "./services"
+import useEventEmitter from "./use-event-emitter"
+import useShape from "set-state-compare/src/use-shape"
 
 const logger = new Logger({name: "ApiMaker / useCurrentUser"})
 

package/src/{use-destroyed-event.mjs → use-destroyed-event.js}

@@ -1,7 +1,7 @@
 import {useCallback, useLayoutEffect, useMemo} from "react"
 import debounceFunction from "debounce"
-import ModelEvents from "./model-events.mjs"
-import useShape from "set-state-compare/src/use-shape.js"
+import ModelEvents from "./model-events"
+import useShape from "set-state-compare/src/use-shape"
 
 const apiMakerUseDestroyedEvent = (model, onDestroyed, props) => {
   const {active = true, debounce, onConnected, ...restProps} = props || {}

package/src/{use-input.mjs → use-input.js}

@@ -1,10 +1,10 @@
 import {dig, digg} from "diggerize"
 import {useCallback, useEffect, useMemo} from "react"
-import idForComponent from "./inputs/id-for-component.mjs"
-import nameForComponent from "./inputs/name-for-component.mjs"
+import idForComponent from "./inputs/id-for-component"
+import nameForComponent from "./inputs/name-for-component"
 import strftime from "strftime"
-import useShape from "set-state-compare/src/use-shape.js"
-import useValidationErrors from "./use-validation-errors.mjs"
+import useShape from "set-state-compare/src/use-shape"
+import useValidationErrors from "./use-validation-errors"
 
 const useInput = ({props, wrapperOptions, ...useInputRestProps}) => {
   const useInputRestPropsKeys = Object.keys(useInputRestProps)
@@ -47,7 +47,7 @@ const useInput = ({props, wrapperOptions, ...useInputRestProps}) => {
   const inputDefaultChecked = useCallback(() => {
     if ("defaultChecked" in s.props) {
       return s.props.defaultChecked
-    } else if (s.props.model) {
+    } else if (s.props.attribute && s.props.model) {
       if (!s.props.model[s.props.attribute])
         throw new Error(`No such attribute: ${s.props.attribute}`)
 

package/src/use-model-event.js

@@ -1,7 +1,7 @@
 import {useCallback, useLayoutEffect, useMemo} from "react"
 import debounceFunction from "debounce"
-import ModelEvents from "./model-events.mjs"
-import useShape from "set-state-compare/src/use-shape.js"
+import ModelEvents from "./model-events"
+import useShape from "set-state-compare/src/use-shape"
 
 const apiMakerUseModelEvent = (model, event, onCallback, props) => {
   const {active = true, debounce, onConnected, ...restProps} = props || {}

package/src/{use-model.mjs → use-model.js}

@@ -1,9 +1,9 @@
 import {useCallback, useLayoutEffect, useMemo} from "react"
-import Devise from "./devise.mjs"
+import Devise from "./devise"
 import * as inflection from "inflection"
-import ModelEvents from "./model-events.mjs"
-import useQueryParams from "on-location-changed/src/use-query-params.js"
-import useShape from "set-state-compare/src/use-shape.js"
+import ModelEvents from "./model-events"
+import useQueryParams from "on-location-changed/src/use-query-params"
+import useShape from "set-state-compare/src/use-shape"
 
 const useModel = (modelClassArg, argsArg = {}) => {
   const queryParams = useQueryParams()

package/src/{use-resize-observer.mjs → use-resize-observer.js}

@@ -1,5 +1,5 @@
 import {useCallback, useLayoutEffect, useMemo} from "react"
-import useShape from "set-state-compare/src/use-shape.js"
+import useShape from "set-state-compare/src/use-shape"
 
 const useResizeObserver = (element, callback) => {
   const s = useShape({callback})

package/src/use-router.jsx

@@ -1,9 +1,9 @@
-import config from "./config.mjs"
+import config from "./config"
 import escapeStringRegexp from "escape-string-regexp"
 import * as inflection from "inflection"
 import PropTypes from "prop-types"
 import {useCallback, useMemo} from "react"
-import useShape from "set-state-compare/src/use-shape.js"
+import useShape from "set-state-compare/src/use-shape"
 
 const useRouter = (props) => {
   const s = useShape(props)

package/src/{use-updated-event.mjs → use-updated-event.js}

@@ -1,7 +1,7 @@
 import {useCallback, useLayoutEffect, useMemo} from "react"
 import debounceFunction from "debounce"
-import ModelEvents from "./model-events.mjs"
-import useShape from "set-state-compare/src/use-shape.js"
+import ModelEvents from "./model-events"
+import useShape from "set-state-compare/src/use-shape"
 
 const apiMakerUseUpdatedEvent = (model, onUpdated, props = {}) => {
   const {active = true, debounce, onConnected, ...restProps} = props

package/src/{use-validation-errors.mjs → use-validation-errors.js}

@@ -1,7 +1,7 @@
-import events from "./events.mjs"
+import events from "./events"
 import {useCallback} from "react"
-import useEventEmitter from "./use-event-emitter.mjs"
-import useShape from "set-state-compare/src/use-shape.js"
+import useEventEmitter from "./use-event-emitter"
+import useShape from "set-state-compare/src/use-shape"
 
 const useValidationErrors = (callback) => {
   const s = useShape({callback})

package/src/utils/checkbox.jsx

@@ -3,8 +3,8 @@ import {CheckBox, Pressable, View} from "react-native"
 import memo from "set-state-compare/src/memo"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import Text from "../utils/text"
+import {shapeComponent} from "set-state-compare/src/shape-component"
+import Text from "./text"
 
 export default memo(shapeComponent(class ApiMakerUtilsCheckbox extends BaseComponent {
   static defaultProps = {

package/src/{validation-error.mjs → validation-error.js}

@@ -1,4 +1,4 @@
-import BaseError from "./base-error.mjs"
+import BaseError from "./base-error"
 import * as inflection from "inflection"
 
 class ValidationError extends BaseError {

package/src/{validation-errors.mjs → validation-errors.js}

@@ -1,6 +1,6 @@
 import {digg, digs} from "diggerize"
 import * as inflection from "inflection"
-import modelClassRequire from "./model-class-require.mjs"
+import modelClassRequire from "./model-class-require"
 
 class ValidationError {
   constructor(args) {

package/src/with-current-user.jsx

@@ -1,4 +1,4 @@
-import useCurrentUser from "./use-current-user.mjs"
+import useCurrentUser from "./use-current-user"
 
 export default (WrappedComponent) => (props) => {
   const currentUser = useCurrentUser()

package/src/with-model.jsx

@@ -1,5 +1,5 @@
 import memo from "set-state-compare/src/memo"
-import useModel from "./use-model.mjs"
+import useModel from "./use-model"
 
 export default (WrappedComponent, modelClass, givenArgs) => {
   const ApiMakerWithModel = (props) => {