Merge branch 'main' into feat/new-comapeocat-format

* main:
  chore: remove branch filter on release workflow (#1153)
  chore: release workflow fixes (#1151)
  fix: Blocked members only expect auth core for initial sync (#1138)
  chore: cleanup drizzle types (#1141)

Author: gmaclennan

.github/workflows/release.yml

@@ -14,16 +14,31 @@ on:
           - minor
           - major
           - prerelease
-          # - prepatch
-          # - preminor
-          # - premajor
+          - prepatch
+          - preminor
+          - premajor
   pull_request:
     types: [closed]
-    branches: [main]
 
 jobs:
   release:
-    if: ${{github.event_name != 'pull_request' || github.event.pull_request.merged}}
+    if: >-
+      ${{
+        (
+          startsWith(github.event.inputs.semver, 'pre') ||
+          github.ref == format(
+            'refs/heads/{0}',
+            github.event.repository.default_branch
+          )
+        ) &&
+        (
+          github.event_name != 'pull_request' ||
+          (
+            github.event.pull_request.merged &&
+            github.event.pull_request.user.login == 'optic-release-automation[bot]'
+          )
+        )
+      }}
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -36,11 +51,11 @@ jobs:
           commit-message: 'Release {version}'
           sync-semver-tags: false
           access: 'public'
-          # This prefix is added before the prerelease number, e.g. `v3.0.0-alpha.0`
-          # prerelease-prefix: 'alpha'
+          # This prefix is added before the prerelease number, e.g. `v3.0.0-next.0`
+          prerelease-prefix: 'next'
           semver: ${{ github.event.inputs.semver }}
-          # Prereleases are published under the `alpha` npm dist-tag
-          # npm-tag: ${{ startsWith(github.event.inputs.semver, 'pre') && 'alpha' || 'latest' }}
+          # Prereleases are published under the `next` npm dist-tag
+          npm-tag: ${{ startsWith(github.event.inputs.semver, 'pre') && 'next' || 'latest' }}
           # Don't notify linked issues
           notify-linked-issues: false
           publish-mode: oidc

package-lock.json

@@ -1,7 +1,7 @@
 import { decode } from '@comapeo/schema'
 import SqliteIndexer from '@mapeo/sqlite-indexer'
 import { getTableConfig } from 'drizzle-orm/sqlite-core'
-import { getBacklinkTableName } from '../schema/utils.js'
+import { getBacklinkTableName } from '../schema/comapeo-to-drizzle.js'
 import { discoveryKey } from 'hypercore-crypto'
 import { Logger } from '../logger.js'
 /** @import { MapeoDoc, VersionIdObject } from '@comapeo/schema' */

src/index-writer/index.js

@@ -792,6 +792,9 @@ export class MapeoManager extends TypedEmitter {
     // in the config store - defining the name of the project.
     // TODO: Enforce adding a project name in the invite method
     const isConfigSynced = configState.want === 0 && configState.have > 0
+    if (isRoleSynced && ownRole.sync.config === 'blocked' && isAuthSynced) {
+      return true
+    }
     if (
       isRoleSynced &&
       isProjectSettingsSynced &&
@@ -803,6 +806,7 @@ export class MapeoManager extends TypedEmitter {
       this.#l.log(
         'Pending initial sync: role %s, projectSettings %o, auth %o, config %o',
         isRoleSynced,
+        isProjectSettingsSynced,
         isAuthSynced,
         isConfigSynced
       )
@@ -811,12 +815,15 @@ export class MapeoManager extends TypedEmitter {
       /** @param {import('./sync/sync-state.js').State} syncState */
       const onSyncState = (syncState) => {
         clearTimeout(timeoutId)
-        if (syncState.auth.dataToSync || syncState.config.dataToSync) {
+        if (
+          syncState.auth.dataToSync ||
+          (syncState.config.dataToSync && ownRole.sync.config === 'allowed')
+        ) {
           timeoutId = setTimeout(onTimeout, timeoutMs)
           return
         }
         project.$sync[kSyncState].off('state', onSyncState)
-        resolve(this.#waitForInitialSync(project, { timeoutMs }))
+        this.#waitForInitialSync(project, { timeoutMs }).then(resolve, reject)
       }
       const onTimeout = () => {
         project.$sync[kSyncState].off('state', onSyncState)

src/mapeo-manager.js

@@ -3,8 +3,10 @@
 // device
 import { blob, sqliteTable, text, int } from 'drizzle-orm/sqlite-core'
 import { dereferencedDocSchemas as schemas } from '@comapeo/schema'
-import { jsonSchemaToDrizzleColumns as toColumns } from './schema-to-drizzle.js'
-import { backlinkTable } from './utils.js'
+import {
+  comapeoSchemaToDrizzleTable as toDrizzle,
+  backlinkTable,
+} from './comapeo-to-drizzle.js'
 
 /**
  * @import { ProjectSettings } from '@comapeo/schema'
@@ -18,11 +20,8 @@ import { backlinkTable } from './utils.js'
 /** @type {ProjectInfo} */
 const PROJECT_INFO_DEFAULT_VALUE = { sendStats: false }
 
-export const projectSettingsTable = sqliteTable(
-  'projectSettings',
-  toColumns(schemas.projectSettings)
-)
-export const projectBacklinkTable = backlinkTable(projectSettingsTable)
+export const projectSettingsTable = toDrizzle(schemas.projectSettings)
+export const projectBacklinkTable = backlinkTable('projectSettings')
 export const projectKeysTable = sqliteTable('projectKeys', {
   projectId: text('projectId').notNull().primaryKey(),
   projectPublicId: text('projectPublicId').notNull(),