Add move and split redirects to the schema

.gitignore

@@ -5,9 +5,9 @@ packages/web-features/index.d.ts
 packages/**/LICENSE.txt
 packages/web-features/data.json
 packages/web-features/data.schema.json
-packages/web-features/types.ts
+packages/web-features/types*
+packages/web-features/index.js
 data.extended.json
-index.js
 
 # Ignore files created & used by pages & 11ty
 /_site/**

.prettierignore

@@ -2,7 +2,6 @@
 /**/*.dist
 /**/dist
 
-
 # Exclude the website includes since these are typically fragments, or include
 # things that makes Prettier unhappy.
 /gh-pages/src/_includes/**
@@ -11,14 +10,12 @@
 # TODO: Format all these files
 README.md
 index.ts
-types.ts
 2022-backgrounder.md
 towards-features.md
 /.github/**
 /docs
 !/docs/publishing.md
 /features/draft
-/schemas
 /scripts/caniuse.ts
 /scripts/schema.ts
 /scripts/specs.ts

features/conic-gradients.yml

@@ -8,4 +8,5 @@ status:
 compat_features:
   - css.types.gradient.conic-gradient
   - css.types.gradient.conic-gradient.doubleposition
+  - css.types.gradient.conic-gradient.single_color_stop
   - css.types.gradient.repeating-conic-gradient

features/conic-gradients.yml.dist

@@ -41,3 +41,15 @@ compat_features:
   #   safari: "12.1"
   #   safari_ios: "12.2"
   - css.types.gradient.conic-gradient.doubleposition
+
+  # baseline: low
+  # baseline_low_date: 2025-04-04
+  # support:
+  #   chrome: "135"
+  #   chrome_android: "135"
+  #   edge: "135"
+  #   firefox: "136"
+  #   firefox_android: "136"
+  #   safari: "18.4"
+  #   safari_ios: "18.4"
+  - css.types.gradient.conic-gradient.single_color_stop

features/gradients.yml

@@ -16,18 +16,22 @@ compat_features:
   - css.types.gradient.linear-gradient.interpolation_hints
   - css.types.gradient.linear-gradient.premultiplied_gradients
   - css.types.gradient.linear-gradient.to
+  - css.types.gradient.linear-gradient.single_color_stop
   - css.types.gradient.linear-gradient.unitless_0_angle
   - css.types.gradient.repeating-linear-gradient
   - css.types.gradient.repeating-linear-gradient.doubleposition
   - css.types.gradient.repeating-linear-gradient.interpolation_hints
   - css.types.gradient.repeating-linear-gradient.to
+  - css.types.gradient.repeating-linear-gradient.single_color_stop
   - css.types.gradient.repeating-linear-gradient.unitless_0_angle
   - css.types.gradient.radial-gradient
   - css.types.gradient.radial-gradient.at
   - css.types.gradient.radial-gradient.doubleposition
   - css.types.gradient.radial-gradient.interpolation_hints
   - css.types.gradient.radial-gradient.premultiplied_gradients
+  - css.types.gradient.radial-gradient.single_color_stop
   - css.types.gradient.repeating-radial-gradient
   - css.types.gradient.repeating-radial-gradient.at
   - css.types.gradient.repeating-radial-gradient.doubleposition
   - css.types.gradient.repeating-radial-gradient.interpolation_hints
+  - css.types.gradient.repeating-radial-gradient.single_color_stop

features/gradients.yml.dist

@@ -145,3 +145,18 @@ compat_features:
   #   safari_ios: "15"
   - css.types.gradient.linear-gradient.premultiplied_gradients
   - css.types.gradient.radial-gradient.premultiplied_gradients
+
+  # baseline: low
+  # baseline_low_date: 2025-04-04
+  # support:
+  #   chrome: "135"
+  #   chrome_android: "135"
+  #   edge: "135"
+  #   firefox: "136"
+  #   firefox_android: "136"
+  #   safari: "18.4"
+  #   safari_ios: "18.4"
+  - css.types.gradient.linear-gradient.single_color_stop
+  - css.types.gradient.radial-gradient.single_color_stop
+  - css.types.gradient.repeating-linear-gradient.single_color_stop
+  - css.types.gradient.repeating-radial-gradient.single_color_stop

features/numeric-separators.yml

@@ -0,0 +1,6 @@
+name: Numeric separators
+description: To improve readability for numeric literals, underscores (`_`) can be used as separators. For example, `1_050.95` is equivalent to `1050.95`.
+spec: https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#prod-NumericLiteralSeparator
+group: javascript
+compat_features:
+  - javascript.grammar.numeric_separators

features/numeric-separators.yml.dist

@@ -0,0 +1,17 @@
+# Generated from: numeric-separators.yml
+# Do not edit this file by hand. Edit the source file instead!
+
+status:
+  baseline: high
+  baseline_low_date: 2020-07-28
+  baseline_high_date: 2023-01-28
+  support:
+    chrome: "75"
+    chrome_android: "75"
+    edge: "79"
+    firefox: "70"
+    firefox_android: "79"
+    safari: "13"
+    safari_ios: "13"
+compat_features:
+  - javascript.grammar.numeric_separators

features/numeric-seperators.yml

@@ -1,6 +1,2 @@
-name: Numeric separators
-description: To improve readability for numeric literals, underscores (`_`) can be used as separators. For example, `1_050.95` is equivalent to `1050.95`.
-spec: https://tc39.es/ecma262/multipage/ecmascript-language-lexical-grammar.html#prod-NumericLiteralSeparator
-group: javascript
-compat_features:
-  - javascript.grammar.numeric_separators
+kind: moved
+redirect_target: numeric-separators

features/numeric-seperators.yml.dist

@@ -1,17 +1,6 @@
 # Generated from: numeric-seperators.yml
-# Do not edit this file by hand. Edit the source file instead!
+# This file intentionally left blank.
+# Do not edit this file.
+# The data for this feature has moved to numeric-separators.yml
 
-status:
-  baseline: high
-  baseline_low_date: 2020-07-28
-  baseline_high_date: 2023-01-28
-  support:
-    chrome: "75"
-    chrome_android: "75"
-    edge: "79"
-    firefox: "70"
-    firefox_android: "79"
-    safari: "13"
-    safari_ios: "13"
-compat_features:
-  - javascript.grammar.numeric_separators
+{}

features/single-color-gradients.yml

@@ -1,11 +1,4 @@
-name: Single color stop gradients
-description: A single color stop can be provided to the `linear-gradient()`, `radial-gradient()`, and `conic-gradient()` CSS functions, and their repeating counterparts, to create a solid color background.
-spec: https://drafts.csswg.org/css-images-4/#color-stop-syntax
-group: gradients
-compat_features:
-  - css.types.gradient.conic-gradient.single_color_stop
-  - css.types.gradient.linear-gradient.single_color_stop
-  - css.types.gradient.radial-gradient.single_color_stop
-  - css.types.gradient.repeating-conic-gradient.single_color_stop
-  - css.types.gradient.repeating-linear-gradient.single_color_stop
-  - css.types.gradient.repeating-radial-gradient.single_color_stop
+kind: split
+redirect_targets:
+  - gradients
+  - conic-gradients

features/single-color-gradients.yml.dist

@@ -1,21 +1,8 @@
 # Generated from: single-color-gradients.yml
-# Do not edit this file by hand. Edit the source file instead!
+# This file intentionally left blank.
+# Do not edit this file.
+# The data for this feature has moved to:
+#   - gradients.yml
+#   - conic-gradients.yml
 
-status:
-  baseline: low
-  baseline_low_date: 2025-04-04
-  support:
-    chrome: "135"
-    chrome_android: "135"
-    edge: "135"
-    firefox: "136"
-    firefox_android: "136"
-    safari: "18.4"
-    safari_ios: "18.4"
-compat_features:
-  - css.types.gradient.conic-gradient.single_color_stop
-  - css.types.gradient.linear-gradient.single_color_stop
-  - css.types.gradient.radial-gradient.single_color_stop
-  - css.types.gradient.repeating-conic-gradient.single_color_stop
-  - css.types.gradient.repeating-linear-gradient.single_color_stop
-  - css.types.gradient.repeating-radial-gradient.single_color_stop
+{}

index.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import { Temporal } from '@js-temporal/polyfill';
 import { fdir } from 'fdir';
 import YAML from 'yaml';
-import { FeatureData, GroupData, SnapshotData, WebFeaturesData } from './types';
+import { GroupData, SnapshotData, WebFeaturesData } from './types';
 
 import { toString as hastTreeToString } from 'hast-util-to-string';
 import rehypeStringify from 'rehype-stringify';
@@ -14,6 +14,7 @@ import { unified } from 'unified';
 
 import { BASELINE_LOW_TO_HIGH_DURATION, coreBrowserSet, parseRangedDateString } from 'compute-baseline';
 import { Compat } from 'compute-baseline/browser-compat-data';
+import { isMoved, isSplit } from './type-guards';
 
 // The longest name allowed, to allow for compact display.
 const nameMaxLength = 80;
@@ -118,7 +119,7 @@ function convertMarkdown(markdown: string) {
 // Map from BCD keys/paths to web-features identifiers.
 const bcdToFeatureId: Map<string, string> = new Map();
 
-const features: { [key: string]: FeatureData } = {};
+const features: WebFeaturesData["features"] = {};
 for (const [key, data] of yamlEntries('features')) {
     // Draft features reserve an identifier but aren't complete yet. Skip them.
     if (data[draft]) {
@@ -128,6 +129,11 @@ for (const [key, data] of yamlEntries('features')) {
         continue;
     }
 
+    // Attach `kind: feature` to ordinary features
+    if (!isMoved(data) && !isSplit(data)) {
+        data.kind = "feature";
+    }
+
     // Convert markdown to text+HTML.
     if (data.description) {
         const { text, html } = convertMarkdown(data.description);
@@ -183,12 +189,37 @@ for (const [key, data] of yamlEntries('features')) {
     features[key] = data;
 }
 
-// Assert that discouraged feature's alternatives are valid
-for (const [id, feature] of Object.entries(features)) {
-    for (const alternative of feature.discouraged?.alternatives ?? []) {
-        if (!(alternative in features)) {
-            throw new Error(`${id}'s alternative "${alternative}" is not a valid feature ID`);
+// Assert that feature references are valid
+
+function assertValidReference(sourceID: string, targetID: string): void {
+    if (targetID in features) {
+        if (isMoved(features[targetID]) || isSplit(features[targetID])) {
+            throw new Error(`${sourceID} references a redirect "${targetID}" instead of an ordinary feature ID`);
         }
+        return;
+    }
+    throw new Error(`${sourceID}'s reference to "${targetID}" is not a valid feature ID`);
+}
+
+for (const [id, feature] of Object.entries(features)) {
+    const { kind } = feature;
+    switch (kind) {
+        case "feature":
+            for (const alternative of feature.discouraged?.alternatives ?? []) {
+                assertValidReference(id, alternative);
+            }
+            break;
+        case "moved":
+            assertValidReference(id, feature.redirect_target);
+            break;
+        case "split":
+            for (const target of feature.redirect_targets) {
+                assertValidReference(id, target);
+            }
+            break;
+        default:
+            kind satisfies never;
+            throw new Error(`Unhandled feature kind ${kind}}`);
     }
 }