Mit's in the dictionary

that said, it erge branch 'feature/split' of github.com:lipu-linku/sona into feature/split
lipu-linku · Dec 2, 2023 · 6983d75 · 6983d75
2 parents 8443582 + aeb7677
commit 6983d75
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 141 deletions.
diff --git a/.github/workflows/generate_schema.yml b/.github/workflows/generate_schema.yml
@@ -13,9 +13,13 @@ permissions:
 jobs:
   generate:
     runs-on: ubuntu-latest
+    name: Generate JSON schemas from Zod schemas
     defaults:
       run:
         working-directory: ./schemas
+    outputs:
+      schema_changed: ${{ steps.commit.outputs.committed }}
+      commit_sha: ${{ steps.commit.outputs.commit_long_sha }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -35,6 +39,15 @@ jobs:
         run: pnpm run generate:schemas
 
       - name: Commit schemas
+        id: commit
         uses: EndBug/add-and-commit@v9
         with:
           message: "Generated schemas for ${{ github.event.pull_request.head.sha || github.event.head_commit.id || vars.GITHUB_SHA }}"
+
+  validate:
+    name: Validate TOMLs based on schema
+    needs: generate
+    uses: ./.github/workflows/validate_toml.yml
+    with:
+      commit_sha: ${{ needs.generate.outputs.commit_sha }}
+    if: ${{ needs.generate.outputs.schema_changed == 'true' }}
diff --git a/.github/workflows/validate_toml.yml b/.github/workflows/validate_toml.yml
@@ -4,11 +4,11 @@ on:
   push:
     paths:
       - "**.toml"
-      - "schemas/generated/**.json"
-  pull_request:
-    paths:
-      - "**.toml"
-      - "schemas/generated/**.json"
+  workflow_call:
+    inputs:
+      commit_sha:
+        type: string
+        required: true
   workflow_dispatch:
 
 permissions:
@@ -17,7 +17,7 @@ permissions:
 jobs:
   validate:
     env:
-      BranchRef: ${{ github.event.pull_request.head.sha || github.event.head_commit.id || vars.GITHUB_SHA || 'main' }}
+      BranchRef: ${{ github.event_name == 'workflow_run' && inputs.commit_sha || github.sha }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -36,4 +36,4 @@ jobs:
         run: npx --yes @taplo/cli check --schema https://raw.githubusercontent.com/lipu-linku/sona/$BranchRef/schemas/generated/sitelen_pona_translation.json ./translations/**/sp_etymology.toml
 
       - name: Validate word files
-        run: npx --yes @taplo/cli check --schema https://raw.githubusercontent.com/lipu-linku/sona/$CommitHash/schemas/generated/word.json ./words/*.toml
+        run: npx --yes @taplo/cli check --schema https://raw.githubusercontent.com/lipu-linku/sona/$BranchRef/schemas/generated/word.json ./words/*.toml
diff --git a/schemas/generated/commentary_translation.json b/schemas/generated/commentary_translation.json
@@ -2,26 +2,19 @@
   "$ref": "#/definitions/commentary_translation",
   "definitions": {
     "commentary_translation": {
-      "allOf": [
-        {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "object",
-          "properties": {
-            "$schema": {
-              "type": "string",
-              "description": "a file path pointing to this JSON schema"
-            }
-          },
-          "required": [
-            "$schema"
-          ]
+      "type": "object",
+      "properties": {
+        "$schema": {
+          "type": "string",
+          "description": "a file path pointing to this JSON schema"
         }
+      },
+      "required": [
+        "$schema"
       ],
+      "additionalProperties": {
+        "type": "string"
+      },
       "description": "Localized commentary regarding Toki Pona words"
     }
   },

diff --git a/schemas/generated/definition_translation.json b/schemas/generated/definition_translation.json
@@ -2,26 +2,19 @@
   "$ref": "#/definitions/definition_translation",
   "definitions": {
     "definition_translation": {
-      "allOf": [
-        {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "object",
-          "properties": {
-            "$schema": {
-              "type": "string",
-              "description": "a file path pointing to this JSON schema"
-            }
-          },
-          "required": [
-            "$schema"
-          ]
+      "type": "object",
+      "properties": {
+        "$schema": {
+          "type": "string",
+          "description": "a file path pointing to this JSON schema"
         }
+      },
+      "required": [
+        "$schema"
       ],
+      "additionalProperties": {
+        "type": "string"
+      },
       "description": "Localized definitions of Toki Pona words"
     }
   },

diff --git a/schemas/generated/etymology_translation.json b/schemas/generated/etymology_translation.json
@@ -2,43 +2,36 @@
   "$ref": "#/definitions/etymology_translation",
   "definitions": {
     "etymology_translation": {
-      "allOf": [
-        {
-          "type": "object",
-          "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "properties": {
-                "definition": {
-                  "type": "string",
-                  "description": "The localized definition of the root word in its origin language"
-                },
-                "language": {
-                  "type": "string",
-                  "description": "The localized name of the language this word originated from"
-                }
-              },
-              "required": [
-                "language"
-              ],
-              "additionalProperties": false
-            }
-          }
-        },
-        {
+      "type": "object",
+      "properties": {
+        "$schema": {
+          "type": "string",
+          "description": "a file path pointing to this JSON schema"
+        }
+      },
+      "required": [
+        "$schema"
+      ],
+      "additionalProperties": {
+        "type": "array",
+        "items": {
           "type": "object",
           "properties": {
-            "$schema": {
+            "definition": {
+              "type": "string",
+              "description": "The localized definition of the root word in its origin language"
+            },
+            "language": {
               "type": "string",
-              "description": "a file path pointing to this JSON schema"
+              "description": "The localized name of the language this word originated from"
             }
           },
           "required": [
-            "$schema"
-          ]
+            "language"
+          ],
+          "additionalProperties": false
         }
-      ],
+      },
       "description": "Localized etymological values for Toki Pona words"
     }
   },

diff --git a/schemas/generated/sitelen_pona_translation.json b/schemas/generated/sitelen_pona_translation.json
@@ -2,26 +2,19 @@
   "$ref": "#/definitions/sitelen_pona_translation",
   "definitions": {
     "sitelen_pona_translation": {
-      "allOf": [
-        {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        {
-          "type": "object",
-          "properties": {
-            "$schema": {
-              "type": "string",
-              "description": "a file path pointing to this JSON schema"
-            }
-          },
-          "required": [
-            "$schema"
-          ]
+      "type": "object",
+      "properties": {
+        "$schema": {
+          "type": "string",
+          "description": "a file path pointing to this JSON schema"
         }
+      },
+      "required": [
+        "$schema"
       ],
+      "additionalProperties": {
+        "type": "string"
+      },
       "description": "Localized descriptions of the origins of the sitelen pona glyphs for Toki Pona words"
     }
   },

diff --git a/schemas/generated/word.json b/schemas/generated/word.json
@@ -63,8 +63,16 @@
           "type": "object",
           "properties": {
             "sitelen_emosi": {
-              "type": "string",
-              "pattern": "^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$",
+              "anyOf": [
+                {
+                  "type": "string",
+                  "pattern": "^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$"
+                },
+                {
+                  "type": "string",
+                  "const": ""
+                }
+              ],
               "description": "The sitelen emosi representation of this word, a script for writing Toki Pona using emoji"
             },
             "sitelen_pona": {
@@ -75,18 +83,37 @@
               "description": "A list of sitelen Lasina representations of this word, to be converted into sitelen pona glyphs"
             },
             "sitelen_sitelen": {
-              "type": "string",
-              "format": "uri",
+              "anyOf": [
+                {
+                  "type": "string",
+                  "format": "uri"
+                },
+                {
+                  "type": "string",
+                  "const": ""
+                }
+              ],
               "description": "A URL pointing to an image of this word's sitelen sitelen hieroglyphic block"
             },
             "ucsur": {
-              "type": "string",
-              "pattern": "^U\\+[\\da-fA-F]{4,6}$",
+              "anyOf": [
+                {
+                  "type": "string",
+                  "pattern": "^U\\+[\\da-fA-F]{4,6}$"
+                },
+                {
+                  "type": "string",
+                  "const": ""
+                }
+              ],
               "description": "The word's UCSUR codepoint, as defined in https://www.kreativekorp.com/ucsur/charts/sitelen.html"
             }
           },
           "required": [
-            "sitelen_pona"
+            "sitelen_emosi",
+            "sitelen_pona",
+            "sitelen_sitelen",
+            "ucsur"
           ],
           "additionalProperties": false,
           "description": "Ways of representing this word in the real world, via text/computers"
@@ -190,11 +217,15 @@
       },
       "required": [
         "$schema",
+        "author_verbatim",
+        "author_verbatim_source",
         "book",
         "coined_era",
-        "ku_data",
+        "coined_year",
+        "creator",
         "see_also",
         "representations",
+        "source_language",
         "usage_category",
         "word",
         "etymology",