@kaspernj/api-maker 1.0.445 → 1.0.447

package/ios/ApiMakerModule.swift

@@ -0,0 +1,48 @@
+import ExpoModulesCore
+
+public class ApiMakerModule: Module {
+  // Each module class must implement the definition function. The definition consists of components
+  // that describes the module's functionality and behavior.
+  // See https://docs.expo.dev/modules/module-api for more details about available components.
+  public func definition() -> ModuleDefinition {
+    // Sets the name of the module that JavaScript code will use to refer to the module. Takes a string as an argument.
+    // Can be inferred from module's class name, but it's recommended to set it explicitly for clarity.
+    // The module will be accessible from `requireNativeModule('ApiMaker')` in JavaScript.
+    Name("ApiMaker")
+
+    // Sets constant properties on the module. Can take a dictionary or a closure that returns a dictionary.
+    Constants([
+      "PI": Double.pi
+    ])
+
+    // Defines event names that the module can send to JavaScript.
+    Events("onChange")
+
+    // Defines a JavaScript synchronous function that runs the native code on the JavaScript thread.
+    Function("hello") {
+      return "Hello world! 👋"
+    }
+
+    // Defines a JavaScript function that always returns a Promise and whose native code
+    // is by default dispatched on the different thread than the JavaScript runtime runs on.
+    AsyncFunction("setValueAsync") { (value: String) in
+      // Send an event to JavaScript.
+      self.sendEvent("onChange", [
+        "value": value
+      ])
+    }
+
+    // Enables the module to be used as a native view. Definition components that are accepted as part of the
+    // view definition: Prop, Events.
+    View(ApiMakerView.self) {
+      // Defines a setter for the `url` prop.
+      Prop("url") { (view: ApiMakerView, url: URL) in
+        if view.webView.url != url {
+          view.webView.load(URLRequest(url: url))
+        }
+      }
+
+      Events("onLoad")
+    }
+  }
+}

package/ios/ApiMakerView.swift

@@ -0,0 +1,38 @@
+import ExpoModulesCore
+import WebKit
+
+// This view will be used as a native component. Make sure to inherit from `ExpoView`
+// to apply the proper styling (e.g. border radius and shadows).
+class ApiMakerView: ExpoView {
+  let webView = WKWebView()
+  let onLoad = EventDispatcher()
+  var delegate: WebViewDelegate?
+
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+    clipsToBounds = true
+    delegate = WebViewDelegate { url in
+      self.onLoad(["url": url])
+    }
+    webView.navigationDelegate = delegate
+    addSubview(webView)
+  }
+
+  override func layoutSubviews() {
+    webView.frame = bounds
+  }
+}
+
+class WebViewDelegate: NSObject, WKNavigationDelegate {
+  let onUrlChange: (String) -> Void
+
+  init(onUrlChange: @escaping (String) -> Void) {
+    self.onUrlChange = onUrlChange
+  }
+
+  func webView(_ webView: WKWebView, didFinish navigation: WKNavigation) {
+    if let url = webView.url {
+      onUrlChange(url.absoluteString)
+    }
+  }
+}

package/package.json

@@ -1,24 +1,38 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.445",
-  "type": "module",
-  "description": "",
-  "main": "index.js",
+  "version": "1.0.447",
+  "description": "My new module",
+  "main": "build/index.js",
+  "scripts": {
+    "build": "babel src --out-dir build --extensions \".js,.jsx\" --source-maps inline",
+    "build-expo": "expo-module build",
+    "clean": "expo-module clean",
+    "lint": "expo-module lint",
+    "test": "expo-module test",
+    "prepare": "npm run clean && npm run build",
+    "prepublishOnly": "expo-module prepublishOnly",
+    "expo-module": "expo-module",
+    "open:ios": "xed example/ios",
+    "open:android": "open -a \"Android Studio\" example/android",
+    "eslint": "eslint --ext .js,.jsx",
+    "eslint-find-rules": "eslint-find-rules"
+  },
+  "keywords": [
+    "react-native",
+    "expo",
+    "api-maker",
+    "ApiMaker"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kaspernj/api_maker.git"
   },
-  "author": "kaspernj",
-  "license": "ISC",
   "bugs": {
     "url": "https://github.com/kaspernj/api_maker/issues"
   },
