@ebusd/ebus-typespec 0.10.0 → 0.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -67,19 +67,12 @@ async function run() {
67
67
  let name = extname(inFile) === '.tsp' ? inFile : `${inFile}.tsp`;
68
68
  const relative = !isAbsolute(name);
69
69
  if (relative) {
70
- name = './' + name;
70
+ name = resolve(name);
71
71
  }
72
72
  if (!entryFile) {
73
- if (!relative) {
74
- // bit of a hack for aquiring the context of the cwd for typespec compiler
75
- name = './main.tsp';
76
- }
77
73
  entryFile = name;
78
74
  }
79
75
  inputFiles[name] = createSourceFile(await readFile(inFile, 'utf-8'), name);
80
- if (relative) {
81
- inputFiles[resolve(name)] = inputFiles[name];
82
- }
83
76
  }
84
77
  }
85
78
  else {
@@ -89,8 +82,8 @@ async function run() {
89
82
  input.push(chunk);
90
83
  }
91
84
  inputFiles[entryFile] = createSourceFile(input.join(''), entryFile);
85
+ inputFiles[entryFile.substring(2)] = inputFiles[entryFile];
92
86
  }
93
- inputFiles[entryFile.substring(2)] = inputFiles[entryFile];
94
87
  // console.log('inp',Object.keys(inputFiles))
95
88
  const inputSourceStat = { isDirectory: () => false, isFile: () => true };
96
89
  const logs = [];
@@ -104,13 +97,25 @@ async function run() {
104
97
  }
105
98
  }
106
99
  };
100
+ // console.log('HERRE',process.cwd());
107
101
  const outputFiles = {};
102
+ // const trace = <T>(method: string, output: T, ...args: any[]): T => {
103
+ // console.error(method, ...args);
104
+ // console.error(method+' result=', output);
105
+ // return output;
106
+ // }
108
107
  const host = {
109
108
  ...NodeHost,
110
109
  logSink,
111
- realpath: async (path) => inputFiles[path] ? path : NodeHost.realpath(path),
112
- readFile: async (path) => inputFiles[path] || await NodeHost.readFile(path),
113
- stat: async (path) => inputFiles[path] ? inputSourceStat : NodeHost.stat(path),
110
+ realpath: async (path) => // trace('realpath',
111
+ inputFiles[path] ? path : NodeHost.realpath(path),
112
+ // path),
113
+ readFile: async (path) => // trace('readFile',
114
+ inputFiles[path] || await NodeHost.readFile(path),
115
+ // path),
116
+ stat: async (path) => // trace('stat',
117
+ inputFiles[path] ? inputSourceStat : NodeHost.stat(path),
118
+ // path),
114
119
  writeFile: async (path, content) => { outputFiles[path] = content; },
115
120
  mkdirp: async (path) => path,
116
121
  };
