Removes static UniversalProperties property from capabilities in favor of exported enum

unematiii · unematiii · commit 1edc7fd30e69 · 2021-04-29T19:11:08.000+03:00
diff --git a/auto-api b/auto-api
@@ -1 +1 @@
-Subproject commit d388db52e67c583f7416f096775092e3b4ecb4ba
+Subproject commit 65cf106c869ffcce2e1248c4ed53ea41cce07608
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@highmobility/auto-api-javascript",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Auto API for JavaScript - the parsing library for the Auto API vehicle data model",
   "main": "lib/index.js",
   "module": "es/index.js",
diff --git a/scripts/generate-capabilities.ts b/scripts/generate-capabilities.ts
@@ -99,18 +99,16 @@ function createNameDeclaration(name: string) {
 }
 
 function createPropertiesDeclaration() {
-  return [PropertiesToken, UniversalPropertiesToken].map((token) =>
-    ts.factory.createPropertyDeclaration(
-      undefined,
-      [
-        ts.factory.createModifier(ts.SyntaxKind.StaticKeyword),
-        ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
-      ],
-      ts.factory.createIdentifier(token),
-      undefined,
-      undefined,
-      ts.factory.createIdentifier(token),
-    ),
+  return ts.factory.createPropertyDeclaration(
+    undefined,
+    [
+      ts.factory.createModifier(ts.SyntaxKind.StaticKeyword),
+      ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
+    ],
+    ts.factory.createIdentifier(PropertiesToken),
+    undefined,
+    undefined,
+    ts.factory.createIdentifier(PropertiesToken),
   );
 }
 
@@ -157,7 +155,7 @@ function createCapabilityClassDefinition(className: string, capability: Capabili
     [
       createIdentifierDeclaration(capability),
       createNameDeclaration(capability.name),
-      ...createPropertiesDeclaration(),
+      createPropertiesDeclaration(),
       createConstructorDeclaration(className),
     ],
   );
diff --git a/src/capabilities/Adas.ts b/src/capabilities/Adas.ts
@@ -24,7 +24,6 @@ export class Adas extends Capability<`${Properties}` | `${UniversalProperties}`>
   };
   static readonly Name = 'adas';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(Configuration.getCapabilityDefinition(Adas.Name), Configuration.getUniversalProperties());
   }
diff --git a/src/capabilities/Browser.ts b/src/capabilities/Browser.ts
@@ -14,7 +14,6 @@ export class Browser extends Capability<`${Properties}` | `${UniversalProperties
   };
   static readonly Name = 'browser';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Browser.Name),
diff --git a/src/capabilities/Capabilities.ts b/src/capabilities/Capabilities.ts
@@ -15,7 +15,6 @@ export class Capabilities extends Capability<`${Properties}` | `${UniversalPrope
   };
   static readonly Name = 'capabilities';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Capabilities.Name),
diff --git a/src/capabilities/Charging.ts b/src/capabilities/Charging.ts
@@ -46,7 +46,6 @@ export class Charging extends Capability<`${Properties}` | `${UniversalPropertie
   };
   static readonly Name = 'charging';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Charging.Name),
diff --git a/src/capabilities/ChargingSession.ts b/src/capabilities/ChargingSession.ts
@@ -27,7 +27,6 @@ export class ChargingSession extends Capability<`${Properties}` | `${UniversalPr
   };
   static readonly Name = 'charging_session';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(ChargingSession.Name),
diff --git a/src/capabilities/ChassisSettings.ts b/src/capabilities/ChassisSettings.ts
@@ -21,7 +21,6 @@ export class ChassisSettings extends Capability<`${Properties}` | `${UniversalPr
   };
   static readonly Name = 'chassis_settings';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(ChassisSettings.Name),
diff --git a/src/capabilities/Climate.ts b/src/capabilities/Climate.ts
@@ -24,7 +24,6 @@ export class Climate extends Capability<`${Properties}` | `${UniversalProperties
   };
   static readonly Name = 'climate';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Climate.Name),
diff --git a/src/capabilities/Crash.ts b/src/capabilities/Crash.ts
@@ -19,7 +19,6 @@ export class Crash extends Capability<`${Properties}` | `${UniversalProperties}`
   };
   static readonly Name = 'crash';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Crash.Name),
