bump @jwetzell/osc to v1.6.0

Bump @types/node from 22.7.5 to 22.7.7

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Joel Wetzell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package-lock.json

@@ -255,9 +255,9 @@
       "peer": true
     },
     "node_modules/@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
+      "version": "22.7.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
+      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
       "dev": true,
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -3651,10 +3651,10 @@
     },
     "packages/osc": {
       "name": "@jwetzell/osc",
-      "version": "1.4.0",
+      "version": "1.6.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "22.7.5",
+        "@types/node": "22.7.7",
         "rimraf": "6.0.1",
         "typescript": "5.6.3"
       }

packages/osc/package.json

@@ -1,12 +1,23 @@
 {
   "name": "@jwetzell/osc",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js",
+      "types": "./dist/types/index.d.ts"
+    }
+  },
   "scripts": {
     "prebuild": "rimraf dist",
-    "build": "tsc",
+    "build": "npm run build:cjs && npm run build:esm && npm run build:types",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:types": "tsc -p tsconfig.types.json",
     "prepublishOnly": "npm run build",
     "pretest": "npm run build",
     "test": "node --test --experimental-test-coverage"
@@ -25,7 +36,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "22.7.5",
+    "@types/node": "22.7.7",
     "rimraf": "6.0.1",
     "typescript": "5.6.3"
   }

packages/osc/src/index.ts

@@ -1,3 +1,17 @@
+import { bundleFromBuffer } from './bundle';
+import { messageFromBuffer } from './message';
+import { OSCBundle, OSCMessage } from './models';
+
 export * from './models';
 export * from './message';
 export * from './bundle';
+
+export function fromBuffer(bytes: Uint8Array): [OSCBundle | OSCMessage | undefined, Uint8Array | undefined] {
+    if (bytes[0] === 47) { // starts with '/'
+        return messageFromBuffer(bytes);
+    } else if (bytes[0] === 35) { // starts with '#'
+        return bundleFromBuffer(bytes)
+    } else {
+        throw new Error('bytes do not look like an OSC message or bundle');
+    }
+}

packages/osc/tests/bundle-decode.test.js

@@ -1,6 +1,6 @@
 const { deepEqual, equal, throws } = require('assert');
 const { describe, it } = require('node:test');
-const osc = require('../dist/index');
+const osc = require('../dist/cjs/index');
 
 const goodTests = [
   {

packages/osc/tests/bundle-encode.test.js

@@ -1,6 +1,6 @@
 const { deepEqual } = require('assert');
 const { describe, it } = require('node:test');
-const osc = require('../dist/index');
+const osc = require('../dist/cjs/index');
 
 const tests = [
   {

packages/osc/tests/decode.test.js

@@ -0,0 +1,41 @@
+const { deepEqual, equal } = require('assert');
+const { describe, it } = require('node:test');
+const osc = require('../dist/cjs/index');
+
+const tests = [
+    {
+        description: 'simple bundle',
+        expected: {
+          timeTag: [32, 0],
+          contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }],
+        },
+        bytes: new Uint8Array([
+          ...new TextEncoder().encode('#bundle'),
+          ...new Uint8Array([0x00]),
+          ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+          ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+          ...new Uint8Array([
+            0x2f, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x34, 0x2f, 0x66, 0x72, 0x65, 0x71,
+            0x75, 0x65, 0x6e, 0x63, 0x79, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x43, 0xdc, 0x00, 0x00,
+          ]),
+        ]),
+      },
+      {
+        description: 'osc 1.0 spec example 1',
+        bytes: new Uint8Array([
+          47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
+          102, 0, 0, 67, 220, 0, 0,
+        ]),
+        expected: { address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] },
+      },
+]
+
+describe('OSC Bytes Decoding', () => {
+    tests.forEach((bytesTest) => {
+      it(bytesTest.description, () => {
+        const [decoded, remainingBytes] = osc.fromBuffer(bytesTest.bytes);
+        deepEqual(decoded, bytesTest.expected);
+        equal(remainingBytes.length, 0)
+      });
+    });
+  });

packages/osc/tests/message-decode.test.js

@@ -1,6 +1,6 @@
 const { deepEqual, throws, equal } = require('assert');
 const { describe, it } = require('node:test');
-const osc = require('../dist/index');
+const osc = require('../dist/cjs/index');
 
 const goodTests = [
   {

packages/osc/tests/message-encode.test.js

@@ -1,6 +1,6 @@
 const { deepEqual, throws } = require('assert');
 const { describe, it } = require('node:test');
-const osc = require('../dist/index');
+const osc = require('../dist/cjs/index');
 
 const goodTests = [
   {

packages/osc/tsconfig.cjs.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "CommonJS",
+    "declaration": false,
+    "outDir": "./dist/cjs"
+  }
+}

packages/osc/tsconfig.esm.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "ESNext",
+    "declaration": false,
+    "outDir": "./dist/esm"
+  }
+}

packages/osc/tsconfig.json

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
+    "moduleResolution": "Node",
+    "lib": ["ESNext"],
+    "target": "ESNext",
     "esModuleInterop": true,
-    "module": "commonjs",
-    "target": "ES2020",
-    "declaration": true,
-    "rootDir": "./src",
-    "strict": true,
-    "outDir": "dist"
+    "isolatedModules": true,
+    "rootDir": "src/",
+    "strict": true
   },
-  "exclude": ["node_modules", "dist", "examples"]
+  "include": ["src/"]
 }

packages/osc/tsconfig.types.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "outDir": "./dist/types"
+  }
+}