@@ -1 +1 @@
1
- {"version":3,"file":"tsp2ebusd.js","sourceRoot":"","sources":["../../src/tsp2ebusd.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsp2ebusd.js","sourceRoot":"","sources":["../../src/tsp2ebusd.ts"],"names":[],"mappings":"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"}
package/docs.md CHANGED
@@ -82,6 +82,7 @@ Available ruleSets:
82
82
  - [`@chain`](#@chain)
83
83
  - [`@condition`](#@condition)
84
84
  - [`@divisor`](#@divisor)
85
+ - [`@example`](#@example)
85
86
  - [`@ext`](#@ext)
86
87
  - [`@factor`](#@factor)
87
88
  - [`@id`](#@id)
@@ -89,6 +90,7 @@ Available ruleSets:
89
90
  - [`@inherit`](#@inherit)
90
91
  - [`@out`](#@out)
91
92
  - [`@passive`](#@passive)
93
+ - [`@poll`](#@poll)
92
94
  - [`@qq`](#@qq)
93
95
  - [`@unit`](#@unit)
94
96
  - [`@values`](#@values)
@@ -190,6 +192,26 @@ Define the divisor.
190
192
  | ----- | ------------------------ | ------------ |
191
193
  | value | `valueof scalar numeric` | the divisor. |
192
194
 
195
+ #### `@example`
196
+
197
+ Define a data example.
198
+
199
+ ```typespec
200
+ @Ebus.example(desc: valueof string, q: valueof string | Ebus.symbol[], a?: valueof string | Ebus.symbol[])
201
+ ```
202
+
203
+ ##### Target
204
+
205
+ `Model`
206
+
207
+ ##### Parameters
208
+
209
+ | Name | Type | Description |
210
+ | ---- | --------------------------------------- | ---------------------------------------------------------------------------- |
211
+ | desc | `valueof scalar string` | a text describing the example. |
212
+ | q | `valueof union string \| Ebus.symbol[]` | the query part of the message, i.e. pb, sb, and dd bytes sent to the target. |
213
+ | a | `valueof union string \| Ebus.symbol[]` | the answer part of the message, i.e. dd bytes received from the target. |
214
+
193
215
  #### `@ext`
194
216
 
195
217
  Define the extension message ID to be combined with a base ID.
@@ -312,6 +334,24 @@ Define passive only.
312
334
 
313
335
  None
314
336
 
337
+ #### `@poll`
338
+
339
+ Define the poll priority (only for active read).
340
+
341
+ ```typespec
342
+ @Ebus.poll(value?: valueof uint8)
343
+ ```
344
+
345
+ ##### Target
346
+
347
+ `Model`
348
+
349
+ ##### Parameters
350
+
351
+ | Name | Type | Description |
352
+ | ----- | ---------------------- | ------------------------------------ |
353
+ | value | `valueof scalar uint8` | the poll priority (between 1 and 9). |
354
+
315
355
  #### `@qq`
316
356
 
317
357
  Define the source address.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ebusd/ebus-typespec",
3
- "version": "0.10.0",
3
+ "version": "0.12.0",
4
4
  "author": "John Baier",
5
5
  "description": "TypeSpec library for defining eBUS messages and emitting to ebusd CSV.",
6
6
  "homepage": "https://github.com/john30/ebus-typespec",
@@ -43,12 +43,12 @@
43
43
  "*.md"
44
44
  ],
45
45
  "peerDependencies": {
46
- "@typespec/compiler": "~0.57.0"
46
+ "@typespec/compiler": "~0.58.0"
47
47
  },
48
48
  "devDependencies": {
49
49
  "@types/js-yaml": "^4.0.9",
50
- "@typespec/compiler": "~0.57.0",
51
- "@typespec/library-linter": "~0.57.0",
50
+ "@typespec/compiler": "~0.58.0",
51
+ "@typespec/library-linter": "~0.58.0",
52
52
  "@typespec/tspd": "latest",
53
53
  "@types/node": "latest",
54
54
  "typedoc": "^0.26.1",
@@ -63,6 +63,6 @@
63
63
  "watch": "tsc --watch",
64
64
  "build:tsp": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit && chmod a+x dist/src/tsp2ebusd.js",
65
65
  "test": "node --test --test-force-exit ./dist/test/",
66
- "docs": "npx tspd doc --enable-experimental . && mv README.md docs.md && rm -rf docs && git checkout README.md"
66
+ "docs": "sed -i -e 's# *hideInPageTOC: true,##' node_modules/@typespec/tspd/dist/src/ref-doc/api-docs.js; npx tspd doc --enable-experimental . && mv README.md docs.md && rm -rf docs && git checkout README.md"
67
67
  }
68
68
  }
package/todo.md DELETED
@@ -1,4 +0,0 @@
1
- - use @knownValues instead of own @values ?
2
- - value range von allen msgs rausfinden und fix eintragen
3
-
4
- in cfg: f43 sollte 430 + rf zeug sein. similar f47