-  "homepage": "https://github.com/kaspernj/api_maker",
-  "scripts": {
-    "eslint": "eslint --ext .mjs,.js,.jsx",
-    "eslint-find-rules": "eslint-find-rules",
-    "test": "node --experimental-vm-modules ./node_modules/.bin/jest"
-  },
+  "author": "kaspernj <kasper@diestoeckels.de> (github.com/kaspernj)",
+  "license": "MIT",
+  "homepage": "https://github.com/kaspernj/api_maker#readme",
   "dependencies": {
     "clone-deep": ">= 4.0.1",
     "debounce": ">= 2.0.0",
@@ -47,14 +61,21 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.3",
     "@babel/preset-env": "^7.12.11",
-    "@babel/preset-react": "^7.12.10",
+    "@babel/preset-react": "^7.26.3",
     "babel-jest": "^29.0.1",
     "eslint": "^8.2.0",
     "eslint-find-rules": "^4.0.0",
     "eslint-plugin-jest": "^28.2.0",
     "eslint-plugin-react": "^7.23.2",
+    "expo": "~52.0.0",
+    "expo-module-scripts": "^4.0.2",
     "i18n-on-steroids": "^1.0.15",
     "jest": "^29.0.1",
-    "jsdom": "^25.0.0"
+    "react-native": "0.76.0"
+  },
+  "peerDependencies": {
+    "expo": "*",
+    "react": "*",
+    "react-native": "*"
   }
 }

package/src/{api.mjs → api.js}

@@ -1,10 +1,10 @@
-import config from "./config.mjs"
-import CustomError from "./custom-error.mjs"
+import config from "./config"
+import CustomError from "./custom-error"
 import FormDataObjectizer from "form-data-objectizer"
-import Logger from "./logger.mjs"
+import Logger from "./logger"
 import qs from "qs"
-import SessionStatusUpdater from "./session-status-updater.mjs"
-import urlEncode from "./url-encode.mjs"
+import SessionStatusUpdater from "./session-status-updater"
+import urlEncode from "./url-encode"
 
 const logger = new Logger({name: "ApiMaker / Api"})
 

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

@@ -1,5 +1,5 @@
 import {dig, digg} from "diggerize"
