@ebusd/ebus-typespec 0.1.0 → 0.3.0

package/dist/src/tsp2ebusd.js

@@ -0,0 +1,210 @@
+#!/usr/bin/env node
+import { compile, createSourceFile, formatDiagnostic, NodeHost } from "@typespec/compiler";
+import { createWriteStream } from "fs";
+import { readFile } from "node:fs/promises";
+import { createConnection } from "node:net";
+import { createInterface } from "node:readline";
+import { extname, isAbsolute, resolve } from "path";
+let outFile = undefined;
+async function run() {
+    const args = process.argv.slice(2);
+    let inFiles = [];
+    let outFileName = undefined;
+    let ebusdHostPort = undefined;
+    for (let idx = 0; idx < args.length; idx++) {
+        const arg = args[idx];
+        if (arg === '-') {
+            break;
+        }
+        if (arg[0] !== '-') {
+            inFiles = args.slice(idx);
+            break;
+        }
+        if (arg === '-h' || arg === '--help') {
+            const helpTxt = [
+                'usage: tsp2ebusd [-e host[:port]] [-o outfile] [infile*]',
+                'converts eBUS TypeSpec file(s) or stdin to an ebusd CSV file or stdout.',
+                'with:',
+                '  -e, --ebusd host[:port]  the ebusd host and optional port of ebusd REPL to send the CSV output to (needs to have the "--define" feature enabled)',
+                '  -o, --output file        the output file to write to instead of stdout',
+                '  infile                   the input file(s) to use instead of stdin',
+            ];
+            console.log(helpTxt.join('\n'));
+            return;
+        }
+        if (arg === '-o' || arg === '--output') {
+            outFileName = args[++idx];
+        }
+        else if (arg === '-e' || arg === '--ebusd') {
+            const parts = args[++idx].split(':');
+            if (!parts[0].length) {
+                throw new Error('invalid ebusd host');
+            }
+            const ebusdPort = parts.length > 1 ? parseInt(parts[1], 10) : 8888;
+            if (ebusdPort < 1 || ebusdPort > 65535 || isNaN(ebusdPort)) {
+                throw new Error('invalid ebusd port');
+            }
+            ebusdHostPort = [parts[0], ebusdPort];
+        }
+        else {
+            throw new Error('invalid arguments');
+        }
+    }
+    if (outFileName) {
+        // console.log(`redirecting output to ${outFileName}`);
+        outFile = createWriteStream(outFileName);
+    }
+    const log = outFile ? (...args) => outFile.write(args.join(' ') + '\n') : console.log;
+    const inputFiles = {};
+    let entryFile = '';
+    if (inFiles.length) {
+        for (const inFile of inFiles) {
+            let name = extname(inFile) === '.tsp' ? inFile : `${inFile}.tsp`;
+            const relative = !isAbsolute(name);
+            if (relative) {
+                name = './' + name;
+            }
+            if (!entryFile) {
+                if (!relative) {
+                    // bit of a hack for aquiring the context of the cwd for typespec compiler
+                    name = './main.tsp';
+                }
+                entryFile = name;
+            }
+            inputFiles[name] = createSourceFile(await readFile(inFile, 'utf-8'), name);
+            if (relative) {
+                inputFiles[resolve(name)] = inputFiles[name];
+            }
+        }
+    }
+    else {
+        entryFile = './main.tsp';
+        const input = ['using Ebus;\n'];
+        for await (const chunk of process.stdin) {
+            input.push(chunk);
+        }
+        inputFiles[entryFile] = createSourceFile(input.join(''), entryFile);
+    }
+    inputFiles[entryFile.substring(2)] = inputFiles[entryFile];
+    // console.log('inp',Object.keys(inputFiles))
+    const inputSourceStat = { isDirectory: () => false, isFile: () => true };
+    const logs = [];
+    const logSink = { log: (log) => logs.push(log) };
+    const options = {
+        emit: ['@ebusd/ebus-typespec'],
+        additionalImports: ['@ebusd/ebus-typespec'],
+    };
+    const outputFiles = {};
+    const host = {
+        ...NodeHost,
+        logSink,
+        realpath: async (path) => inputFiles[path] ? path : NodeHost.realpath(path),
+        readFile: async (path) => inputFiles[path] || await NodeHost.readFile(path),
+        stat: async (path) => inputFiles[path] ? inputSourceStat : NodeHost.stat(path),
+        writeFile: async (path, content) => { outputFiles[path] = content; },
+        mkdirp: async (path) => path,
+    };
+    const program = await compile(host, entryFile, options);
+    if (program.hasError() || program.diagnostics.length) {
+        throw new Error(`compilation failed:\n${program.diagnostics.map(formatDiagnostic).join('\n')}`);
+    }
+    const filenames = Object.keys(outputFiles);
+    if (filenames.length == 0) {
+        throw new Error(`no file emitted`);
+    }
+    if (filenames.length != 1) {
+        throw new Error(`too many files emitted: ${filenames.join()}`);
+    }
+    if (!ebusdHostPort) {
+        log(outputFiles[filenames[0]]);
+    }
+    else {
+        const lines = outputFiles[filenames[0]].split('\n');
+        await sendToEbusd(lines, ebusdHostPort, log);
+    }
+}
+const sendToEbusd = async (inputLines, ebusdHostPort, log) => {
+    // find the relevant line(s) from the output
+    let removeLevel = undefined;
+    const lines = inputLines.filter(line => {
+        if (removeLevel === undefined) {
+            removeLevel = line.includes(',level,');
+            return;
+        }
+        if (!line || line.startsWith('#') || line.startsWith('*'))
+            return;
+        return line;
+    }).map(line => {
+        if (!removeLevel)
+            return line;
+        const parts = line.split(',');
+        parts.splice(2, 1);
+        return parts.join(',');
+    });
+    if (!lines.length) {
+        throw new Error('no usable result');
+    }
+    const conn = createConnection({ port: ebusdHostPort[1], host: ebusdHostPort[0], allowHalfOpen: false });
+    conn.setEncoding('utf-8');
+    let timer;
+    try {
+        const send = () => {
+            if (timer) {
+                clearTimeout(timer);
+            }
+            const line = lines.shift();
+            if (!line) {
+                return;
+            }
+            timer = setTimeout(() => conn.destroy(), 3000);
+            const cmd = `read -V -def "${line}"`;
+            log(cmd);
+            conn.write(cmd + '\n');
+            return true;
+        };
+        send();
+        for await (const line of createInterface(conn)) {
+            if (!line) {
+                if (!send()) {
+                    break; // end of commands
+                }
+                continue;
+            }
+            if (line.startsWith('ERR:')) {
+                throw new Error('error from ebusd: ' + line);
+            }
+            log('# ' + line);
+        }
+    }
+    finally {
+        try {
+            conn.write('\x04');
+        }
+        catch (_e) {
+            // ignore
+        }
+        if (timer) {
+            clearTimeout(timer);
+        }
+        conn.destroy();
+    }
+};
+run()
+    .catch(err => {
+    if (outFile) {
+        try {
+            outFile.write(err.toString());
+        }
+        catch (_e) {
+            // ignore
+        }
+    }
+    console.error(err);
+    process.exit(1);
+})
+    .finally(() => {
+    if (outFile) {
+        outFile.close();
+    }
+});
+//# sourceMappingURL=tsp2ebusd.js.map

