Merge branch 'main' into chore/release-1.0

digidem · Sep 17, 2024 · 0f4cb1f · 0f4cb1f
2 parents 3a53a56 + f65d5a6
commit 0f4cb1f
Show file tree

Hide file tree

Showing 19 changed files with 102 additions and 74 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
           - patch
           - minor
           - major
-          # - prerelease
+          - prerelease
           # - prepatch
           # - preminor
           # - premajor

diff --git a/drizzle/client/0000_chemical_star_brand.sql → drizzle/client/0000_bumpy_carnage.sql b/drizzle/client/0000_chemical_star_brand.sql → drizzle/client/0000_bumpy_carnage.sql
@@ -27,7 +27,6 @@ CREATE TABLE `projectSettings` (
 	`name` text,
 	`defaultPresets` text,
 	`configMetadata` text,
-	`isInitialProject` integer NOT NULL,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint

diff --git a/drizzle/client/meta/0000_snapshot.json b/drizzle/client/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "41e23fc3-463e-432a-9a5f-7c20366d6294",
+  "id": "e75103ab-bbcb-4ca9-a0c4-2d9095b63add",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "localDeviceInfo": {
@@ -176,13 +176,6 @@
           "notNull": false,
           "autoincrement": false
         },
-        "isInitialProject": {
-          "name": "isInitialProject",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
         "forks": {
           "name": "forks",
           "type": "text",

diff --git a/drizzle/client/meta/_journal.json b/drizzle/client/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1725381616476,
-      "tag": "0000_chemical_star_brand",
+      "when": 1726514276007,
+      "tag": "0000_bumpy_carnage",
       "breakpoints": true
     }
   ]

diff --git a/drizzle/project/0000_tan_glorian.sql → drizzle/project/0000_spooky_lady_ursula.sql b/drizzle/project/0000_tan_glorian.sql → drizzle/project/0000_spooky_lady_ursula.sql
@@ -38,7 +38,7 @@ CREATE TABLE `deviceInfo` (
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
 	`name` text NOT NULL,
-	`deviceType` text,
+	`deviceType` text NOT NULL,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint
@@ -128,7 +128,7 @@ CREATE TABLE `preset` (
 	`fieldRefs` text NOT NULL,
 	`iconRef` text,
 	`terms` text NOT NULL,
-	`color` text NOT NULL,
+	`color` text,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint
@@ -186,7 +186,7 @@ CREATE TABLE `translation` (
 	`docRefType` text NOT NULL,
 	`propertyRef` text NOT NULL,
 	`languageCode` text NOT NULL,
-	`regionCode` text NOT NULL,
+	`regionCode` text,
 	`message` text NOT NULL,
 	`forks` text NOT NULL
 );
diff --git a/drizzle/project/meta/0000_snapshot.json b/drizzle/project/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "b06de2c5-6a4c-4578-a8f0-d15f9f20e902",
+  "id": "597b1fb1-5fe9-4601-abab-9cd02b6a77fe",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "coreOwnership_backlink": {
@@ -236,7 +236,7 @@
           "name": "deviceType",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "forks": {
@@ -770,7 +770,7 @@
           "name": "color",
           "type": "text",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "forks": {
@@ -1104,7 +1104,7 @@
           "name": "regionCode",
           "type": "text",
           "primaryKey": false,
-          "notNull": true,
+          "notNull": false,
           "autoincrement": false
         },
         "message": {

diff --git a/drizzle/project/meta/_journal.json b/drizzle/project/meta/_journal.json
@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1725381611574,
-      "tag": "0000_tan_glorian",
+      "when": 1726514275142,
+      "tag": "0000_spooky_lady_ursula",
       "breakpoints": true
     }
   ]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -95,9 +95,11 @@
     "url": "git+https://github.com/digidem/mapeo-core.git"
   },
   "authors": [
-    "Karissa McKelvey",
-    "Gregor MacLennan",
-    "noffle"
+    "Andrew Chou <[email protected]>",
+    "Evan Hahn <[email protected]>",
+    "Gregor MacLennan <[email protected]>",
+    "Seth Vincent",
+    "Tomás Ciccola <[email protected]>"
   ],
   "license": "MIT",
   "bugs": {
@@ -106,8 +108,8 @@
   "homepage": "https://github.com/digidem/mapeo-core#readme",
   "devDependencies": {
     "@bufbuild/buf": "^1.26.1",
-    "@mapeo/default-config": "4.0.0-alpha.8",
-    "@mapeo/mock-data": "^1.0.3-alpha.5",
+    "@mapeo/default-config": "4.0.1-alpha.0",
+    "@mapeo/mock-data": "1.0.3-alpha.7",
     "@sinonjs/fake-timers": "^10.0.2",
     "@types/b4a": "^1.6.0",
     "@types/bogon": "^1.0.2",
@@ -156,7 +158,7 @@
     "@fastify/type-provider-typebox": "^4.0.0",
     "@hyperswarm/secret-stream": "^6.1.2",
     "@mapeo/crypto": "1.0.0-alpha.10",
-    "@mapeo/schema": "^3.0.0-next.26",
+    "@mapeo/schema": "3.0.0-next.28",
     "@mapeo/sqlite-indexer": "1.0.0-alpha.9",
     "@sinclair/typebox": "^0.29.6",
     "b4a": "^1.6.3",

diff --git a/src/config-import.js b/src/config-import.js
@@ -330,11 +330,14 @@ function translationsForLanguage(warnings) {
    *
    */
   return function* (lang, languageTranslations) {
-    const { language: languageCode, region: regionCode } = parseBCP47(lang)
+    const parsed = parseBCP47(lang)
+    const { language: languageCode } = parsed
     if (!languageCode) {
       warnings.push(new Error(`invalid translation language ${lang}`))
       return
     }
+    let { region: regionCode } = parsed
+    regionCode ||= undefined
     for (const [
       schemaNamePlural,
       languageTranslationsForDocType,
@@ -378,7 +381,7 @@ function schemaNamePluralToDocRefType(schemaNamePlural) {
 function translationsForDocType(warnings) {
   /** @param {Object} opts
    * @param {string} opts.languageCode
-   * @param {string | null | undefined} opts.regionCode
+   * @param {string | undefined} opts.regionCode
    * @param {import('@mapeo/schema').TranslationValue['docRefType']} opts.docRefType
    * @param {Record<ValidDocTypes, unknown>} opts.languageTranslationsForDocType
    */
@@ -413,7 +416,7 @@ function translationForValue(warnings) {
   /**
    * @param {Object} opts
    * @param {string} opts.languageCode
-   * @param {string | null | undefined} opts.regionCode
+   * @param {string | undefined} opts.regionCode
    * @param {import('@mapeo/schema').TranslationValue['docRefType']} opts.docRefType
    * @param {string} opts.docName
    * @param {Record<string,unknown>} opts.fieldsToTranslate
@@ -430,7 +433,7 @@ function translationForValue(warnings) {
         /** @type {'translation'} */
         schemaName: 'translation',
         languageCode,
-        regionCode: regionCode || '',
+        regionCode,
         docRefType,
         propertyRef: '',
         message: '',
@@ -475,7 +478,7 @@ function translateMessageObject(warnings) {
             if (
               !validate('translation', {
                 ...value,
-                docRef: { docId: '', versionId: '' },
+                docRef: { docId: 'placeholder', versionId: 'placeholder' },
               })
             ) {
               warnings.push(new Error(`Invalid translation ${value.message}`))

diff --git a/src/discovery/local-discovery.js b/src/discovery/local-discovery.js
@@ -72,6 +72,7 @@ export class LocalDiscovery extends TypedEmitter {
     return { name: this.#name, port: getAddress(this.#server).port }
   }
 
+  /** @returns {Promise<void>} */
   async #start() {
     // Let OS choose port, listen on ip4, all interfaces
     this.#server.listen(0, '0.0.0.0')
@@ -108,6 +109,7 @@ export class LocalDiscovery extends TypedEmitter {
   /**
    * @param {boolean} isInitiator
    * @param {net.Socket} socket
+   * @returns {void}
    */
   #handleTcpConnection(isInitiator, socket) {
     socket.off('error', this.#handleSocketError)
@@ -153,9 +155,9 @@ export class LocalDiscovery extends TypedEmitter {
   }
 
   /**
-   *
    * @param {OpenedNetNoiseStream} existing
    * @param {OpenedNetNoiseStream} keeping
+   * @returns {void}
    */
   #handleConnectionSwap(existing, keeping) {
     let closed = false
@@ -179,7 +181,6 @@ export class LocalDiscovery extends TypedEmitter {
   }
 
   /**
-   *
    * @param {OpenedNetNoiseStream} conn
    * @returns {void}
    */