-import errorMessages from "./error-messages.mjs"
+import errorMessages from "./error-messages"
 
 export default class BaseError extends Error {
   static apiMakerType = "BaseError"

package/src/base-model/{attribute.mjs → attribute.js}

@@ -1,4 +1,4 @@
-import Column from "./column.mjs"
+import Column from "./column"
 import {digg} from "diggerize"
 
 export default class ApiMakerBaseModelAttribute {

package/src/base-model/{reflection.mjs → reflection.js}

@@ -1,6 +1,6 @@
 import {digg} from "diggerize"
 import * as inflection from "inflection"
-import modelClassRequire from "../model-class-require.mjs"
+import modelClassRequire from "../model-class-require"
 
 export default class ApiMakerBaseModelReflection {
   constructor(reflectionData) {

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

@@ -1,21 +1,21 @@
-import Attribute from "./base-model/attribute.mjs"
-import AttributeNotLoadedError from "./attribute-not-loaded-error.mjs"
-import CacheKeyGenerator from "./cache-key-generator.mjs"
-import Collection from "./collection.mjs"
-import CommandsPool from "./commands-pool.mjs"
-import Config from "./config.mjs"
-import CustomError from "./custom-error.mjs"
+import Attribute from "./base-model/attribute"
+import AttributeNotLoadedError from "./attribute-not-loaded-error"
+import CacheKeyGenerator from "./cache-key-generator"
+import Collection from "./collection"
+import CommandsPool from "./commands-pool"
+import Config from "./config"
+import CustomError from "./custom-error"
 import {digg} from "diggerize"
 import FormDataObjectizer from "form-data-objectizer"
 import * as inflection from "inflection"
-import ModelName from "./model-name.mjs"
-import NotLoadedError from "./not-loaded-error.mjs"
+import ModelName from "./model-name"
+import NotLoadedError from "./not-loaded-error"
 import objectToFormData from "object-to-formdata"
-import Reflection from "./base-model/reflection.mjs"
-import Scope from "./base-model/scope.mjs"
-import Services from "./services.mjs"
-import ValidationError from "./validation-error.mjs"
-import {ValidationErrors} from "./validation-errors.mjs"
+import Reflection from "./base-model/reflection"
+import Scope from "./base-model/scope"
+import Services from "./services"
+import ValidationError from "./validation-error"
+import {ValidationErrors} from "./validation-errors"
 
 const objectToUnderscore = (object) => {
   const newObject = {}

package/src/bootstrap/attribute-row/index.jsx

@@ -5,9 +5,9 @@ import memo from "set-state-compare/src/memo"
 import MoneyFormatter from "../../money-formatter"
 import PropTypes from "prop-types"
 import {useMemo} from "react"
-import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component"
 import strftime from "strftime"
-import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
+import useI18n from "i18n-on-steroids/src/use-i18n"
 
 export default memo(shapeComponent(class ApiMakerBootstrapAttributeRow extends ShapeComponent {
   static defaultProps = {

package/src/bootstrap/attribute-rows.jsx

@@ -3,7 +3,7 @@ import BaseComponent from "../base-component"
 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 {shapeComponent} from "set-state-compare/src/shape-component"
 
 export default memo(shapeComponent(class ApiMakerBootstrapAttributeRows extends BaseComponent {
   static defaultProps = {

package/src/bootstrap/card.jsx

@@ -4,7 +4,7 @@ import {digg, digs} from "diggerize"
 import memo from "set-state-compare/src/memo"
 import PropTypes from "prop-types"
 import {useRef} from "react"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent} from "set-state-compare/src/shape-component"
 
 export default memo(shapeComponent(class ApiMakerBootstrapCard extends BaseComponent {
   static defaultProps = {

package/src/bootstrap/checkbox.jsx

@@ -1,4 +1,4 @@
-import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component"
 import Checkbox from "../inputs/checkbox"
 import classNames from "classnames"
 import {digs} from "diggerize"

package/src/bootstrap/checkboxes.jsx

@@ -1,4 +1,4 @@
-import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component"
 import {digs} from "diggerize"
 import {useForm} from "../form"
 import * as inflection from "inflection"

package/src/bootstrap/input.jsx

@@ -5,7 +5,7 @@ import InvalidFeedback from "./invalid-feedback"
 import Money from "../inputs/money"
 import PropTypes from "prop-types"
 import memo from "set-state-compare/src/memo"
-import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component.js"
+import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component"
 
 const ApiMakerBootstrapInput = memo(shapeComponent(class ApiMakerBootstrapInput extends ShapeComponent {
   static propTypes = {

package/src/bootstrap/paginate.jsx

@@ -8,8 +8,8 @@ import qs from "qs"
 import {useMemo} from "react"
 import Text from "../utils/text"
 import Result from "../result"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import urlEncode from "../url-encode.mjs"
+import {shapeComponent} from "set-state-compare/src/shape-component"
+import urlEncode from "../url-encode"
 
 export default memo(shapeComponent(class ApiMakerBootstrapPaginate extends BaseComponent {
   static propTypes = propTypesExact({

package/src/bootstrap/sort-link.jsx

@@ -5,9 +5,9 @@ import PropTypes from "prop-types"
 import qs from "qs"
 import memo from "set-state-compare/src/memo"
 import Text from "../utils/text"
-import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import urlEncode from "../url-encode.mjs"
-import useSorting from "../table/use-sorting.mjs"
+import {shapeComponent} from "set-state-compare/src/shape-component"
+import urlEncode from "../url-encode"
+import useSorting from "../table/use-sorting"
 
 import Link from "../link"
 import useQueryParams from "on-location-changed/src/use-query-params"

package/src/{cable-connection-pool.mjs → cable-connection-pool.js}

@@ -1,7 +1,7 @@
-import CableSubscriptionPool from "./cable-subscription-pool.mjs"
-import CableSubscription from "./cable-subscription.mjs"
+import CableSubscriptionPool from "./cable-subscription-pool"
+import CableSubscription from "./cable-subscription"
 import {dig} from "diggerize"
-import RunLast from "./run-last.mjs"
+import RunLast from "./run-last"
 
 const shared = {}
 

package/src/{cable-subscription-pool.mjs → cable-subscription-pool.js}

@@ -1,9 +1,9 @@
-import ChannelsConsumer from "./channels-consumer.mjs"
-import CommandsPool from "./commands-pool.mjs"
-import Deserializer from "./deserializer.mjs"
+import ChannelsConsumer from "./channels-consumer"
+import CommandsPool from "./commands-pool"
+import Deserializer from "./deserializer"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
-import Logger from "./logger.mjs"
+import Logger from "./logger"
 
 const logger = new Logger({name: "ApiMaker / CableSubscriptionPool"})
 

package/src/{cable-subscription.mjs → cable-subscription.js}

@@ -1,5 +1,5 @@
 import EventEmitter from "events"
-import Logger from "./logger.mjs"
+import Logger from "./logger"
 
 const logger = new Logger({name: "ApiMaker / CableSubscription"})
 

package/src/{can-can.mjs → can-can.js}

@@ -2,7 +2,7 @@ import {digg} from "diggerize"
 import EventEmitter from "events"
 import * as inflection from "inflection"
 import {ReadersWriterLock} from "epic-locks"
-import Services from "./services.mjs"
+import Services from "./services"
 
 const shared = {}
 

package/src/collection-loader.jsx

@@ -1,11 +1,11 @@
-import Collection from "./collection.mjs"
+import Collection from "./collection"
 import {digg} from "diggerize"
 import memo from "set-state-compare/src/memo"
 import {useMemo} from "react"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
 import useCollection from "./use-collection"
-import useShape from "set-state-compare/src/use-shape.js"
+import useShape from "set-state-compare/src/use-shape"
 
 const CollectionLoader = ({component, ...restProps}) => {
   const s = useShape(restProps)

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

@@ -1,10 +1,10 @@
 import cloneDeep from "clone-deep"
-import CommandsPool from "./commands-pool.mjs"
+import CommandsPool from "./commands-pool"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
 import {incorporate} from "incorporator"
-import modelClassRequire from "./model-class-require.mjs"
-import Result from "./result.mjs"
+import modelClassRequire from "./model-class-require"
+import Result from "./result"
 
 export default class ApiMakerCollection {
   static apiMakerType = "Collection"

package/src/{commands-pool.mjs → commands-pool.js}

@@ -1,16 +1,16 @@
-import Api from "./api.mjs"
-import CommandSubmitData from "./command-submit-data.mjs"
-import CustomError from "./custom-error.mjs"
-import DestroyError from "./destroy-error.mjs"
-import Deserializer from "./deserializer.mjs"
+import Api from "./api"
+import CommandSubmitData from "./command-submit-data"
+import CustomError from "./custom-error"
+import DestroyError from "./destroy-error"
+import Deserializer from "./deserializer"
 import {dig, digg} from "diggerize"
-import events from "./events.mjs"
+import events from "./events"
 import FormDataObjectizer from "form-data-objectizer"
-import RunLast from "./run-last.mjs"
-import Serializer from "./serializer.mjs"
-import SessionStatusUpdater from "./session-status-updater.mjs"
-import ValidationError from "./validation-error.mjs"
-import {ValidationErrors} from "./validation-errors.mjs"
+import RunLast from "./run-last"
+import Serializer from "./serializer"
+import SessionStatusUpdater from "./session-status-updater"
+import ValidationError from "./validation-error"
+import {ValidationErrors} from "./validation-errors"
 
 const shared = {}
 

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

@@ -1,4 +1,4 @@
-import BaseError from "./base-error.mjs"
+import BaseError from "./base-error"
 
 class CustomError extends BaseError {}
 

package/src/{deserializer.mjs → deserializer.js}

@@ -1,7 +1,7 @@
 import {digg} from "diggerize"
 import * as inflection from "inflection"
-import modelClassRequire from "./model-class-require.mjs"
-import ModelsResponseReader from "./models-response-reader.mjs"
+import modelClassRequire from "./model-class-require"
+import ModelsResponseReader from "./models-response-reader"
 import Money from "js-money"
 
 export default class ApiMakerDeserializer {

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

@@ -1,4 +1,4 @@
-import CustomError from "./custom-error.mjs"
+import CustomError from "./custom-error"
 
 class DestroyError extends CustomError {}
 

package/src/{devise.mjs → devise.js}

@@ -1,10 +1,10 @@
-import CanCan from "./can-can.mjs"
-import Deserializer from "./deserializer.mjs"
+import CanCan from "./can-can"
+import Deserializer from "./deserializer"
 import {digg} from "diggerize"
-import events from "./events.mjs"
+import events from "./events"
 import * as inflection from "inflection"
-import modelClassRequire from "./model-class-require.mjs"
-import Services from "./services.mjs"
+import modelClassRequire from "./model-class-require"
+import Services from "./services"
 
 const shared = {}
 
@@ -45,8 +45,6 @@ export default class ApiMakerDevise {
 
     if (Array.isArray(model)) model = model[0]
 
-    await CanCan.current().resetAbilities()
-
     ApiMakerDevise.updateSession(model)
     events.emit("onDeviseSignIn", Object.assign({username}, args))
 
@@ -78,8 +76,6 @@ export default class ApiMakerDevise {
 
     const response = await Services.current().sendRequest("Devise::SignOut", {args})
 
-    await CanCan.current().resetAbilities()
-
     // Cannot use the class because they would both import each other
     if (shared.apiMakerSessionStatusUpdater) {
       shared.apiMakerSessionStatusUpdater.updateSessionStatus()

package/src/draggable-sort/controller.js

@@ -0,0 +1,137 @@
+import {digg} from "diggerize"
+import EventEmitter from "events"
+
+export default class DraggableSortController {
+  constructor({data, events, keyExtractor}) {
+    this.data = data
+    this.currentOrder = [...data]
+    this.events = events || new EventEmitter()
+    this.keyExtractor = keyExtractor
+
+    this.draggedItem = null
+    this.draggedItemData = null
+    this.draggedItemNewPosition = null
+
+    this.draggedOverItem = null
+    this.draggedOverItemData = null
+
+    this.itemData = {}
+
+    for (const itemIndex in data) {
+      this.itemData[itemIndex] = {
+        index: itemIndex,
+        item: data[itemIndex],
+        position: itemIndex
+      }
+    }
+  }
+
+  getEvents = () => this.events
+  getItemDataForItem = (item) => this.getItemDataForIndex(this.data.indexOf(item))
+  getItemDataForKey = (key) => this.itemData.find((itemDataI) => digg(itemDataI, "key") == key)
+  getItemDataForIndex = (index) => digg(this, "itemData", index)
+
+  onDragStart = ({item, itemIndex}) => {
+    if (item) {
+      this.draggedItem = item
+      this.draggedItemData = this.getItemDataForIndex(itemIndex)
+      this.draggedItemIndex = itemIndex
+      this.draggedItemPosition = this.draggedItemData.position
+      this.events.emit("onDragStart", {item, itemData: this.draggedItemData})
+    }
+  }
+
+  onDragEnd = () => {
+    const itemData = this.draggedItemData
+    const fromIndex = itemData.index
+    const fromPosition = digg(this, "draggedItemPosition")
+    const toPosition = this.draggedItemNewPosition
+    const fromItem = this.draggedItem
+    const toItem = this.draggedOverItem
+    const callbackArgs = {item: itemData.item, itemData, fromIndex, fromItem, fromPosition, toItem, toPosition}
+
+    this.draggedItemData.events.emit("resetPosition", {
+      callback: () => {
+        this.events.emit("onDragEndAnimation", callbackArgs)
+      }
+    })
+
+    this.draggedItem = null
+    this.draggedItemData = null
+    this.draggedItemNewPosition = null
+
+    this.draggedOverItem = null
+    this.draggedOverItemData = null
+
+    this.events.emit("onDragEnd", callbackArgs)
+  }
+
+  onItemLayout = ({events, index, item, layout}) => {
+    if (!(index in this.itemData)) throw new Error(`Item not found for index ${index}`)
+
+    const itemData = this.itemData[index]
+
+    itemData.layout = layout
+
+    if (!itemData.initialLayout) {
+      itemData.baseX = layout.x
+      itemData.events = events
+      itemData.initialLayout = layout
+      itemData.key = this.keyExtractor(item)
+    }
+  }
+
+  onMove = ({gestate}) => {
+    // Send move-event to the item being dragged so it will actually move around
+    this.draggedItemData?.events?.emit("move", {gestate})
+
+    const moveX = gestate.dx + this.initialDragPosition.x
+
+    for (const itemIndex in this.itemData) {
+      const itemData = this.getItemDataForIndex(itemIndex)
+      const baseX = digg(itemData, "baseX")
+      let smallestWidth = this.draggedItemData.layout.width
+
+      if (itemData.layout.width < smallestWidth) smallestWidth = itemData.layout.width
+
+      if (moveX > baseX && moveX < (baseX + smallestWidth) && itemIndex != this.draggedItemData.index) {
+        this.draggedOverItem = itemData.item
+        this.draggedOverItemData = itemData
+
+        const positionOfDraggedItem = this.currentOrder.indexOf(this.draggedItemData.item)
+        const positionOfOverItem = this.currentOrder.indexOf(this.draggedOverItemData.item)
+
+        this.currentOrder[positionOfDraggedItem] = this.draggedOverItemData.item
+        this.currentOrder[positionOfOverItem] = this.draggedItemData.item
+
+        this.draggedItemData.position = positionOfOverItem
+        this.draggedOverItemData.position = positionOfDraggedItem
+
+        this.updatePositionOfItems()
+        this.draggedItemNewPosition = positionOfOverItem
+      }
+    }
+  }
+
+  setInitialDragPosition = (initialDragPosition) => {
+    this.initialDragPosition = initialDragPosition
+  }
+
+  updatePositionOfItems() {
+    let currentPosition = 0
+
+    for (const item of this.currentOrder) {
+      const itemData = this.getItemDataForItem(item)
+
+      if (digg(itemData, "index") != digg(this, "draggedItemData", "index")) { // Dont animate dragged element to a new position because it is currently being dragged
+        itemData.events.emit("moveToPosition", {
+          x: currentPosition,
+          y: 0
+        })
+      }
+
+      itemData.baseX = currentPosition
+      currentPosition += digg(itemData, "layout", "width")
+    }
+  }
+}