improved data generation

fixed data loading

Author: mariotaku

src/views/develop/caniuse/caniuse-data.js

@@ -14,7 +14,7 @@ class App extends Component<unknown, AppState> {
         super();
         const query = new URLSearchParams(location.search);
         this.state = {q: (query.get('q')?.trim()) || undefined};
-        fetch('caniuse/data/index.json').then(resp => resp.json()).then(data => this.setState({
+        fetch(dataUrl('index')).then(resp => resp.json()).then(data => this.setState({
             index: data,
         }));
     }
@@ -31,7 +31,9 @@ class App extends Component<unknown, AppState> {
 
     render(props: unknown, state: AppState) {
         return html`
-          <h1>Can I use <input type="search" class="" oninput=${this.onSearchChange}/>?</h1>
+          <h1>Can I use <input type="search" class="border-0 border-bottom border-dark-subtle bg-dark px-1 mx-1"
+                               defaultValue=${this.state.q} onChange=${this.onSearchChange}/>?
+          </h1>
           <hr/>
           ${state.index && state.q && html`
             <${CanIUseSearch} index=${state.index} name=${state.q}/>`}`;
@@ -44,7 +46,7 @@ function CanIUseSearch(props: { index: Record<string, string[]>, name: string })
 
     async function fetchData(q: string): Promise<DataEntry[]> {
         return Promise.all(uniq(Object.entries(index).flatMap(([k, names]) => k.includes(q) ? names : []))
-            .map(name => fetch(`caniuse/data/${name}.json`).then(resp => {
+            .map(name => fetch(dataUrl(name)).then(resp => {
                 if (!resp.ok) {
                     throw new Error(`Failed to fetch data for ${name}`);
                 }
@@ -67,6 +69,14 @@ function CanIUseSearch(props: { index: Record<string, string[]>, name: string })
       </div>`;
 }
 
+function dataUrl(name: string) {
+    const baseUrl = new URL(location.href);
+    if (!baseUrl.pathname.endsWith('/')) {
+        baseUrl.pathname += '/';
+    }
+    return new URL(`./data/${name}.json`, baseUrl);
+}
+
 render(html`
       <${App}/>`,
     document.getElementById('app-container')!);

src/views/develop/caniuse/caniuse.ts

@@ -0,0 +1,7 @@
+name: libndl-directmedia2
+library:
+  - libndl-directmedia2.so.1
+warning: |
+  This library is only available on webOS 2.2~3.4.
+tags:
+  - ndl

src/views/develop/caniuse/features/libndl-directmedia2.yaml

@@ -1,4 +1,13 @@
 name: NDL DirectMedia
-library: libNDL_directmedia.so.1
+library:
+  - libNDL_directmedia.so.1
+version_override:
+  afro: null
+  beehive: null
+  dreadlocks: null
+  dreadlocks2: v1
+  goldilocks: v1
+  goldilocks2: v1
+  default: v2
 tags:
   - ndl

src/views/develop/caniuse/features/ndl-directmedia.yaml

@@ -18,7 +18,58 @@
     },
     "version_override": {
       "title": "Version Override",
-      "type": "object"
+      "type": "object",
+      "properties": {
+        "afro": {
+          "title": "webOS 1.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "beehive": {
+          "title": "webOS 2.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "dreadlocks": {
+          "title": "webOS 3.0~3.4",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "dreadlocks2": {
+          "title": "webOS 3.5~3.9",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "goldilocks": {
+          "title": "webOS 4.0~4.4",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "goldilocks2": {
+          "title": "webOS 4.5~4.10",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "jhericurl": {
+          "title": "webOS 5.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "kisscurl": {
+          "title": "webOS 6.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "mullet": {
+          "title": "webOS 7.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "number1": {
+          "title": "webOS 8.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "ombre": {
+          "title": "webOS 9.x",
+          "$ref": "#/definitions/VersionOverrideValue"
+        },
+        "default": {
+          "title": "Default",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
     },
     "documentation": {
       "title": "Documentation URL",
@@ -70,5 +121,17 @@
   "required": [
     "name",
     "tags"
-  ]
+  ],
+  "definitions": {
+    "VersionOverrideValue": {
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    }
+  }
 }

src/views/develop/caniuse/schemas/feature.schema.json

@@ -71,7 +71,8 @@ export default class CanIUseDataGenPlugin {
           entry.documentation = feature.documentation;
         }
         for (let firmware of firmwares) {
-          const override = feature.version_override?.[firmware.major];
+          const override = feature.version_override && (firmware.major in feature.version_override ?
+            feature.version_override?.[firmware.major] : feature.version_override?.default);
           const version = override !== undefined ? override : (await featureVersion(feature, firmware))?.format();
           if (version) {
             entry.versions[firmware.major] = version;

webpack/caniuse/data-plugin.js

@@ -6,7 +6,7 @@
  * @interface
  * @property {string} name
  * @property {string} [warning]
- * @property {Record<WebOSMajor, string>} [version_override]
+ * @property {Record<WebOSMajor | 'default', string>} [version_override]
  * @property {string} [documentation]
  * @property {string[]} tags
  */