Fix clients cannot resolve some types (2nd try) (#544)

Signed-off-by: Florian Hotze <dev@florianhotze.com>

Author: florian-h05

build/tsconfig.json

@@ -1,6 +1,6 @@
 {
   // Change this to match your project
-  "include": ["../src/**/*.js", "../src/globals.d.ts"],
+  "include": ["../src/**/*.js", "../src/globals.d.ts", "../src/java.d.ts"],
   "exclude": [
     "../src/helpers.js",
     "../src/index.js",

src/globals.d.ts

@@ -1,70 +1,15 @@
-declare global {
-  /**
-   * Native Java Class Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html java.lang.Class})
-   */
-  type JavaClass = object;
-  /**
-   * Native Java BigDecimal (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html java.math.BigDecimal})
-   */
-  type JavaBigDecimal = object;
-  /**
-   * Native Java Set Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Set.html java.util.Set})
-   */
-  type JavaSet = object;
-  /**
-   * Native Java List Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html java.util.List})
-   */
-  type JavaList = object;
-  /**
-   * Native Java Map Object (implementation of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html java.util.Map})
-   */
-  type JavaMap = object;
-  /**
-   * Native Java Instant Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Instant.html java.time.Instant})
-   */
-  type JavaInstant = object;
-  /**
-   * Native Java ZonedDateTime Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/ZonedDateTime.html java.time.ZonedDateTime})
-   */
-  type JavaZonedDateTime = object;
-  /**
-   * Native Java openHAB State (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/types/state org.openhab.core.types.State})
-   */
-  type HostState = object;
-  /**
-   * Native Java openHAB Item (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/items/item org.openhab.core.items.Item})
-   */
-  type HostItem = object;
-  /**
-   * Native Javea openHAB Rule (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/automation/rule org.openhab.core.automation.Rule})
-   */
-  type HostRule = object;
-  /**
-   * Native Java openHAB Trigger (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/automation/trigger org.openhab.core.automation.Trigger})
-   */
-  type HostTrigger = object;
-  /**
-   * Native Java openHAB Thing (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/thing/thing org.openhab.core.thing.Thing})
-   */
-  type HostThing = object;
-  /**
-   * Native Java openHAB GroupFunction (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/items/groupfunction org.openhab.core.items.GroupFunction})
-   */
-  type HostGroupFunction = object;
-  /**
-   * Native Java openHAB QuantityType (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/library/types/quantitytype org.openhab.core.library.types.QuantityType})
-   */
-  type QuantityType = object;
+/// <reference path="./java.d.ts" />
 
+declare global {
   namespace items {
     type Item = InstanceType<typeof import('./items/items').Item>;
     type ItemConfig = import('./items/items').ItemConfig;
     type ItemMetadata = InstanceType<typeof import('./items/metadata').ItemMetadata>;
     type TimeSeries = InstanceType<typeof import('./items/time-series')>;
-    type ItemPersistence = InstanceType<typeof import('./items/item-persistence')>;
-    type ItemSemantics = InstanceType<typeof import('./items/item-semantics')>;
-    type PersistedItem = InstanceType<typeof import('./items/item-persistence').PersistedItem>;
-    type PersistedState = InstanceType<typeof import('./items/item-persistence').PersistedState>;
+    type ItemPersistence = InstanceType<typeof import('./items/items').ItemPersistence>;
+    type ItemSemantics = InstanceType<typeof import('./items/items').ItemSemantics>;
+    type PersistedItem = InstanceType<typeof import('./items/items').PersistedItem>;
+    type PersistedState = InstanceType<typeof import('./items/items').PersistedState>;
   }
 
   namespace time {

src/java.d.ts

@@ -0,0 +1,60 @@
+declare global {
+  /**
+   * Native Java Class Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html java.lang.Class})
+   */
+  type JavaClass = object;
+  /**
+   * Native Java BigDecimal (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html java.math.BigDecimal})
+   */
+  type JavaBigDecimal = object;
+  /**
+   * Native Java Set Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Set.html java.util.Set})
+   */
+  type JavaSet = object;
+  /**
+   * Native Java List Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html java.util.List})
+   */
+  type JavaList = object;
+  /**
+   * Native Java Map Object (implementation of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html java.util.Map})
+   */
+  type JavaMap = object;
+  /**
+   * Native Java Instant Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Instant.html java.time.Instant})
+   */
+  type JavaInstant = object;
+  /**
+   * Native Java ZonedDateTime Object (instance of {@link https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/ZonedDateTime.html java.time.ZonedDateTime})
+   */
+  type JavaZonedDateTime = object;
+  /**
+   * Native Java openHAB State (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/types/state org.openhab.core.types.State})
+   */
+  type HostState = object;
+  /**
+   * Native Java openHAB Item (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/items/item org.openhab.core.items.Item})
+   */
+  type HostItem = object;
+  /**
+   * Native Java openHAB Rule (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/automation/rule org.openhab.core.automation.Rule})
+   */
+  type HostRule = object;
+  /**
+   * Native Java openHAB Trigger (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/automation/trigger org.openhab.core.automation.Trigger})
+   */
+  type HostTrigger = object;
+  /**
+   * Native Java openHAB Thing (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/thing/thing org.openhab.core.thing.Thing})
+   */
+  type HostThing = object;
+  /**
+   * Native Java openHAB GroupFunction (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/items/groupfunction org.openhab.core.items.GroupFunction})
+   */
+  type HostGroupFunction = object;
+  /**
+   * Native Java openHAB QuantityType (instance of {@link https://www.openhab.org/javadoc/latest/org/openhab/core/library/types/quantitytype org.openhab.core.library.types.QuantityType})
+   */
+  type QuantityType = object;
+}
+
+export {}

types/openhab-js.d.ts

@@ -1,4 +1,33 @@
-/// <reference path="../src/globals.d.ts" />
+/// <reference path="../src/java.d.ts" />
+
+declare global {
+  namespace items {
+    type Item = import('./items/items').Item;
+    type ItemConfig = import('./items/items').ItemConfig;
+    type ItemMetadata = import('./items/metadata').ItemMetadata;
+    type TimeSeries = import('./items/time-series');
+    type ItemPersistence = import('./items/items').ItemPersistence;
+    type ItemSemantics = import('./items/items').ItemSemantics;
+    type PersistedItem = InstanceType<typeof import('./items/item-persistence').PersistedItem>;
+    type PersistedState = InstanceType<typeof import('./items/item-persistence').PersistedState>;
+  }
+
+  namespace time {
+    type ZonedDateTime = import('@js-joda/core').ZonedDateTime;
+    type Instant = import('@js-joda/core').Instant;
+    type Duration = import('@js-joda/core').Duration;
+    type LocalDateTime = import('@js-joda/core').LocalDateTime;
+    type LocalTime = import('@js-joda/core').LocalTime;
+    type LocalDate = import('@js-joda/core').LocalDate;
+  }
+
+  namespace rules {
+    type RuleCallback = import('./rules/rules').RuleCallback;
+    type RuleConfig = import('./rules/rules').RuleConfig;
+  }
+
+  type Quantity = import('./quantity').Quantity;
+}
 
 // Manually written type definitions to avoid problems with lazy loading in index.js
 export const log: typeof import("./log");