Update lights to lighting

the-via · Nov 3, 2019 · 8b68720 · 8b68720
1 parent aa12518
commit 8b68720
Show file tree

Hide file tree

Showing 48 changed files with 6,513 additions and 95 deletions.
diff --git a/lib/keyboard.definition.validator.ts b/lib/keyboard.definition.validator.ts
@@ -21,8 +21,8 @@ export const KeyboardDefinitionSchema = {
   defaultProperties: [],
   definitions: {
     LightingSupport: {
-      enum: [0, 1, 2, 3],
-      type: 'number'
+      enum: ['none', 'qmk_backlight', 'wt_rgb_backlight', 'wt_mono_backlight'],
+      type: 'string'
     },
     'Partial<{c:string;t:string;x:number;y:number;w:number;a:number;}>': {
       defaultProperties: [],
@@ -82,7 +82,7 @@ export const KeyboardDefinitionSchema = {
       defaultProperties: [],
       type: 'object'
     },
-    lights: {
+    lighting: {
       $ref: '#/definitions/LightingSupport'
     },
     name: {
@@ -95,7 +95,7 @@ export const KeyboardDefinitionSchema = {
       type: 'string'
     }
   },
-  required: ['layouts', 'lights', 'name', 'productId', 'vendorId', 'matrix'],
+  required: ['layouts', 'lighting', 'name', 'productId', 'vendorId', 'matrix'],
   type: 'object'
 };
 export type ValidateFunction<T> = ((data: unknown) => data is T) &

diff --git a/lib/transform.ts b/lib/transform.ts
@@ -12,14 +12,14 @@ function getVendorProductId({productId, vendorId}: KeyboardDefinition): number {
 export function keyboardDefinitionToVIADefinition(
   definition: KeyboardDefinition
 ): VIADefinition {
-  const {name, lights, matrix} = definition;
+  const {name, lighting, matrix} = definition;
   const layouts = Object.entries(definition.layouts).reduce(
     (p, [k, v]) => ({...p, [k]: generateParsedKLE(v)}),
     {}
   );
   return {
     name,
-    lights,
+    lighting,
     layouts,
     matrix,
     vendorProductId: getVendorProductId(definition)

diff --git a/lib/types.ts b/lib/types.ts
@@ -64,15 +64,15 @@ export type KeyboardDefinition = {
   name: string;
   vendorId: string;
   productId: string;
-  lights: LightingSupport;
+  lighting: LightingSupport;
   matrix: MatrixInfo;
   layouts: {[name: string]: KLELayoutDefinition};
 };
 
 export type VIADefinition = {
   name: string;
   vendorProductId: number;
-  lights: LightingSupport;
+  lighting: LightingSupport;
   matrix: MatrixInfo;
   layouts: {
     [layoutName: string]: {