package/dist/src/tsp2ebusd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tsp2ebusd.js","sourceRoot":"","sources":["../../src/tsp2ebusd.ts"],"names":[],"mappings":"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"}

package/docs.md

@@ -1,11 +1,11 @@
-# ebus
+# @ebusd/ebus-typespec
 
 TypeSpec library for defining eBUS messages and emitting to ebusd CSV.
 
 ## Install
 
 ```bash
-npm install https://github.com/john30/ebus-typespec
+npm install @ebusd/ebus-typespec
 ```
 
 ## Emitter
@@ -15,14 +15,14 @@ npm install https://github.com/john30/ebus-typespec
 1. Via the command line
 
 ```bash
-tsp compile . --emit=ebus
+tsp compile . --emit=@ebusd/ebus-typespec
 ```
 
 2. Via the config
 
 ```yaml
 emit:
-  - "ebus"
+  - "@ebusd/ebus-typespec"
 ```
 
 ### Emitter options
@@ -99,7 +99,7 @@ Available ruleSets:
 Define authentication level.
 
 ```typespec
-@Ebus.auth(auth: valueof string)
+@Ebus.auth(value: valueof string)
 ```
 
 ##### Target
@@ -108,16 +108,16 @@ Define authentication level.
 
 ##### Parameters
 