diff --git a/src/capabilities/CruiseControl.ts b/src/capabilities/CruiseControl.ts
@@ -18,7 +18,6 @@ export class CruiseControl extends Capability<`${Properties}` | `${UniversalProp
   };
   static readonly Name = 'cruise_control';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(CruiseControl.Name),
diff --git a/src/capabilities/DashboardLights.ts b/src/capabilities/DashboardLights.ts
@@ -15,7 +15,6 @@ export class DashboardLights extends Capability<`${Properties}` | `${UniversalPr
   };
   static readonly Name = 'dashboard_lights';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(DashboardLights.Name),
diff --git a/src/capabilities/Diagnostics.ts b/src/capabilities/Diagnostics.ts
@@ -63,7 +63,6 @@ export class Diagnostics extends Capability<`${Properties}` | `${UniversalProper
   };
   static readonly Name = 'diagnostics';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Diagnostics.Name),
diff --git a/src/capabilities/Doors.ts b/src/capabilities/Doors.ts
@@ -18,7 +18,6 @@ export class Doors extends Capability<`${Properties}` | `${UniversalProperties}`
   };
   static readonly Name = 'doors';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Doors.Name),
diff --git a/src/capabilities/DriverFatigue.ts b/src/capabilities/DriverFatigue.ts
@@ -14,7 +14,6 @@ export class DriverFatigue extends Capability<`${Properties}` | `${UniversalProp
   };
   static readonly Name = 'driver_fatigue';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(DriverFatigue.Name),
diff --git a/src/capabilities/Engine.ts b/src/capabilities/Engine.ts
@@ -16,7 +16,6 @@ export class Engine extends Capability<`${Properties}` | `${UniversalProperties}
   };
   static readonly Name = 'engine';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Engine.Name),
diff --git a/src/capabilities/FailureMessage.ts b/src/capabilities/FailureMessage.ts
@@ -18,7 +18,6 @@ export class FailureMessage extends Capability<`${Properties}` | `${UniversalPro
   };
   static readonly Name = 'failure_message';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(FailureMessage.Name),
diff --git a/src/capabilities/FirmwareVersion.ts b/src/capabilities/FirmwareVersion.ts
@@ -16,7 +16,6 @@ export class FirmwareVersion extends Capability<`${Properties}` | `${UniversalPr
   };
   static readonly Name = 'firmware_version';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(FirmwareVersion.Name),
diff --git a/src/capabilities/Fueling.ts b/src/capabilities/Fueling.ts
@@ -15,7 +15,6 @@ export class Fueling extends Capability<`${Properties}` | `${UniversalProperties
   };
   static readonly Name = 'fueling';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Fueling.Name),
diff --git a/src/capabilities/Graphics.ts b/src/capabilities/Graphics.ts
@@ -14,7 +14,6 @@ export class Graphics extends Capability<`${Properties}` | `${UniversalPropertie
   };
   static readonly Name = 'graphics';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Graphics.Name),
diff --git a/src/capabilities/HeartRate.ts b/src/capabilities/HeartRate.ts
@@ -14,7 +14,6 @@ export class HeartRate extends Capability<`${Properties}` | `${UniversalProperti
   };
   static readonly Name = 'heart_rate';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(HeartRate.Name),
diff --git a/src/capabilities/Historical.ts b/src/capabilities/Historical.ts
@@ -17,7 +17,6 @@ export class Historical extends Capability<`${Properties}` | `${UniversalPropert
   };
   static readonly Name = 'historical';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Historical.Name),
diff --git a/src/capabilities/HomeCharger.ts b/src/capabilities/HomeCharger.ts
@@ -29,7 +29,6 @@ export class HomeCharger extends Capability<`${Properties}` | `${UniversalProper
   };
   static readonly Name = 'home_charger';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(HomeCharger.Name),
diff --git a/src/capabilities/HonkHornFlashLights.ts b/src/capabilities/HonkHornFlashLights.ts
@@ -18,7 +18,6 @@ export class HonkHornFlashLights extends Capability<`${Properties}` | `${Univers
   };
   static readonly Name = 'honk_horn_flash_lights';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(HonkHornFlashLights.Name),
diff --git a/src/capabilities/Hood.ts b/src/capabilities/Hood.ts
@@ -16,7 +16,6 @@ export class Hood extends Capability<`${Properties}` | `${UniversalProperties}`>
   };
   static readonly Name = 'hood';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(Configuration.getCapabilityDefinition(Hood.Name), Configuration.getUniversalProperties());
   }
diff --git a/src/capabilities/Ignition.ts b/src/capabilities/Ignition.ts
@@ -16,7 +16,6 @@ export class Ignition extends Capability<`${Properties}` | `${UniversalPropertie
   };
   static readonly Name = 'ignition';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Ignition.Name),
