teamplay 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+# v0.1.5 (Mon May 27 2024)
+
+#### 🚀 Enhancement
+
+- feat: move backend implementation from startupjs. Add an example app. ([@cray0000](https://github.com/cray0000))
+
+#### ⚠️ Pushed to `master`
+
+- readme: add example readme ([@cray0000](https://github.com/cray0000))
+- chore(example): add live reload support whenever client.js changes ([@cray0000](https://github.com/cray0000))
+
+#### Authors: 1
+
+- Pavel Zhukov ([@cray0000](https://github.com/cray0000))
+
+---
+
+# v0.1.4 (Thu May 23 2024)
+
+#### 🐛 Bug Fix
+
+- fix: rename old references to startupjs packages into teamplay packages ([@cray0000](https://github.com/cray0000))
+
+#### Authors: 1
+
+- Pavel Zhukov ([@cray0000](https://github.com/cray0000))
+
+---
+
 # v0.1.3 (Thu May 23 2024)
 
 #### 🐛 Bug Fix

package/README.md

@@ -30,14 +30,37 @@ import connect from 'teamplay/connect'
 connect()
 ```
 
-And on the server, manually create a [ShareDB's backend](https://share.github.io/sharedb/api/backend) and create a connection handler for WebSockets:
+On the server you need to create the teamplay's backend and then create a connection handler for WebSockets:
 
 ```js
-import { initConnection } from 'teamplay/server'
-const { upgrade } = initConnection(backend) // ShareDB's Backend instance
+import { createBackend, initConnection } from 'teamplay/server'
+const backend = createBackend()
+const { upgrade } = initConnection(backend)
 server.on('upgrade', upgrade) // Node's 'http' server instance
 ```
 
+- for production use it's recommended to use MongoDB. It's gonna be automatically used if you set the env var `MONGO_URL`
+- when deploying to a cluster with multiple instances you also have to set the env var `REDIS_URL` (Redis)
+
+Without setting `MONGO_URL` the alternative `mingo` mock is used instead which persists data into an SQLite file `local.db` in the root of your project.
+
+> [!NOTE]
+> teamplay's `createBackend()` is a wrapper around creating a [ShareDB's backend](https://share.github.io/sharedb/api/backend).
+> You can instead manually create a ShareDB backend yourself and pass it to `initConnection()`.
+> `ShareDB` is re-exported from `teamplay/server`, you can get it as `import { ShareDB } from 'teamplay/server'`
+
+## `initConnection(backend, options)`
+
+**`backend`** - ShareDB backend instance
+
+**`options`**:
+
+### `fetchOnly` (default: `true`)
+
+By default all subscriptions on the server are not reactive. This is strongly recommended.
+
+If you need the subscriptions to reactively update data whenever it changes (the same way as they work on client-side), pass `{ fetchOnly: false }`.
+
 ## Usage
 
 TBD
@@ -45,16 +68,17 @@ TBD
 
 ## Examples
 
+For a simple working react app see [/example](/example)
+
 ### Simplest example with server synchronization
 
 On the client we `connect()` to the server, and we have to wrap each React component into `observer()`:
 
 ```js
 // client.js
+import { createRoot } from 'react-dom/client'
 import connect from 'teamplay/connect'
 import { observer, $, sub } from 'teamplay'
-import { createRoot } from 'react-dom/client'
-import { createElement as el } from 'react'
 
 connect()
 
@@ -62,14 +86,12 @@ const App = observer(({ userId }) => {
   const $user = sub($.users[userId])
   if (!$user.get()) throw $user.set({ points: 0 })
   const { $points } = $user
-  const onClick = () => $points.set($points.get() + 1)
-  return el('button', { onClick }, 'Points: ' + $points.get())
+  const increment = () => $points.set($points.get() + 1)
+  return <button onClick={increment}>Points: {$points.get()}</button>
 })
 
 const container = document.body.appendChild(document.createElement('div'))
-createRoot(container).render(
-  el(App, { userId: '_1' })
-)
+createRoot(container).render(<App userId='_1' />)
 ```
 
 On the server we create the ShareDB backend and initialize the WebSocket connections handler:
@@ -77,21 +99,19 @@ On the server we create the ShareDB backend and initialize the WebSocket connect
 ```js
 // server.js
 import http from 'http'
-import { ShareDB, initConnection } from 'teamplay/server'
+import { createBackend, initConnection } from 'teamplay/server'
 
 const server = http.createServer() // you can pass expressApp here if needed
-const backend = new ShareDB()
+const backend = createBackend()
 const { upgrade } = initConnection(backend)
 
 server.on('upgrade', upgrade)
 
-server.listen(3000)
+server.listen(3000, () => {
+  console.log('Server started. Open http://localhost:3000 in your browser')
+})
 ```
 
-ShareDB is a re-export of [`sharedb`](https://github.com/share/sharedb) library, check its docs for more info.
-- for persistency and queries support pass [`sharedb-mongo`](https://github.com/share/sharedb-mongo) (which uses MongoDB) as `{ db }`
-- when deploying to a cluster with multiple instances you also have to provide `{ pubsub }` like [`sharedb-redis-pubsub`](https://github.com/share/sharedb-redis-pubsub) (which uses Redis)
-
 ## License
 
 MIT

package/connect/index.js

@@ -1,4 +1,4 @@
-import Socket from '@startupjs/channel'
+import Socket from '@teamplay/channel'
 import Connection from './sharedbConnection.cjs'
 import { connection, setConnection } from '../orm/connection.js'
 

package/index.js

@@ -16,9 +16,8 @@ export default $
 export { default as sub } from './react/universalSub.js'
 export { default as observer } from './react/observer.js'
 export { connection, setConnection, getConnection, fetchOnly, setFetchOnly } from './orm/connection.js'
-export * from './schema/associations.js'
-export { default as GUID_PATTERN } from './schema/GUID_PATTERN.js'
-export { default as pickFormFields } from './schema/pickFormFields.js'
+export { GUID_PATTERN, hasMany, hasOne, hasManyFlags, belongsTo, pickFormFields } from '@teamplay/schema'
+export { aggregation, aggregationHeader } from '@teamplay/utils/aggregation'
 
 export function getRootSignal (options) {
   return _getRootSignal({

package/orm/connection.js

@@ -20,7 +20,7 @@ const ERRORS = {
     You must set the initialized ShareDB connection before using subscriptions.
     You've probably forgotten to call connect() in your app:
 
-    import connect from '@startupjs/signals-orm/connect'
+    import connect from 'teamplay/connect'
     connect({ baseUrl: 'http://localhost:3000' })
   `
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamplay",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Full-stack signals ORM with multiplayer",
   "type": "module",
   "main": "index.js",
@@ -9,7 +9,8 @@
     "./connect": "./connect/index.js",
     "./server": "./server.js",
     "./connect-test": "./connect/test.js",
-    "./cache": "./cache.js"
+    "./cache": "./cache.js",
+    "./schema": "./schema.js"
   },
   "publishConfig": {
     "access": "public"
@@ -22,9 +23,12 @@
   },
   "dependencies": {
     "@nx-js/observer-util": "^4.1.3",
-    "@teamplay/cache": "^0.1.3",
-    "@teamplay/channel": "^0.1.3",
-    "@teamplay/debug": "^0.1.3",
+    "@teamplay/backend": "^0.1.5",
+    "@teamplay/cache": "^0.1.5",
+    "@teamplay/channel": "^0.1.5",
+    "@teamplay/debug": "^0.1.5",
+    "@teamplay/schema": "^0.1.5",
+    "@teamplay/utils": "^0.1.5",
     "diff-match-patch": "^1.0.5",
     "events": "^3.3.0",
     "json0-ot-diff": "^1.1.2",
@@ -37,6 +41,8 @@
     "@testing-library/react": "^15.0.7",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "sharedb-mingo-memory": "^3.0.1"
   },
   "peerDependencies": {
@@ -58,5 +64,5 @@
     ]
   },
   "license": "MIT",
-  "gitHead": "e0ed8221ff2e4691a2990813d5f07e128b11ab7a"
+  "gitHead": "ad85edf62088d1e8d28e9b5e22f2dfb5dfc00bec"
 }

package/schema.js

@@ -0,0 +1 @@
+export * from '@teamplay/schema'

package/server.js

@@ -1,12 +1,19 @@
-import createChannel from '@startupjs/channel/server'
+import createChannel from '@teamplay/channel/server'
 import { connection, setConnection, setFetchOnly } from './orm/connection.js'
 
 export { default as ShareDB } from 'sharedb'
+export {
+  default as createBackend,
+  mongo, mongoClient, createMongoIndex, redis, redlock, sqlite
+} from '@teamplay/backend'
 
-export default function initConnection (backend, options) {
+export function initConnection (backend, {
+  fetchOnly = true,
+  ...options
+} = {}) {
   if (!backend) throw Error('backend is required')
   if (connection) throw Error('Connection already exists')
   setConnection(backend.connect())
-  setFetchOnly(true)
+  setFetchOnly(fetchOnly)
   return createChannel(backend, options)
 }

package/schema/GUID_PATTERN.js

@@ -1 +0,0 @@
-export default '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'

package/schema/associations.js

@@ -1,51 +0,0 @@
-import GUID_PATTERN from './GUID_PATTERN.js'
-
-export function belongsTo (collectionName) {
-  return {
-    type: 'string',
-    pattern: GUID_PATTERN,
-    $association: {
-      type: 'belongsTo',
-      collection: collectionName
-    }
-  }
-}
-
-export function hasMany (collectionName) {
-  return {
-    type: 'array',
-    items: {
-      type: 'string',
-      pattern: GUID_PATTERN
-    },
-    $association: {
-      type: 'hasMany',
-      collection: collectionName
-    }
-  }
-}
-
-export function hasManyFlags (collectionName) {
-  return {
-    type: 'object',
-    patternProperties: {
-      [GUID_PATTERN]: { type: 'boolean' }
-    },
-    additionalProperties: false,
-    $association: {
-      type: 'hasManyFlags',
-      collection: collectionName
-    }
-  }
-}
-
-export function hasOne (collectionName) {
-  return {
-    type: 'string',
-    pattern: GUID_PATTERN,
-    $association: {
-      type: 'hasOne',
-      collection: collectionName
-    }
-  }
-}

package/schema/pickFormFields.js

@@ -1,104 +0,0 @@
-/**
- * Pick properties from json-schema to be used in a form.
- * Supports simplified schema (just the properties object) and full schema.
- * Performs extra transformations like auto-generating `label`.
- * `createdAt`, `updatedAt`, `id`, `_id` fields are excluded by default.
- * @param {Object} schema
- * @param {Object|Array} options - exclude or include fields. If array, it's the same as passing { include: [...] }
- * @param {Array} options.include - list of fields to pick (default: all)
- * @param {Array} options.exclude - list of fields to exclude (default: none)
- * @param {Boolean} options.freeze - whether to deep freeze the result (default: true)
- */
-export default function pickFormFields (schema, options) {
-  try {
-    let include, exclude, freeze
-    if (Array.isArray(options)) {
-      include = options
-    } else {
-      ;({ include, exclude, freeze = true } = options || {})
-    }
-    exclude ??= []
-    if (!schema) throw Error('pickFormFields: schema is required')
-    schema = JSON.parse(JSON.stringify(schema))
-    if (schema.type === 'object') {
-      schema = schema.properties
-    }
-    for (const key in schema) {
-      if (shouldIncludeField(key, schema[key], { include, exclude })) {
-        const field = schema[key]
-        if (!field.label) field.label = camelCaseToLabel(key)
-      } else {
-        delete schema[key]
-      }
-    }
-    if (freeze) return new Proxy(schema, deepFreezeHandler)
-    return schema
-  } catch (err) {
-    throw Error(`
-      pickFormFields: ${err.message}
-      schema:\n${JSON.stringify(schema, null, 2)}
-    `)
-  }
-}
-
-// Proxy handlers to deep freeze schema to prevent accidental mutations.
-// For this, when we .get() a property, we also return the same recursive Proxy handler if it's an object.
-const deepFreezeHandler = {
-  get (target, prop) {
-    const value = target[prop]
-    if (typeof value === 'object' && value !== null) {
-      return new Proxy(value, deepFreezeHandler)
-    }
-    return value
-  },
-  set () {
-    throw Error(ERRORS.schemaIsFrozen)
-  }
-}
-
-function shouldIncludeField (key, field, { include, exclude = [] } = {}) {
-  if (!field) throw Error(`field "${key}" does not have a schema definition`)
-  if (include?.includes(key)) return true
-  if (exclude.includes(key)) return false
-  // if field has 'input' specified then it's an explicit indicator that it can be used in forms,
-  // so the default exclusion rules don't apply
-  if (!field.input) {
-    // exclude some meta fields by default
-    if (DEFAULT_EXCLUDE_FORM_FIELDS.includes(key)) return false
-    // exclude foreign keys by default
-    // Foreign keys have a custom `$association` property set by belongsTo/hasMany/hasOne helpers
-    if (field.$association) return false
-  }
-  // if include array is not explicitly set, include all fields by default
-  if (!include) return true
-  return false
-}
-
-const DEFAULT_EXCLUDE_FORM_FIELDS = ['id', '_id', 'createdAt', 'updatedAt']
-
-// split into words, capitalize first word, make others lowercase
-function camelCaseToLabel (str) {
-  return str
-    .replace(/([A-Z])/g, ' $1')
-    .toLowerCase()
-    .replace(/^./, (s) => s.toUpperCase())
-}
-
-const ERRORS = {
-  schemaIsFrozen: `
-    Form fields are immutable.
-    If you want to change them, clone them with \`JSON.parse(JSON.stringify(FORM_FIELDS))\`.
-
-    If you want to do it inside react component, you can use this pattern for the most effective cloning:
-
-    \`\`\`
-        const $fields = useValue$(useMemo(() => JSON.parse(JSON.stringify(FORM_FIELDS)), []))
-    \`\`\`
-
-    and then pass $fields to the Form component like this:
-
-    \`\`\`
-        <Form $fields={$fields} $value={$value} />
-    \`\`\`
-  `
-}