-| Name | Type                    | Description |
-| ---- | ----------------------- | ----------- |
-| auth | `valueof scalar string` |             |
+| Name  | Type                    | Description                                |
+| ----- | ----------------------- | ------------------------------------------ |
+| value | `valueof scalar string` | the authentication level (e.g. 'install'). |
 
 #### `@base`
 
 Define the base message ID to be combined with an extension ID.
 
 ```typespec
-@Ebus.base(pb: valueof Ebus.Pb, sb: valueof Ebus.Sb, ...id: valueof Ebus.Symbol[])
+@Ebus.base(pb: valueof Ebus.Pb, sb: valueof Ebus.Sb, ...dd: valueof Ebus.Symbol[])
 ```
 
 ##### Target
@@ -130,7 +130,7 @@ Define the base message ID to be combined with an extension ID.
 | ---- | ----------------------------- | ------------------------- |
 | pb   | `valueof scalar Ebus.Pb`      | the primary message ID.   |
 | sb   | `valueof scalar Ebus.Sb`      | the secondary message ID. |
-| id   | `valueof model Ebus.Symbol[]` | further message ID parts. |
+| dd   | `valueof model Ebus.Symbol[]` | further message ID parts. |
 
 #### `@condition`
 
@@ -210,7 +210,7 @@ Define the factor.
 Define the whole message ID.
 
 ```typespec
-@Ebus.id(pb: valueof Ebus.Pb, sb: valueof Ebus.Sb, ...id: valueof Ebus.Symbol[])
+@Ebus.id(pb: valueof Ebus.Pb, sb: valueof Ebus.Sb, ...dd: valueof Ebus.Symbol[])
 ```
 
 ##### Target
@@ -223,7 +223,7 @@ Define the whole message ID.
 | ---- | ----------------------------- | ------------------------- |
 | pb   | `valueof scalar Ebus.Pb`      | the primary message ID.   |
 | sb   | `valueof scalar Ebus.Sb`      | the secondary message ID. |
-| id   | `valueof model Ebus.Symbol[]` | further message ID parts. |
+| dd   | `valueof model Ebus.Symbol[]` | further message ID parts. |
 
 #### `@in`
 
@@ -246,7 +246,7 @@ None
 Define the inherited model(s).
 
 ```typespec
-@Ebus.inherit(...models: valueof Model[])
+@Ebus.inherit(...models: Model[])
 ```
 
 ##### Target
@@ -255,9 +255,9 @@ Define the inherited model(s).
 
 ##### Parameters
 
-| Name   | Type                    | Description       |
-| ------ | ----------------------- | ----------------- |
-| models | `valueof model Model[]` | inherited models. |
+| Name   | Type            | Description       |
+| ------ | --------------- | ----------------- |
+| models | `model Model[]` | inherited models. |
 
 #### `@out`
 
@@ -423,7 +423,7 @@ None
 Define the max bits.
 
 ```typespec
-@Ebus.internal.maxBits(value: valueof numeric)
+@Ebus.internal.maxBits(value: valueof uint8)
 ```
 
 ##### Target
@@ -432,9 +432,9 @@ Define the max bits.
 
 ##### Parameters
 
-| Name  | Type                     | Description   |
-| ----- | ------------------------ | ------------- |
-| value | `valueof scalar numeric` | the max bits. |
+| Name  | Type                   | Description   |
+| ----- | ---------------------- | ------------- |
+| value | `valueof scalar uint8` | the max bits. |
 
 #### `@reverse`
 

package/lib/decorators.tsp

@@ -1,4 +1,4 @@
-import "../dist/src/decorators.js";
+import "../dist/src/index.js";
 import "./types.tsp";
 
 using TypeSpec.Reflection;
@@ -25,14 +25,15 @@ extern dec passive(target: Model);
 
 /**
  * Define authentication level.
+ * @param value the authentication level (e.g. 'install').
  */
-extern dec auth(target: Model, auth: valueof string);
+extern dec auth(target: Model, value: valueof string);
 
 /**
  * Define the source address.
  * @param value the source address QQ.
  */
-extern dec qq(source: Model, value?: valueof Source);
+extern dec qq(target: Model, value?: valueof Source);
 
 /**
  * Define the target address.
@@ -44,17 +45,17 @@ extern dec zz(target: Model|Namespace, value?: valueof Target);
  * Define the whole message ID.
  * @param pb the primary message ID.
  * @param sb the secondary message ID.
- * @param id further message ID parts.
+ * @param dd further message ID parts.
  */
-extern dec id(target: Model, pb: valueof Pb, sb: valueof Sb, ...id: valueof Symbol[]);
+extern dec id(target: Model, pb: valueof Pb, sb: valueof Sb, ...dd: valueof Symbol[]);
 
 /**
  * Define the base message ID to be combined with an extension ID.
  * @param pb the primary message ID.
  * @param sb the secondary message ID.
- * @param id further message ID parts.
+ * @param dd further message ID parts.
  */
