@comapeo/core 4.4.0 → 5.0.0

package/drizzle/project/meta/0001_snapshot.json

@@ -1,8 +1,6 @@
 {
-  "version": "5",
+  "version": "6",
   "dialect": "sqlite",
-  "id": "fd9449b2-3a8e-440e-ba57-62c2db1dc39f",
-  "prevId": "597b1fb1-5fe9-4601-abab-9cd02b6a77fe",
   "tables": {
     "coreOwnership_backlink": {
       "name": "coreOwnership_backlink",
@@ -18,7 +16,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "coreOwnership": {
       "name": "coreOwnership",
@@ -125,7 +124,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "cores": {
       "name": "cores",
@@ -148,7 +148,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "deviceInfo_backlink": {
       "name": "deviceInfo_backlink",
@@ -164,7 +165,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "deviceInfo": {
       "name": "deviceInfo",
@@ -257,7 +259,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "field_backlink": {
       "name": "field_backlink",
@@ -273,7 +276,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "field": {
       "name": "field",
@@ -408,7 +412,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "icon_backlink": {
       "name": "icon_backlink",
@@ -424,7 +429,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "icon": {
       "name": "icon",
@@ -510,7 +516,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "observation_backlink": {
       "name": "observation_backlink",
@@ -526,7 +533,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "observation": {
       "name": "observation",
@@ -640,7 +648,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "preset_backlink": {
       "name": "preset_backlink",
@@ -656,7 +665,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "preset": {
       "name": "preset",
@@ -791,7 +801,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "remoteDetectionAlert_backlink": {
       "name": "remoteDetectionAlert_backlink",
@@ -807,7 +818,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "remoteDetectionAlert": {
       "name": "remoteDetectionAlert",
@@ -914,7 +926,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "role_backlink": {
       "name": "role_backlink",
@@ -930,7 +943,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "role": {
       "name": "role",
@@ -1016,7 +1030,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "track_backlink": {
       "name": "track_backlink",
@@ -1032,7 +1047,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "track": {
       "name": "track",
@@ -1125,7 +1141,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "translation_backlink": {
       "name": "translation_backlink",
@@ -1141,7 +1158,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "translation": {
       "name": "translation",
@@ -1255,13 +1273,16 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     }
   },
   "enums": {},
   "_meta": {
-    "schemas": {},
     "tables": {},
     "columns": {}
-  }
+  },
+  "id": "fd9449b2-3a8e-440e-ba57-62c2db1dc39f",
+  "prevId": "597b1fb1-5fe9-4601-abab-9cd02b6a77fe",
+  "views": {}
 }

package/drizzle/project/meta/0002_snapshot.json

@@ -1,8 +1,6 @@
 {
-  "version": "5",
+  "version": "6",
   "dialect": "sqlite",
-  "id": "c5dd5032-e750-4541-871d-a3bd9dbb881b",
-  "prevId": "fd9449b2-3a8e-440e-ba57-62c2db1dc39f",
   "tables": {
     "coreOwnership_backlink": {
       "name": "coreOwnership_backlink",
@@ -18,7 +16,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "coreOwnership": {
       "name": "coreOwnership",
@@ -125,7 +124,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "cores": {
       "name": "cores",
@@ -148,7 +148,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "deviceInfo_backlink": {
       "name": "deviceInfo_backlink",
@@ -164,7 +165,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "deviceInfo": {
       "name": "deviceInfo",
@@ -257,7 +259,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "field_backlink": {
       "name": "field_backlink",
@@ -273,7 +276,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "field": {
       "name": "field",
@@ -408,7 +412,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "icon_backlink": {
       "name": "icon_backlink",
@@ -424,7 +429,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "icon": {
       "name": "icon",
@@ -510,7 +516,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "observation_backlink": {
       "name": "observation_backlink",
@@ -526,7 +533,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "observation": {
       "name": "observation",
@@ -640,7 +648,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "preset_backlink": {
       "name": "preset_backlink",
@@ -656,7 +665,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "preset": {
       "name": "preset",
@@ -791,7 +801,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "remoteDetectionAlert_backlink": {
       "name": "remoteDetectionAlert_backlink",
@@ -807,7 +818,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "remoteDetectionAlert": {
       "name": "remoteDetectionAlert",
@@ -914,7 +926,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "role_backlink": {
       "name": "role_backlink",
@@ -930,7 +943,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "role": {
       "name": "role",
@@ -1016,7 +1030,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "track_backlink": {
       "name": "track_backlink",
@@ -1032,7 +1047,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "track": {
       "name": "track",
@@ -1132,7 +1148,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "translation_backlink": {
       "name": "translation_backlink",
@@ -1148,7 +1165,8 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     },
     "translation": {
       "name": "translation",
@@ -1262,13 +1280,16 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
+      "uniqueConstraints": {},
+      "checkConstraints": {}
     }
   },
   "enums": {},
   "_meta": {
-    "schemas": {},
     "tables": {},
     "columns": {}
-  }
+  },
+  "id": "c5dd5032-e750-4541-871d-a3bd9dbb881b",
+  "prevId": "fd9449b2-3a8e-440e-ba57-62c2db1dc39f",
+  "views": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comapeo/core",
-  "version": "4.4.0",
+  "version": "5.0.0",
   "description": "Offline p2p mapping library",
   "main": "src/index.js",
   "types": "dist/index.d.ts",
@@ -8,9 +8,8 @@
   "scripts": {
     "lint": "eslint --cache .",
     "format": "prettier . --write",
-    "test": "npm-run-all lint test:prettier build:types type test:buildConfigs test:unit test:e2e test:types",
+    "test": "npm-run-all lint test:prettier build:types type test:unit test:e2e test:types",
     "test:prettier": "prettier --check .",
-    "test:buildConfigs": "node scripts/build-config-fixtures.js",
     "test:unit": "node --test",
     "test:e2e": "node --test test-e2e/*.js test-e2e/**/*.js",
     "test:types": "tsc -p test-types/tsconfig.json",
@@ -20,8 +19,8 @@
     "doc": "rimraf docs/api/md && typedoc --plugin typedoc-plugin-markdown --plugin typedoc-plugin-missing-exports --out docs/api/md",
     "doc:publish": "rimraf docs/api/html && typedoc --plugin typedoc-plugin-missing-exports --out docs/api/html",
     "protobuf": "node ./scripts/build-messages.js",
-    "db:generate:project": "drizzle-kit generate:sqlite --schema src/schema/project.js --out drizzle/project",
-    "db:generate:client": "drizzle-kit generate:sqlite --schema src/schema/client.js --out drizzle/client",
+    "db:generate:project": "drizzle-kit generate --dialect sqlite --schema src/schema/project.js --out drizzle/project",
+    "db:generate:client": "drizzle-kit generate --dialect sqlite --schema src/schema/client.js --out drizzle/client",
     "prepack": "npm run build:types",
     "prepare": "husky install"
   },
@@ -110,13 +109,15 @@
     "@bufbuild/buf": "^1.26.1",
     "@comapeo/cloud": "^0.2.1",
     "@comapeo/core2.0.1": "npm:@comapeo/core@2.0.1",
+    "@comapeo/core4.1.4": "npm:@comapeo/core@^4.1.4",
     "@comapeo/ipc": "^2.1.0",
-    "@mapeo/default-config": "5.0.0",
+    "@mapeo/default-config": "^6.0.0",
     "@mapeo/mock-data": "^5.0.0",
     "@sinonjs/fake-timers": "^10.0.2",
     "@types/b4a": "^1.6.0",
     "@types/bogon": "^1.0.2",
     "@types/compact-encoding": "^2.15.0",
+    "@types/d3-dsv": "^3.0.7",
     "@types/debug": "^4.1.8",
     "@types/geojson": "^7946.0.16",
     "@types/json-schema": "^7.0.11",
@@ -134,7 +135,8 @@
     "bitfield": "^4.2.0",
     "cpy": "^10.1.0",
     "cpy-cli": "^5.0.0",
-    "drizzle-kit": "^0.20.14",
+    "d3-dsv": "^3.0.1",
+    "drizzle-kit": "^1.0.0-beta.1-ac4ce44",
     "eslint": "^8.57.0",
     "execa": "^9.5.1",
     "filter-obj": "^6.1.0",
@@ -173,14 +175,17 @@
     "@sindresorhus/merge-streams": "^4.0.0",
     "b4a": "^1.6.3",
     "bcp-47": "^2.1.0",
+    "bcp-47-normalize": "^2.3.0",
     "better-sqlite3": "^11.10.0",
     "big-sparse-array": "^1.0.3",
     "bogon": "^1.1.0",
+    "comapeocat": "^1.0.0",
     "compact-encoding": "^2.12.0",
     "corestore": "6.8.4",
     "debug": "^4.3.4",
     "dot-prop": "^9.0.0",
-    "drizzle-orm": "^0.30.8",
+    "dot-prop-extra": "^10.2.0",
+    "drizzle-orm": "^1.0.0-beta.1-ac4ce44",
     "ensure-error": "^4.0.0",
     "fastify": "^4.0.0",
     "fastify-plugin": "^4.5.1",
@@ -188,6 +193,7 @@
     "hypercore": "10.19.0",
     "hypercore-crypto": "3.4.2",
     "hyperdrive": "11.5.3",
+    "iso-3166": "^4.3.0",
     "json-stable-stringify": "^1.1.1",
     "magic-bytes.js": "^1.10.0",
     "map-obj": "^5.0.2",
@@ -195,6 +201,7 @@
     "multi-core-indexer": "^1.0.0",
     "p-defer": "^4.0.0",
     "p-event": "^6.0.1",
+    "p-queue": "^8.1.1",
     "p-timeout": "^6.1.2",
     "protobufjs": "^7.2.3",
     "protomux": "^3.4.1",
@@ -208,6 +215,7 @@
     "throttle-debounce": "^5.0.0",
     "tiny-typed-emitter": "^2.1.0",
     "type-fest": "^4.30.0",
+    "un-m49": "^2.2.0",
     "undici": "^6.13.0",
     "unix-path-resolve": "^1.0.2",
     "varint": "^6.0.0",

package/src/constants.js

@@ -35,6 +35,3 @@ export const SUPPORTED_CONFIG_VERSION = 1
 
 // WARNING: This value is persisted. Be careful when changing it.
 export const DRIZZLE_MIGRATIONS_TABLE = '__drizzle_migrations'
-
-// Oldest possible time, ensure it gets overwritten with any updates
-export const UNIX_EPOCH_DATE = new Date(0).toISOString()

package/src/datatype/index.js

@@ -5,8 +5,8 @@ import { randomBytes } from 'node:crypto'
 import { noop, mutatingDeNullify } from '../utils.js'
 import { NotFoundError } from '../errors.js'
 import { TypedEmitter } from 'tiny-typed-emitter'
-import { parse as parseBCP47 } from 'bcp-47'
-import { setProperty, getProperty } from 'dot-prop'
+import { setProperty, getProperty } from 'dot-prop-extra'
+import { parseBcp47 } from '../intl/parse-bcp-47.js'
 /** @import { MapeoDoc, MapeoValue } from '@comapeo/schema' */
 /** @import { RunResult } from 'better-sqlite3' */
 /** @import { SQLiteSelectBase } from 'drizzle-orm/sqlite-core' */
@@ -285,7 +285,7 @@ export class DataType extends TypedEmitter {
   async #mutatingAddTranslations(doc, { lang }) {
     if (!this.#getTranslations) return doc
 
-    const { language, region } = parseBCP47(lang)
+    const { language, region } = parseBcp47(lang)
     if (!language) return doc
 
     const translations = await this.#getTranslations({
@@ -302,8 +302,11 @@ export class DataType extends TypedEmitter {
     for (const translation of translations) {
       if (typeof getProperty(doc, translation.propertyRef) === 'string') {
         const isMatchingRegion = region
-          ? translation.regionCode === region
-          : false
+          ? // Previous versions did not normalize region codes stored in the
+            // translations db to uppercase, so we need to transform the case
+            // here (the parsed `region` is always uppercase).
+            translation.regionCode?.toUpperCase() === region
+          : !translation.regionCode // No region code means it's a match for any region
         // Prefer translations with a matching region code, but fall back to
         // translations without a region code if no matching region code has
         // been found yet for this propertyRef

package/src/discovery/local-discovery.js

@@ -75,7 +75,8 @@ export class LocalDiscovery extends TypedEmitter {
   /** @returns {Promise<{ name: string, port: number }>} */
   async start() {
     await this.#sm.start()
-    return { name: this.#name, port: getAddress(this.#server).port }
+    const port = this.#port
+    return { name: this.#name, port }
   }
 
   /** @returns {Promise<void>} */
@@ -288,7 +289,7 @@ export class LocalDiscovery extends TypedEmitter {
    */
   async #stop({ force = false, timeout = 0 } = {}) {
     this.#log('stopping')
-    const { port } = getAddress(this.#server)
+    const port = this.#port
     this.#server.close()
     const closePromise = once(this.#server, 'close')