@lix-js/sdk 0.6.0-preview.2 → 0.6.0-preview.4

package/dist-engine-src/src/schema/builtin/lix_commit_edge.json

@@ -1,46 +1,53 @@
 {
   "x-lix-key": "lix_commit_edge",
-  "x-lix-version": "1",
-  "x-lix-primary-key": [
-    "/parent_id",
-    "/child_id"
+  "description": "Direct parent relationship between two commits. Merge commits have one row per parent. The first parent is useful for showing mainline history or comparing a merge commit against the commit that was checked out before the merge.",
+  "examples": [
+    {
+      "parent_id": "commit-main",
+      "child_id": "commit-merge",
+      "parent_order": 0
+    },
+    {
+      "parent_id": "commit-feature",
+      "child_id": "commit-merge",
+      "parent_order": 1
+    }
   ],
+  "x-lix-primary-key": ["/child_id", "/parent_order"],
+  "x-lix-unique": [["/parent_id", "/child_id"]],
   "x-lix-foreign-keys": [
     {
-      "properties": [
-        "/parent_id"
-      ],
+      "properties": ["/parent_id"],
       "references": {
         "schemaKey": "lix_commit",
-        "properties": [
-          "/id"
-        ]
+        "properties": ["/id"]
       }
     },
     {
-      "properties": [
-        "/child_id"
-      ],
+      "properties": ["/child_id"],
       "references": {
         "schemaKey": "lix_commit",
-        "properties": [
-          "/id"
-        ]
+        "properties": ["/id"]
       }
     }
   ],
   "type": "object",
   "properties": {
     "parent_id": {
-      "type": "string"
+      "type": "string",
+      "description": "Identifier of the parent commit."
     },
     "child_id": {
-      "type": "string"
+      "type": "string",
+      "description": "Identifier of the child commit."
+    },
+    "parent_order": {
+      "type": "integer",
+      "minimum": 0,
+      "examples": [0, 1],
+      "description": "Zero-based position of this parent in the child commit's ordered parent list. The first parent has order 0; additional merge parents have order 1, 2, and so on."
     }
   },
-  "required": [
-    "parent_id",
-    "child_id"
-  ],
+  "required": ["parent_id", "child_id", "parent_order"],
   "additionalProperties": false
 }

package/dist-engine-src/src/schema/builtin/lix_directory_descriptor.json

@@ -1,6 +1,5 @@
 {
   "x-lix-key": "lix_directory_descriptor",
-  "x-lix-version": "1",
   "x-lix-primary-key": [
     "/id"
   ],

package/dist-engine-src/src/schema/builtin/lix_file_descriptor.json

@@ -1,6 +1,5 @@
 {
   "x-lix-key": "lix_file_descriptor",
-  "x-lix-version": "1",
   "x-lix-primary-key": [
     "/id"
   ],

package/dist-engine-src/src/schema/builtin/lix_key_value.json

@@ -1,6 +1,5 @@
 {
   "x-lix-key": "lix_key_value",
-  "x-lix-version": "1",
   "x-lix-primary-key": [
     "/key"
   ],

package/dist-engine-src/src/schema/builtin/lix_label.json

@@ -1,17 +1,24 @@
 {
   "x-lix-key": "lix_label",
-  "x-lix-version": "1",
+  "description": "Catalog of labels that can be assigned to arbitrary live Lix rows through lix_label_assignment.",
   "x-lix-primary-key": [
     "/id"
   ],
+  "x-lix-unique": [
+    [
+      "/name"
+    ]
+  ],
   "type": "object",
   "properties": {
     "id": {
       "type": "string",
-      "x-lix-default": "lix_uuid_v7()"
+      "x-lix-default": "lix_uuid_v7()",
+      "description": "Stable label identifier. Label assignments reference this value."
     },
     "name": {
-      "type": "string"
+      "type": "string",
+      "description": "Human-readable label name. Unique across labels."
     }
   },
   "required": [

package/dist-engine-src/src/schema/builtin/lix_label_assignment.json

@@ -0,0 +1,74 @@
+{
+  "x-lix-key": "lix_label_assignment",
+  "description": "Mapping table that assigns a label to any live Lix row addressed by (target_entity_id, target_schema_key, target_file_id). The state foreign-key tuple is ordered as [0] target_entity_id, [1] target_schema_key, [2] target_file_id.",
+  "x-lix-primary-key": [
+    "/id"
+  ],
+  "x-lix-unique": [
+    [
+      "/target_entity_id",
+      "/target_schema_key",
+      "/target_file_id",
+      "/label_id"
+    ]
+  ],
+  "x-lix-state-foreign-keys": [
+    [
+      "/target_entity_id",
+      "/target_schema_key",
+      "/target_file_id"
+    ]
+  ],
+  "x-lix-foreign-keys": [
+    {
+      "properties": [
+        "/label_id"
+      ],
+      "references": {
+        "schemaKey": "lix_label",
+        "properties": [
+          "/id"
+        ]
+      }
+    }
+  ],
+  "type": "object",
+  "properties": {
+    "id": {
+      "type": "string",
+      "x-lix-default": "lix_uuid_v7()",
+      "description": "Stable identifier for this label assignment row."
+    },
+    "target_entity_id": {
+      "type": "array",
+      "description": "Target row entity_id. This is slot [0] in x-lix-state-foreign-keys and must be the canonical JSON array of string primary-key parts.",
+      "items": {
+        "type": "string"
+      },
+      "minItems": 1
+    },
+    "target_schema_key": {
+      "type": "string",
+      "description": "Target row schema key. This is slot [1] in x-lix-state-foreign-keys."
+    },
+    "target_file_id": {
+      "type": [
+        "string",
+        "null"
+      ],
+      "description": "Target row file scope. This is slot [2] in x-lix-state-foreign-keys; null targets global rows."
+    },
+    "label_id": {
+      "type": "string",
+      "description": "Label assigned to the target row. References lix_label.id."
+    }
+  },
+  "required": [
+    "id",
+    "target_entity_id",
+    "target_schema_key",
+    "target_file_id",
+    "label_id"
+  ],
+  "additionalProperties": false
+}

package/dist-engine-src/src/schema/builtin/lix_registered_schema.json

@@ -1,9 +1,7 @@
 {
   "x-lix-key": "lix_registered_schema",
-  "x-lix-version": "1",
   "x-lix-primary-key": [
-    "/value/x-lix-key",
-    "/value/x-lix-version"
+    "/value/x-lix-key"
   ],
   "type": "object",
   "properties": {
@@ -12,14 +10,10 @@
       "properties": {
         "x-lix-key": {
           "type": "string"
-        },
-        "x-lix-version": {
-          "type": "string"
         }
       },
       "required": [
-        "x-lix-key",
-        "x-lix-version"
+        "x-lix-key"
       ],
       "additionalProperties": true
     }

package/dist-engine-src/src/schema/builtin/lix_version_descriptor.json

@@ -1,6 +1,5 @@
 {
   "x-lix-key": "lix_version_descriptor",
-  "x-lix-version": "1",
   "description": "User-facing version metadata (name and visibility) for a branch-like version. The stable identity of a version; the matching `lix_version_ref` carries the moving head pointer. The catalog's `lix_version` surface joins this descriptor with its ref to present a single user-visible version row.",
   "x-lix-primary-key": [
     "/id"

package/dist-engine-src/src/schema/builtin/lix_version_ref.json

@@ -1,6 +1,5 @@
 {
   "x-lix-key": "lix_version_ref",
-  "x-lix-version": "1",
   "description": "Version head pointer. Records which commit a version should currently resolve to in the local runtime. Intentionally not part of canonical commit membership: refs may be reset client-side after sync without introducing content conflicts. Each `lix_version_descriptor.id` has exactly one `lix_version_ref` row.",
   "x-lix-primary-key": [
     "/id"

package/dist-engine-src/src/schema/builtin/mod.rs

@@ -8,33 +8,28 @@ const LIX_KEY_VALUE_SCHEMA_KEY: &str = "lix_key_value";
 const LIX_ACCOUNT_SCHEMA_KEY: &str = "lix_account";
 const LIX_ACTIVE_ACCOUNT_SCHEMA_KEY: &str = "lix_active_account";
 const LIX_LABEL_SCHEMA_KEY: &str = "lix_label";
-const LIX_ENTITY_LABEL_SCHEMA_KEY: &str = "lix_entity_label";
+const LIX_LABEL_ASSIGNMENT_SCHEMA_KEY: &str = "lix_label_assignment";
 const LIX_CHANGE_SCHEMA_KEY: &str = "lix_change";
 const LIX_CHANGE_AUTHOR_SCHEMA_KEY: &str = "lix_change_author";
-const LIX_CHANGE_SET_SCHEMA_KEY: &str = "lix_change_set";
 const LIX_COMMIT_SCHEMA_KEY: &str = "lix_commit";
 const LIX_VERSION_DESCRIPTOR_SCHEMA_KEY: &str = "lix_version_descriptor";
 const LIX_VERSION_REF_SCHEMA_KEY: &str = "lix_version_ref";
-const LIX_CHANGE_SET_ELEMENT_SCHEMA_KEY: &str = "lix_change_set_element";
 const LIX_COMMIT_EDGE_SCHEMA_KEY: &str = "lix_commit_edge";
 const LIX_FILE_DESCRIPTOR_SCHEMA_KEY: &str = "lix_file_descriptor";
 const LIX_DIRECTORY_DESCRIPTOR_SCHEMA_KEY: &str = "lix_directory_descriptor";
 const LIX_BINARY_BLOB_REF_SCHEMA_KEY: &str = "lix_binary_blob_ref";
-const LIX_STATE_SURFACE_SCHEMA_KEY: &str = "lix_state";
 
 const LIX_REGISTERED_SCHEMA_JSON: &str = include_str!("lix_registered_schema.json");
 const LIX_KEY_VALUE_SCHEMA_JSON: &str = include_str!("lix_key_value.json");
 const LIX_ACCOUNT_SCHEMA_JSON: &str = include_str!("lix_account.json");
 const LIX_ACTIVE_ACCOUNT_SCHEMA_JSON: &str = include_str!("lix_active_account.json");
 const LIX_LABEL_SCHEMA_JSON: &str = include_str!("lix_label.json");
-const LIX_ENTITY_LABEL_SCHEMA_JSON: &str = include_str!("lix_entity_label.json");
+const LIX_LABEL_ASSIGNMENT_SCHEMA_JSON: &str = include_str!("lix_label_assignment.json");
 const LIX_CHANGE_SCHEMA_JSON: &str = include_str!("lix_change.json");
 const LIX_CHANGE_AUTHOR_SCHEMA_JSON: &str = include_str!("lix_change_author.json");
-const LIX_CHANGE_SET_SCHEMA_JSON: &str = include_str!("lix_change_set.json");
 const LIX_COMMIT_SCHEMA_JSON: &str = include_str!("lix_commit.json");
 const LIX_VERSION_DESCRIPTOR_SCHEMA_JSON: &str = include_str!("lix_version_descriptor.json");
 const LIX_VERSION_REF_SCHEMA_JSON: &str = include_str!("lix_version_ref.json");
-const LIX_CHANGE_SET_ELEMENT_SCHEMA_JSON: &str = include_str!("lix_change_set_element.json");
 const LIX_COMMIT_EDGE_SCHEMA_JSON: &str = include_str!("lix_commit_edge.json");
 const LIX_FILE_DESCRIPTOR_SCHEMA_JSON: &str = include_str!("lix_file_descriptor.json");
 const LIX_DIRECTORY_DESCRIPTOR_SCHEMA_JSON: &str = include_str!("lix_directory_descriptor.json");
@@ -45,19 +40,16 @@ static LIX_KEY_VALUE_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_ACCOUNT_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_ACTIVE_ACCOUNT_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_LABEL_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
-static LIX_ENTITY_LABEL_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
+static LIX_LABEL_ASSIGNMENT_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_CHANGE_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_CHANGE_AUTHOR_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
-static LIX_CHANGE_SET_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_COMMIT_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_VERSION_DESCRIPTOR_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_VERSION_REF_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
-static LIX_CHANGE_SET_ELEMENT_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_COMMIT_EDGE_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_FILE_DESCRIPTOR_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_DIRECTORY_DESCRIPTOR_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 static LIX_BINARY_BLOB_REF_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
-static LIX_STATE_SURFACE_SCHEMA: OnceLock<JsonValue> = OnceLock::new();
 
 const BUILTIN_SCHEMA_KEYS: &[&str] = &[
     LIX_REGISTERED_SCHEMA_KEY,
@@ -65,14 +57,12 @@ const BUILTIN_SCHEMA_KEYS: &[&str] = &[
     LIX_ACCOUNT_SCHEMA_KEY,
     LIX_ACTIVE_ACCOUNT_SCHEMA_KEY,
     LIX_LABEL_SCHEMA_KEY,
-    LIX_ENTITY_LABEL_SCHEMA_KEY,
+    LIX_LABEL_ASSIGNMENT_SCHEMA_KEY,
     LIX_CHANGE_SCHEMA_KEY,
     LIX_CHANGE_AUTHOR_SCHEMA_KEY,
-    LIX_CHANGE_SET_SCHEMA_KEY,
     LIX_COMMIT_SCHEMA_KEY,
     LIX_VERSION_DESCRIPTOR_SCHEMA_KEY,
     LIX_VERSION_REF_SCHEMA_KEY,
-    LIX_CHANGE_SET_ELEMENT_SCHEMA_KEY,
     LIX_COMMIT_EDGE_SCHEMA_KEY,
     LIX_FILE_DESCRIPTOR_SCHEMA_KEY,
     LIX_DIRECTORY_DESCRIPTOR_SCHEMA_KEY,
@@ -93,35 +83,6 @@ pub(super) fn seed_schema_definitions() -> Vec<&'static JsonValue> {
         .collect()
 }
 
-// `lix_state` is a public SQL surface, not a stored builtin schema row, but
-// multiple owners still need a schema-shaped contract for validation and SQL
-// preparation. Keep that shared shape here so those callers do not drift.
-pub(crate) fn lix_state_surface_schema_definition() -> &'static JsonValue {
-    LIX_STATE_SURFACE_SCHEMA.get_or_init(|| {
-        serde_json::json!({
-            "x-lix-key": LIX_STATE_SURFACE_SCHEMA_KEY,
-            "x-lix-version": "1",
-            "x-lix-primary-key": [
-                "/entity_id",
-                "/schema_key",
-                "/file_id"
-            ],
-            "type": "object",
-            "properties": {
-                "entity_id": { "type": "string" },
-                "schema_key": { "type": "string" },
-                "file_id": { "type": "string" }
-            },
-            "required": [
-                "entity_id",
-                "schema_key",
-                "file_id"
-            ],
-            "additionalProperties": true
-        })
-    })
-}
-
 pub(super) fn seed_schema_definition(schema_key: &str) -> Option<&'static JsonValue> {
     match schema_key {
         LIX_REGISTERED_SCHEMA_KEY => Some(
@@ -143,8 +104,11 @@ pub(super) fn seed_schema_definition(schema_key: &str) -> Option<&'static JsonVa
             LIX_LABEL_SCHEMA
                 .get_or_init(|| parse_builtin_schema("lix_label.json", LIX_LABEL_SCHEMA_JSON)),
         ),
-        LIX_ENTITY_LABEL_SCHEMA_KEY => Some(LIX_ENTITY_LABEL_SCHEMA.get_or_init(|| {
-            parse_builtin_schema("lix_entity_label.json", LIX_ENTITY_LABEL_SCHEMA_JSON)
+        LIX_LABEL_ASSIGNMENT_SCHEMA_KEY => Some(LIX_LABEL_ASSIGNMENT_SCHEMA.get_or_init(|| {
+            parse_builtin_schema(
+                "lix_label_assignment.json",
+                LIX_LABEL_ASSIGNMENT_SCHEMA_JSON,
+            )
         })),
         LIX_CHANGE_SCHEMA_KEY => Some(
             LIX_CHANGE_SCHEMA
@@ -153,9 +117,6 @@ pub(super) fn seed_schema_definition(schema_key: &str) -> Option<&'static JsonVa
         LIX_CHANGE_AUTHOR_SCHEMA_KEY => Some(LIX_CHANGE_AUTHOR_SCHEMA.get_or_init(|| {
             parse_builtin_schema("lix_change_author.json", LIX_CHANGE_AUTHOR_SCHEMA_JSON)
         })),
-        LIX_CHANGE_SET_SCHEMA_KEY => Some(LIX_CHANGE_SET_SCHEMA.get_or_init(|| {
-            parse_builtin_schema("lix_change_set.json", LIX_CHANGE_SET_SCHEMA_JSON)
-        })),
         LIX_COMMIT_SCHEMA_KEY => Some(
             LIX_COMMIT_SCHEMA
                 .get_or_init(|| parse_builtin_schema("lix_commit.json", LIX_COMMIT_SCHEMA_JSON)),
@@ -171,14 +132,6 @@ pub(super) fn seed_schema_definition(schema_key: &str) -> Option<&'static JsonVa
         LIX_VERSION_REF_SCHEMA_KEY => Some(LIX_VERSION_REF_SCHEMA.get_or_init(|| {
             parse_builtin_schema("lix_version_ref.json", LIX_VERSION_REF_SCHEMA_JSON)
         })),
-        LIX_CHANGE_SET_ELEMENT_SCHEMA_KEY => {
-            Some(LIX_CHANGE_SET_ELEMENT_SCHEMA.get_or_init(|| {
-                parse_builtin_schema(
-                    "lix_change_set_element.json",
-                    LIX_CHANGE_SET_ELEMENT_SCHEMA_JSON,
-                )
-            }))
-        }
         LIX_COMMIT_EDGE_SCHEMA_KEY => Some(LIX_COMMIT_EDGE_SCHEMA.get_or_init(|| {
             parse_builtin_schema("lix_commit_edge.json", LIX_COMMIT_EDGE_SCHEMA_JSON)
         })),
@@ -208,14 +161,12 @@ pub(crate) fn builtin_schema_json(schema_key: &str) -> Option<&'static str> {
         LIX_ACCOUNT_SCHEMA_KEY => Some(LIX_ACCOUNT_SCHEMA_JSON),
         LIX_ACTIVE_ACCOUNT_SCHEMA_KEY => Some(LIX_ACTIVE_ACCOUNT_SCHEMA_JSON),
         LIX_LABEL_SCHEMA_KEY => Some(LIX_LABEL_SCHEMA_JSON),
-        LIX_ENTITY_LABEL_SCHEMA_KEY => Some(LIX_ENTITY_LABEL_SCHEMA_JSON),
+        LIX_LABEL_ASSIGNMENT_SCHEMA_KEY => Some(LIX_LABEL_ASSIGNMENT_SCHEMA_JSON),
         LIX_CHANGE_SCHEMA_KEY => Some(LIX_CHANGE_SCHEMA_JSON),
         LIX_CHANGE_AUTHOR_SCHEMA_KEY => Some(LIX_CHANGE_AUTHOR_SCHEMA_JSON),
-        LIX_CHANGE_SET_SCHEMA_KEY => Some(LIX_CHANGE_SET_SCHEMA_JSON),
         LIX_COMMIT_SCHEMA_KEY => Some(LIX_COMMIT_SCHEMA_JSON),
         LIX_VERSION_DESCRIPTOR_SCHEMA_KEY => Some(LIX_VERSION_DESCRIPTOR_SCHEMA_JSON),
         LIX_VERSION_REF_SCHEMA_KEY => Some(LIX_VERSION_REF_SCHEMA_JSON),
-        LIX_CHANGE_SET_ELEMENT_SCHEMA_KEY => Some(LIX_CHANGE_SET_ELEMENT_SCHEMA_JSON),
         LIX_COMMIT_EDGE_SCHEMA_KEY => Some(LIX_COMMIT_EDGE_SCHEMA_JSON),
         LIX_FILE_DESCRIPTOR_SCHEMA_KEY => Some(LIX_FILE_DESCRIPTOR_SCHEMA_JSON),
         LIX_DIRECTORY_DESCRIPTOR_SCHEMA_KEY => Some(LIX_DIRECTORY_DESCRIPTOR_SCHEMA_JSON),