-extern dec base(target: Model, pb: valueof Pb, sb: valueof Sb, ...id: valueof Symbol[]);
+extern dec base(target: Model, pb: valueof Pb, sb: valueof Sb, ...dd: valueof Symbol[]);
 
 /**
  * Define the extension message ID to be combined with a base ID.
@@ -66,7 +67,7 @@ extern dec ext(target: Model, ...id: valueof Symbol[]);
  * Define the inherited model(s).
  * @param models inherited models.
  */
-extern dec inherit(target: Model, ...models: valueof Model[]);
+extern dec inherit(target: Model, ...models: Model[]);
 
 /**
  * Define message part outbound to target.
@@ -123,5 +124,5 @@ namespace internal {
    * Define the max bits.
    * @param value the max bits.
    */
-  extern dec maxBits(target: numeric, value: valueof numeric);
+  extern dec maxBits(target: numeric, value: valueof uint8);
 }

package/lib/main.tsp

@@ -1,3 +1,4 @@
+import "../dist/src/index.js"; // needed for $flags to be effective
 import "./decorators.tsp";
 import "./types.tsp";
 import "./models.tsp";

package/lib/models.tsp

@@ -36,7 +36,7 @@ namespace id {
   }
 
   @values(manufacturers)
-  scalar manufacturer extends UCH
+  scalar manufacturer extends UCH;
 
   model id_read {}
   @zz(BROADCAST)

package/lib/types.tsp

@@ -1,7 +1,7 @@
 namespace Ebus;
 
 /** A symbol on the bus. */
