@uns-kit/cli 0.0.70 → 0.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uns-kit/cli",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "description": "Command line scaffolding tool for UNS applications",
   "type": "module",
   "license": "MIT",
@@ -26,13 +26,13 @@
   ],
   "dependencies": {
     "azure-devops-node-api": "^15.1.1",
-    "@uns-kit/core": "1.0.37"
+    "@uns-kit/core": "1.0.39"
   },
   "unsKitPackages": {
-    "@uns-kit/core": "1.0.37",
-    "@uns-kit/api": "0.0.46",
-    "@uns-kit/cron": "0.0.46",
-    "@uns-kit/temporal": "0.0.45"
+    "@uns-kit/core": "1.0.39",
+    "@uns-kit/api": "0.0.48",
+    "@uns-kit/cron": "0.0.47",
+    "@uns-kit/temporal": "0.0.46"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

package/templates/cron/src/examples/cron-example.ts

@@ -15,7 +15,7 @@ import {
   GeneratedObjectTypeDescriptions,
 } from "../uns/uns-dictionary.generated.js";
 import { GeneratedPhysicalMeasurements } from "../uns/uns-measurements.generated.js";
-import { GeneratedAssets } from "../uns/uns-assets.js";
+import { GeneratedAssets, resolveGeneratedAsset } from "../uns/uns-assets.js";
 
 
 /**
@@ -43,7 +43,7 @@ cronInput.event.on("cronEvent", async (event: UnsEvents["cronEvent"]) => {
     const time = UnsPacket.formatToISO8601(new Date());
     const numberValue: number = 42;
     const topic: UnsTopics = "example/";
-    const asset = GeneratedAssets["asset"];
+    const asset = resolveGeneratedAsset("asset");
     const assetDescription = "Sample asset";
 
     const dataGroup = "sensor";

package/templates/default/src/examples/data-example.ts

@@ -4,7 +4,6 @@
 import { UnsProxyProcess, ConfigFile, logger } from "@uns-kit/core";
 import { registerAttributeDescriptions, registerObjectTypeDescriptions } from "@uns-kit/core/uns/uns-dictionary-registry.js";
 import { GeneratedPhysicalMeasurements } from "../uns/uns-measurements.generated.js";
-import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
 import { UnsTopics } from "@uns-kit/core/uns/uns-topics.js";
 import {
   GeneratedObjectTypes,
@@ -12,7 +11,8 @@ import {
   GeneratedAttributesByType,
   GeneratedObjectTypeDescriptions,
 } from "../uns/uns-dictionary.generated.js";
-import { GeneratedAssets } from "../uns/uns-assets.js";
+import { GeneratedAssets, resolveGeneratedAsset } from "../uns/uns-assets.js";
+import type { ISO8601 } from "@uns-kit/core/uns/uns-interfaces.js";
 
 /**
  * Load the configuration from a file.
@@ -48,12 +48,12 @@ mqttInput.event.on("input", async (event) => {
       const numberValue = Number.parseFloat(countRaw);
       const eventDate = new Date(Number.parseInt(timestampRaw, 10));
       const sensorValue = Number.parseFloat(sensorRaw);
-      const time = UnsPacket.formatToISO8601(eventDate);
+      const time: ISO8601 = eventDate.toISOString() as ISO8601;
 
       const dataGroup = "sensor";
 
       const topic: UnsTopics = "enterprise/site/area/line/";
-      const asset = GeneratedAssets["asset"];
+      const asset = resolveGeneratedAsset("asset");
       const assetDescription = ""; // customize manually
 
       mqttOutput.publishMqttMessage({

package/templates/default/src/examples/table-example.ts

@@ -2,9 +2,8 @@
  * Change this file according to your specifications and rename it to index.ts
  */
 
-import { UnsProxyProcess, ConfigFile, logger, type IUnsMessage } from "@uns-kit/core";
+import { UnsProxyProcess, ConfigFile, logger } from "@uns-kit/core";
 import { registerAttributeDescriptions, registerObjectTypeDescriptions } from "@uns-kit/core/uns/uns-dictionary-registry.js";
-import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
 import { UnsTopics } from "@uns-kit/core/uns/uns-topics.js";
 import {
   GeneratedObjectTypes,
@@ -12,8 +11,9 @@ import {
   GeneratedAttributeDescriptions,
   GeneratedObjectTypeDescriptions,
 } from "../uns/uns-dictionary.generated.js";
-import { GeneratedAssets } from "../uns/uns-assets.js";
+import { GeneratedAssets, resolveGeneratedAsset } from "../uns/uns-assets.js";
 import type { IUnsTableColumn } from "@uns-kit/core/uns/uns-interfaces.js";
+import type { ISO8601 } from "@uns-kit/core/uns/uns-interfaces.js";
 import { GeneratedPhysicalMeasurements } from "../uns/uns-measurements.generated.js";
 
 /**
@@ -55,33 +55,32 @@ mqttInput.event.on("input", async (event) => {
       const eventDate = new Date(Number.parseInt(timestampRaw, 10));
       const sensorValue = Number.parseFloat(sensorRaw);
 
-      const time = UnsPacket.formatToISO8601(eventDate);
+      const time: ISO8601 = eventDate.toISOString() as ISO8601;
       const dataGroup = "sensor_table";
       const columns: IUnsTableColumn[] = [
         { name: "current", type: "double", value: currentValue, uom: GeneratedPhysicalMeasurements.Ampere },
         { name: "voltage", type: "double", value: sensorValue },
       ];
-      const message: IUnsMessage = {
-        table: {
-          dataGroup,
-          time,
-          columns,
-        },
-      };
       const topic: UnsTopics = "enterprise/site/area/line/";
-      const asset = GeneratedAssets["asset"];
+      const asset = resolveGeneratedAsset("asset");
       const assetDescription = ""; // customize manually
-      const packet = await UnsPacket.unsPacketFromUnsMessage(message);
       mqttOutput.publishMqttMessage({
         topic,
         asset,
         assetDescription,
         objectType: GeneratedObjectTypes["resource-status"],
         objectId: "main",
-        attribute: GeneratedAttributes["status"] ?? "status",
-        description: GeneratedAttributeDescriptions["status"] ?? "Table",
-        tags: [],
-        packet,
+        attributes: [
+          {
+            attribute: GeneratedAttributes["status"] ?? "status",
+            description: GeneratedAttributeDescriptions["status"] ?? "Table",
+            table: {
+              dataGroup,
+              time,
+              columns,
+            },
+          },
+        ],
       });
     }
   } catch (error) {

package/templates/default/src/uns/uns-assets.ts

@@ -4,3 +4,9 @@ export const GeneratedAssets = {
   "asset": "asset",
 } as const;
 export type GeneratedAssetName = typeof GeneratedAssets[keyof typeof GeneratedAssets];
+
+export function resolveGeneratedAsset(name: keyof typeof GeneratedAssets): (typeof GeneratedAssets)[keyof typeof GeneratedAssets];
+export function resolveGeneratedAsset<T extends string>(name: T): (typeof GeneratedAssets)[keyof typeof GeneratedAssets] | T;
+export function resolveGeneratedAsset(name: string): string {
+  return (GeneratedAssets as Record<string, string>)[name] ?? name;
+}