Fix a couple of versions and botched merge

project-chip · Sep 9, 2024 · 9f31d80 · 9f31d80
1 parent 381dcd2
commit 9f31d80
Show file tree

Hide file tree

Showing 8 changed files with 476 additions and 320 deletions.
diff --git a/codegen/src/util/TsFile.ts b/codegen/src/util/TsFile.ts
@@ -5,7 +5,7 @@
  */
 
 import { InternalError, serialize } from "@project-chip/matter.js-general";
-import { Specification } from "../../../packages/model/dist/esm/definitions/Specification.js";
+import { Specification } from "@project-chip/matter.js-model";
 import { readMatterFile, relative, writeMatterFile } from "./file.js";
 import { asObjectKey, wordWrap } from "./string.js";
 

diff --git a/codegen/src/util/finalize-model.ts b/codegen/src/util/finalize-model.ts
@@ -6,6 +6,7 @@
 
 import { isDeepEqual, Logger } from "@project-chip/matter.js-general";
 import {
+    AnyElement,
     AttributeModel,
     ClusterModel,
     CommandModel,
@@ -106,7 +107,7 @@ function patchClusterTypes(cluster: ClusterModel) {
             return;
         }
 
-        cluster.add(
+        cluster.children.push(
             new DatatypeModel({
                 name: model.name,
                 type: model.type,
@@ -222,7 +223,7 @@ function ejectZigbee(model: Model, zigbeeFeatures?: string[]) {
         ejectZigbee(child, zigbeeFeatures);
     }
     if (filtered.length !== model.children.length) {
-        model.children = filtered;
+        model.children = filtered as AnyElement[];
     }
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/general/package.json b/packages/general/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js-general",
-    "version": "0.10.1-alpha.0-20240903-7cffa11d",
+    "version": "git",
     "description": "Non-Matter support for Matter.js",
     "keywords": [
         "iot",
@@ -35,7 +35,7 @@
         "@noble/curves": "^1.5.0"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.10.1-alpha.0-20240903-7cffa11d",
+        "@project-chip/matter.js-tools": "*",
         "typescript": "~5.5.3"
     },
     "files": [

diff --git a/packages/matter-node.js/test/session/SessionManagerTest.ts b/packages/matter-node.js/test/session/SessionManagerTest.ts
@@ -6,7 +6,7 @@
 
 import { StorageBackendMemory, StorageContext } from "@project-chip/matter.js-general";
 import { NodeId } from "@project-chip/matter.js/datatype";
-import { SessionManager } from "@project-chip/matter.js/session";
+import { SessionManager, SessionParameters } from "@project-chip/matter.js/session";
 import * as assert from "assert";
 
 const DUMMY_BYTEARRAY = new Uint8Array();

diff --git a/packages/matter.js/package.json b/packages/matter.js/package.json
@@ -34,8 +34,8 @@
     },
     "dependencies": {
         "@noble/curves": "^1.5.0",
-        "@project-chip/matter.js-general": "0.10.1-alpha.0-20240903-7cffa11d",
-        "@project-chip/matter.js-model": "0.10.1-alpha.0-20240903-7cffa11d"
+        "@project-chip/matter.js-general": "*",
+        "@project-chip/matter.js-model": "*"
     },
     "devDependencies": {
         "@project-chip/matter.js-tools": "*",
@@ -201,4 +201,4 @@
     "publishConfig": {
         "access": "public"
     }
-}
+}
diff --git a/packages/matter.js/src/protocol/securechannel/SecureChannelMessenger.ts b/packages/matter.js/src/protocol/securechannel/SecureChannelMessenger.ts
@@ -7,6 +7,7 @@
 import { MatterError, UnexpectedDataError } from "@project-chip/matter.js-general";
 import { Message } from "../../codec/MessageCodec.js";
 import { ExchangeSendOptions, MessageExchange } from "../../protocol/MessageExchange.js";
+import { SessionContext } from "../../session/Session.js";
 import { TlvSchema } from "../../tlv/TlvSchema.js";
 import {
     GeneralStatusCode,
@@ -15,7 +16,6 @@ import {
     SECURE_CHANNEL_PROTOCOL_ID,
 } from "./SecureChannelMessages.js";
 import { TlvSecureChannelStatusMessage } from "./SecureChannelStatusMessageSchema.js";
-import { SessionContext } from "../../session/Session.js";
 
 /** Error base Class for all errors related to the status response messages. */
 export class ChannelStatusResponseError extends MatterError {

diff --git a/packages/model/package.json b/packages/model/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js-model",
-    "version": "0.10.1-alpha.0-20240903-7cffa11d",
+    "version": "git",
     "description": "Matter data model",
     "keywords": [
         "iot",
@@ -33,10 +33,10 @@
     },
     "dependencies": {
         "@noble/curves": "^1.5.0",
-        "@project-chip/matter.js-general": "0.10.1-alpha.0-20240903-7cffa11d"
+        "@project-chip/matter.js-general": "*"
     },
     "devDependencies": {
-        "@project-chip/matter.js-tools": "0.10.1-alpha.0-20240903-7cffa11d",
+        "@project-chip/matter.js-tools": "*",
         "typescript": "~5.5.3"
     },
     "files": [