-scalar Symbol extends uint8
+scalar Symbol extends uint8;
 
 /** List of special symbols. */
 union symbols {
@@ -11,10 +11,10 @@ union symbols {
 }
 
 /** A source address 'QQ. */
-scalar Source extends Symbol
+scalar Source extends Symbol;
 
 /** A target address 'ZZ'. */
-scalar Target extends Symbol
+scalar Target extends Symbol;
 
 /** List of special target addresses. */
 union targets {
@@ -26,144 +26,144 @@ union targets {
 alias BROADCAST = 0xfe; // todo should be possible as targets.Broadcast someday
 
 /** the primary command symbol 'PB'. */
-scalar Pb extends Symbol
+scalar Pb extends Symbol;
 
 /** the secondary command symbol 'SB'. */
-scalar Sb extends Symbol
+scalar Sb extends Symbol;
 
 /** The known numeric base types. */
 namespace num {
   @encode("uint8")
-  scalar BI0 extends boolean
+  scalar BI0 extends boolean;
   @encode("uint8")
-  scalar BI1 extends boolean
+  scalar BI1 extends boolean;
   @encode("uint8")
-  scalar BI2 extends boolean
+  scalar BI2 extends boolean;
   @encode("uint8")
-  scalar BI3 extends boolean
+  scalar BI3 extends boolean;
   @encode("uint8")
-  scalar BI4 extends boolean
+  scalar BI4 extends boolean;
   @encode("uint8")
-  scalar BI5 extends boolean
+  scalar BI5 extends boolean;
   @encode("uint8")
-  scalar BI6 extends boolean
+  scalar BI6 extends boolean;
   @encode("uint8")
-  scalar BI7 extends boolean
+  scalar BI7 extends boolean;
   @internal.maxBits(7)
-  scalar BI0_7 extends uint8
+  scalar BI0_7 extends uint8;
 
-  scalar UCH extends uint8
-  scalar SCH extends int8
+  scalar UCH extends uint8;
+  scalar SCH extends int8;
   alias D1B = SCH;
   @internal.bcd
-  scalar BCD extends uint8
+  scalar BCD extends uint8;
   @internal.hex
-  scalar HCD extends uint8
+  scalar HCD extends uint8;
   @divisor(2)
-  scalar D1C extends uint8
+  scalar D1C extends uint8;
 
   @internal.reverse
   @internal.bcd
-  scalar PIN extends uint16
-  scalar UIN extends uint16
+  scalar PIN extends uint16;
+  scalar UIN extends uint16;
   @internal.reverse
-  scalar UIR extends UIN
-  scalar SIN extends int16
+  scalar UIR extends UIN;
+  scalar SIN extends int16;
   @internal.reverse
-  scalar SIR extends SIN
+  scalar SIR extends SIN;
   @internal.hex
-  scalar HCD2 extends uint16
+  scalar HCD2 extends uint16;
 
   @divisor(256)
-  scalar D2B extends int16
+  scalar D2B extends int16;
 
   @divisor(16)
-  scalar D2C extends int16
+  scalar D2C extends int16;
 
   @divisor(1000)
-  scalar FLT extends int16
+  scalar FLT extends int16;
   @internal.reverse
-  scalar FLR extends FLT
+  scalar FLR extends FLT;
 
   //todo 3 byte int
   @internal.bcd
-  scalar BCD3 extends uint32 // todo 3 bytes
+  scalar BCD3 extends uint32; // todo 3 bytes
   @internal.hex
-  scalar HCD3 extends uint32 // todo 3 bytes
+  scalar HCD3 extends uint32; // todo 3 bytes
 
-  scalar ULG extends uint32
+  scalar ULG extends uint32;
   @internal.reverse
-  scalar ULR extends ULG
-  scalar SLG extends int32
+  scalar ULR extends ULG;
+  scalar SLG extends int32;
   @internal.reverse
-  scalar SLR extends SLG
+  scalar SLR extends SLG;
   @internal.bcd
-  scalar BCD4 extends uint32
+  scalar BCD4 extends uint32;
   @internal.hex
-  scalar HCD4 extends uint32
+  scalar HCD4 extends uint32;
 
-  scalar EXP extends float32
+  scalar EXP extends float32;
   @internal.reverse
-  scalar EXR extends EXP
+  scalar EXR extends EXP;
 }
 
 /** The known string base types. */
 namespace str {
   @maxLength(31)
-  scalar STR extends string
+  scalar STR extends string;
   @encode("nullterm") // todo
   @maxLength(31)
-  scalar NTS extends string
+  scalar NTS extends string;
   @maxLength(31)
-  scalar IGN extends string // todo bytes would be more logical, but have not length limit
+  scalar IGN extends string; // todo bytes would be more logical, but have not length limit
   @internal.hex
   @maxLength(31)
-  scalar HEX extends string
+  scalar HEX extends string;
 }
 
 /** The known date/time base types. */
 namespace dtm {
-  scalar BDY extends uint8 // todo weekday
-  scalar HDY extends uint8 // todo weekday
+  scalar BDY extends uint8; // todo weekday
+  scalar HDY extends uint8; // todo weekday
   @internal.bcd
   @encode("", uint32)
-  scalar BDA extends plainDate
+  scalar BDA extends plainDate;
   alias BDA4 = BDA;
-  scalar BDA3 extends BDA // todo 3 bytes
-  scalar BDZ extends BDA
+  scalar BDA3 extends BDA; // todo 3 bytes
+  scalar BDZ extends BDA;
   @internal.hex
   @encode("", uint32)
-  scalar HDA extends plainDate
+  scalar HDA extends plainDate;
   alias HDA4 = HDA;
-  scalar HDA3 extends HDA
+  scalar HDA3 extends HDA;
   @encode("", uint16)
-  scalar DAY extends plainDate
+  scalar DAY extends plainDate;
   @encode("", uint32)
-  scalar DTM extends offsetDateTime
+  scalar DTM extends offsetDateTime;
 
   @internal.bcd
-  scalar BTI extends plainTime // todo 3 bytes
+  scalar BTI extends plainTime; // todo 3 bytes
   @internal.hex
-  scalar HTI extends plainTime // todo 3 bytes
+  scalar HTI extends plainTime; // todo 3 bytes
   @internal.reverse
-  scalar VTI extends HTI
+  scalar VTI extends HTI;
   @internal.bcd
   @encode("", uint16)
-  scalar BTM extends plainTime
+  scalar BTM extends plainTime;
   @internal.reverse
-  scalar VTM extends BTM
+  scalar VTM extends BTM;
   @internal.hex
   @encode("", uint16)
-  scalar HTM extends plainTime
+  scalar HTM extends plainTime;
   @encode("", uint16)
-  scalar MIN extends plainTime // todo check if rather duration
+  scalar MIN extends plainTime; // todo check if rather duration
   @divisor(10)
   @encode("", uint8)
-  scalar TTM extends plainTime
+  scalar TTM extends plainTime;
   @divisor(30)
   @encode("", uint8)
-  scalar TTH extends plainTime
+  scalar TTH extends plainTime;
   @divisor(15)
   @encode("", uint8) // todo actually 7 bits
-  scalar TTQ extends plainTime
+  scalar TTQ extends plainTime;
 }