diff --git a/src/capabilities/KeyfobPosition.ts b/src/capabilities/KeyfobPosition.ts
@@ -14,7 +14,6 @@ export class KeyfobPosition extends Capability<`${Properties}` | `${UniversalPro
   };
   static readonly Name = 'keyfob_position';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(KeyfobPosition.Name),
diff --git a/src/capabilities/LightConditions.ts b/src/capabilities/LightConditions.ts
@@ -15,7 +15,6 @@ export class LightConditions extends Capability<`${Properties}` | `${UniversalPr
   };
   static readonly Name = 'light_conditions';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(LightConditions.Name),
diff --git a/src/capabilities/Lights.ts b/src/capabilities/Lights.ts
@@ -23,7 +23,6 @@ export class Lights extends Capability<`${Properties}` | `${UniversalProperties}
   };
   static readonly Name = 'lights';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Lights.Name),
diff --git a/src/capabilities/Maintenance.ts b/src/capabilities/Maintenance.ts
@@ -31,7 +31,6 @@ export class Maintenance extends Capability<`${Properties}` | `${UniversalProper
   };
   static readonly Name = 'maintenance';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Maintenance.Name),
diff --git a/src/capabilities/Messaging.ts b/src/capabilities/Messaging.ts
@@ -15,7 +15,6 @@ export class Messaging extends Capability<`${Properties}` | `${UniversalProperti
   };
   static readonly Name = 'messaging';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Messaging.Name),
diff --git a/src/capabilities/Mobile.ts b/src/capabilities/Mobile.ts
@@ -14,7 +14,6 @@ export class Mobile extends Capability<`${Properties}` | `${UniversalProperties}
   };
   static readonly Name = 'mobile';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Mobile.Name),
diff --git a/src/capabilities/MultiCommand.ts b/src/capabilities/MultiCommand.ts
@@ -15,7 +15,6 @@ export class MultiCommand extends Capability<`${Properties}` | `${UniversalPrope
   };
   static readonly Name = 'multi_command';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(MultiCommand.Name),
diff --git a/src/capabilities/NaviDestination.ts b/src/capabilities/NaviDestination.ts
@@ -19,7 +19,6 @@ export class NaviDestination extends Capability<`${Properties}` | `${UniversalPr
   };
   static readonly Name = 'navi_destination';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(NaviDestination.Name),
diff --git a/src/capabilities/Notifications.ts b/src/capabilities/Notifications.ts
@@ -17,7 +17,6 @@ export class Notifications extends Capability<`${Properties}` | `${UniversalProp
   };
   static readonly Name = 'notifications';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Notifications.Name),
diff --git a/src/capabilities/Offroad.ts b/src/capabilities/Offroad.ts
@@ -15,7 +15,6 @@ export class Offroad extends Capability<`${Properties}` | `${UniversalProperties
   };
   static readonly Name = 'offroad';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Offroad.Name),
diff --git a/src/capabilities/ParkingBrake.ts b/src/capabilities/ParkingBrake.ts
@@ -14,7 +14,6 @@ export class ParkingBrake extends Capability<`${Properties}` | `${UniversalPrope
   };
   static readonly Name = 'parking_brake';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(ParkingBrake.Name),
diff --git a/src/capabilities/ParkingTicket.ts b/src/capabilities/ParkingTicket.ts
@@ -18,7 +18,6 @@ export class ParkingTicket extends Capability<`${Properties}` | `${UniversalProp
   };
   static readonly Name = 'parking_ticket';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(ParkingTicket.Name),
diff --git a/src/capabilities/PowerTakeoff.ts b/src/capabilities/PowerTakeoff.ts
@@ -15,7 +15,6 @@ export class PowerTakeoff extends Capability<`${Properties}` | `${UniversalPrope
   };
   static readonly Name = 'power_takeoff';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(PowerTakeoff.Name),
diff --git a/src/capabilities/Race.ts b/src/capabilities/Race.ts
@@ -31,7 +31,6 @@ export class Race extends Capability<`${Properties}` | `${UniversalProperties}`>
   };
   static readonly Name = 'race';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(Configuration.getCapabilityDefinition(Race.Name), Configuration.getUniversalProperties());
   }
diff --git a/src/capabilities/RemoteControl.ts b/src/capabilities/RemoteControl.ts
@@ -16,7 +16,6 @@ export class RemoteControl extends Capability<`${Properties}` | `${UniversalProp
   };
   static readonly Name = 'remote_control';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(RemoteControl.Name),
diff --git a/src/capabilities/RooftopControl.ts b/src/capabilities/RooftopControl.ts
@@ -19,7 +19,6 @@ export class RooftopControl extends Capability<`${Properties}` | `${UniversalPro
   };
   static readonly Name = 'rooftop_control';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(RooftopControl.Name),
diff --git a/src/capabilities/Seats.ts b/src/capabilities/Seats.ts
@@ -15,7 +15,6 @@ export class Seats extends Capability<`${Properties}` | `${UniversalProperties}`
   };
   static readonly Name = 'seats';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Seats.Name),
diff --git a/src/capabilities/Tachograph.ts b/src/capabilities/Tachograph.ts
@@ -20,7 +20,6 @@ export class Tachograph extends Capability<`${Properties}` | `${UniversalPropert
   };
   static readonly Name = 'tachograph';
   static readonly Properties = Properties;
-  static readonly UniversalProperties = UniversalProperties;
   constructor() {
     super(
       Configuration.getCapabilityDefinition(Tachograph.Name),
diff --git a/src/capabilities/TextInput.ts b/src/capabilities/TextInput.ts
diff --git a/src/capabilities/TheftAlarm.ts b/src/capabilities/TheftAlarm.ts
diff --git a/src/capabilities/Trips.ts b/src/capabilities/Trips.ts
diff --git a/src/capabilities/Trunk.ts b/src/capabilities/Trunk.ts
diff --git a/src/capabilities/Usage.ts b/src/capabilities/Usage.ts
diff --git a/src/capabilities/ValetMode.ts b/src/capabilities/ValetMode.ts
diff --git a/src/capabilities/VehicleInformation.ts b/src/capabilities/VehicleInformation.ts
diff --git a/src/capabilities/VehicleLocation.ts b/src/capabilities/VehicleLocation.ts
diff --git a/src/capabilities/VehicleStatus.ts b/src/capabilities/VehicleStatus.ts
diff --git a/src/capabilities/VehicleTime.ts b/src/capabilities/VehicleTime.ts
diff --git a/src/capabilities/VideoHandover.ts b/src/capabilities/VideoHandover.ts
diff --git a/src/capabilities/WakeUp.ts b/src/capabilities/WakeUp.ts
diff --git a/src/capabilities/WeatherConditions.ts b/src/capabilities/WeatherConditions.ts
diff --git a/src/capabilities/WiFi.ts b/src/capabilities/WiFi.ts
diff --git a/src/capabilities/Windows.ts b/src/capabilities/Windows.ts
diff --git a/src/capabilities/Windscreen.ts b/src/capabilities/Windscreen.ts
diff --git a/src/configuration/configuration.json b/src/configuration/configuration.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@highmobility/auto-api-javascript",`
`3`		`- "version": "0.0.9",`
	`3`	`+ "version": "0.0.10",`
`4`	`4`	`"description": "Auto API for JavaScript - the parsing library for the Auto API vehicle data model",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"module": "es/index.js",`
Original file line number	Diff line number	Diff line change
@@ -24,7 +24,6 @@ export class Adas extends Capability<`${Properties}` \| `${UniversalProperties}`>
`24`	`24`	`};`
`25`	`25`	`static readonly Name = 'adas';`
`26`	`26`	`static readonly Properties = Properties;`
`27`		`- static readonly UniversalProperties = UniversalProperties;`
`28`	`27`	`constructor() {`
`29`	`28`	`super(Configuration.getCapabilityDefinition(Adas.Name), Configuration.getUniversalProperties());`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
@@ -16,7 +16,6 @@ export class Hood extends Capability<`${Properties}` \| `${UniversalProperties}`>
`16`	`16`	`};`
`17`	`17`	`static readonly Name = 'hood';`
`18`	`18`	`static readonly Properties = Properties;`
`19`		`- static readonly UniversalProperties = UniversalProperties;`
`20`	`19`	`constructor() {`
`21`	`20`	`super(Configuration.getCapabilityDefinition(Hood.Name), Configuration.getUniversalProperties());`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
@@ -31,7 +31,6 @@ export class Race extends Capability<`${Properties}` \| `${UniversalProperties}`>
`31`	`31`	`};`
`32`	`32`	`static readonly Name = 'race';`
`33`	`33`	`static readonly Properties = Properties;`
`34`		`- static readonly UniversalProperties = UniversalProperties;`
`35`	`34`	`constructor() {`
`36`	`35`	`super(Configuration.getCapabilityDefinition(Race.Name), Configuration.getUniversalProperties());`
`37`	`36`	`}`