@microtronics/studio-cli 0.35.0 → 0.37.0

package/CHANGELOG.md

@@ -1,10 +1,27 @@
 # Changelog
 
-## 0.35.0 (2025-09-12)
+## 0.37.0 (2025-10-22)
 
-### Bug Fixes
+### Features
 
-* **cli:** expected test fixtures ([0edb940](https://bitbucket.org/microtronics-core/vscode-studio/commits/0edb940c79aacb0cc631786f141e3cb28ff5cb78))
+* **cli:** add write permission for timeseries for type addon ([d8b8f05](https://bitbucket.org/microtronics-core/vscode-studio/commits/d8b8f059873f2c4503aef8b1a39d96707f843884))
+* **cli:** enhance regex for relation validation ([7d995c4](https://bitbucket.org/microtronics-core/vscode-studio/commits/7d995c47bc6c24abdb2af6717f4df50f727a1b7a))
+* **cli:** enhance support for cross-library relations ([3d9a6f7](https://bitbucket.org/microtronics-core/vscode-studio/commits/3d9a6f789758bfccf01963e7386573a54fe11f71))
+* **cli:** improve container title extraction logic ([2a0618a](https://bitbucket.org/microtronics-core/vscode-studio/commits/2a0618aae01ed30c3c854430b0bd5ff4454b6288))
+* **cli:** update `isApp` logic to handle undefined type ([fc9c12d](https://bitbucket.org/microtronics-core/vscode-studio/commits/fc9c12ddebdffe4ca9fbed10359ce9b8265f3e57))
+* **core:** extend regex patterns for relation validation ([5ffe3b4](https://bitbucket.org/microtronics-core/vscode-studio/commits/5ffe3b4cad70a842111a937e5c8bd9306571f688))
+
+## 0.36.0 (2025-09-25)
+
+### Bug Fixes
+
+* **cli:** enhance DDE function mangling logic for libraries ([4d2272d](https://bitbucket.org/microtronics-core/vscode-studio/commits/4d2272d627530dbbfb342899549c7c76a99c6c56))
+
+## 0.35.0 (2025-09-12)
+
+### Bug Fixes
+
+* **cli:** expected test fixtures ([0edb940](https://bitbucket.org/microtronics-core/vscode-studio/commits/0edb940c79aacb0cc631786f141e3cb28ff5cb78))
 * **cli:** replaced shallow clones with structured clones for API method objects ([f8b3a88](https://bitbucket.org/microtronics-core/vscode-studio/commits/f8b3a88b5a81ad3aa5d422a7f36ea1055068b921))
 
 ## 0.34.0 (2025-09-12)

package/dist/studio-cli.d.ts

@@ -1,4 +1,6 @@
+import { Document as Document_2 } from 'yaml';
 import { LineCounter } from 'yaml';
+import { ParsedNode } from 'yaml';
 import { Range as Range_2 } from 'yaml';
 import { SemVer } from 'semver';
 import { URI } from 'vscode-uri';
@@ -203,7 +205,7 @@ declare interface components {
             allowedApplications?: ("*" | string[]) | null;
         };
         /** @enum {string} */
-        ApplicationType: "app" | "addon";
+        ApplicationType: "app" | "addon" | "analytics";
         ApplicationInformationBase: {
             version: components["parameters"]["ApplicationVersion"];
             publisherId: components["parameters"]["PublisherId"];
@@ -1174,7 +1176,7 @@ export declare namespace DDE {
      * Generate the needed xml for the myDatanet application
      * @param ddeJSON
      */
-    export function generateMyDatanetXML(ddeJSON: DDEJson): string;
+    export function generateMyDatanetXML(manifest: Manifest.Manifest, ddeJSON: DDEJson): string;
     /**
      * Generate the xml dde notation and write it to the correct dist directory
      * @param cwd
@@ -1844,7 +1846,7 @@ declare class DloPreCompiler {
     private dloFileSequencer;
     constructor();
     get pragmaDynamicFlag(): string | null;
-    preCompileDloFile(cwd: URI, manifest: Manifest.Manifest, fileUri: URI, fileBlob: string[]): {
+    preCompileDloFile(cwd: URI, logger: Log.Logger, manifest: Manifest.Manifest, fileUri: URI, fileBlob: string[]): {
         diagnostics: Diagnostics.File[];
         data: string;
     };
@@ -4727,6 +4729,7 @@ declare namespace YamlPreCompiler {
         private readonly usedContainerNames;
         private fileDiagnostics;
         private readonly libraryDDE;
+        private libraryYaml;
         constructor(manifest: Manifest.Manifest, libraryFiles: DDE_Core.LibraryFile[], ddeHistory: DDE.HistoryJson | null);
         /**
          * Parse the given library files and return the diagnostics
@@ -4747,8 +4750,9 @@ declare namespace YamlPreCompiler {
          * @return An object containing the parsed DDE JSON and an array of diagnostic messages related to the file.
          */
         parseYamlFile(filePath: URI, yaml: string, libraryName?: string): {
-            parsedDDE: DDEJson;
+            parsedDDE: DDE_Core.DDEJson;
             diagnostics: Diagnostics.File[];
+            parsedYaml: null | Document_2.Parsed<ParsedNode, true>;
         };
         private yamlDocToDdeJson;
         private getRealContainerInformation;

package/out/dde/coreDefinitions.js

@@ -173,8 +173,8 @@ var DDE_Core;
         ContainerName.config9
     ];
     DDE_Core.SERVER_CONTAINER = [ContainerName.configA, ContainerName.configB, ContainerName.configC];
-    // relation checkings.
-    DDE_Core.regexRelation = /^@[a-zA-Z0-9_].[a-zA-Z0-9[\]{}._+-]+(?<!\.)$/;
+    // check if the given string is a relation to an app container or library container
+    DDE_Core.regexRelation = /^(@[a-zA-Z_][a-zA-Z0-9_]*\.[a-zA-Z_][a-zA-Z0-9_]*(\[[^\]]+\])?(\.[a-zA-Z_][a-zA-Z0-9_]*)*|lib:[a-zA-Z0-9_-]+@[a-zA-Z_][a-zA-Z0-9_]*\.[a-zA-Z_][a-zA-Z0-9_]*(\[[^\]]+\])?(\.[a-zA-Z_][a-zA-Z0-9_]*)*)$/;
     const STRING_TYPES = ['astring', 'nstring', 'cstring', 'wstring', 'ustring'];
     const NUMBER_TYPES = [
         'int8',
@@ -225,7 +225,7 @@ var DDE_Core;
         if (DDE_Core.regexRelation.exec(`${currentAttributeValue}`)) {
             const isSetPoint = attribute === 'chartSetPoint';
             const [root, ...containerFields] = currentAttributeValue.split('.');
-            const containerTitle = root.substring(1);
+            const [, /*libraryRelation*/ containerTitle] = root.split('@'); //remove the @
             const realContainer = Object.values(ddeMap.containers).find(container => container.title === containerTitle);
             const containerField = containerFields.join('.');
             const delimeter = isSetPoint ? ';' : '%';

package/out/dde/dde.js

@@ -148,8 +148,8 @@ var DDE;
      * Generate the needed xml for the myDatanet application
      * @param ddeJSON
      */
-    function generateMyDatanetXML(ddeJSON) {
-        return (0, xml_1.generateXMLFromMap)(ddeJSON);
+    function generateMyDatanetXML(manifest, ddeJSON) {
+        return (0, xml_1.generateXMLFromMap)(manifest, ddeJSON);
     }
     DDE.generateMyDatanetXML = generateMyDatanetXML;
     /**
@@ -159,7 +159,8 @@ var DDE;
      * @param ddeJSON
      */
     async function exportMyDatanetXML(cwd, fs, logger, ddeJSON) {
-        const xml = (0, xml_1.generateXMLFromMap)(ddeJSON);
+        const manifest = await manifest_1.Manifest.read(cwd, fs);
+        const xml = (0, xml_1.generateXMLFromMap)(manifest, ddeJSON);
         const distFile = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dist.ddeXmlPath);
         await fs.writeFile(distFile, xml);
         logger.log('Generated', defaultFiles_1.DefaultFiles.filePaths.dist.ddeXmlPath);

package/out/dde/dynamic-dde.schema.json

@@ -805,14 +805,14 @@
         "relationLinkPattern": {
             "anyOf": [
                 {
-                    "pattern": "^@([a-zA-Z0-9_]).[a-zA-Z0-9\\[\\]{}._+]+(?<!\\.)$"
+                    "pattern": "^(@[a-zA-Z_][a-zA-Z0-9_]*\\.[a-zA-Z_][a-zA-Z0-9_]*(\\[[^\\]]+\\])?(\\.[a-zA-Z_][a-zA-Z0-9_]*)*|lib:[a-zA-Z0-9_-]+@[a-zA-Z_][a-zA-Z0-9_]*\\.[a-zA-Z_][a-zA-Z0-9_]*(\\[[^\\]]+\\])?(\\.[a-zA-Z_][a-zA-Z0-9_]*)*)$"
                 }
             ]
         },
         "setPointRelationPattern": {
             "anyOf": [
                 {
-                    "pattern": "^@([a-zA-Z0-9_]).[a-zA-Z0-9\\[\\]{}._]+(?<!\\.)$"
+                    "pattern": "^(@[a-zA-Z_][a-zA-Z0-9_]*\\.[a-zA-Z_][a-zA-Z0-9_]*(\\[[^\\]]+\\])?(\\.[a-zA-Z_][a-zA-Z0-9_]*)*|lib:[a-zA-Z0-9_-]+@[a-zA-Z_][a-zA-Z0-9_]*\\.[a-zA-Z_][a-zA-Z0-9_]*(\\[[^\\]]+\\])?(\\.[a-zA-Z_][a-zA-Z0-9_]*)*)$"
                 },
                 {
                     "const": "\"@setting.\"",

package/out/dde/fileGenerators/xml.js

@@ -8,8 +8,9 @@ var parseXMLBitmask = coreDefinitions_1.DDE_Core.parseXMLBitmask;
 var parseXMLDefaultValue = coreDefinitions_1.DDE_Core.parseXMLDefaultValue;
 var fieldTypeDefinitions = coreDefinitions_1.DDE_Core.fieldTypeDefinitions;
 const helper_1 = require("../../helper");
+const manifest_1 = require("../../manifest");
 // eslint-disable-next-line sonarjs/cognitive-complexity
-function generateXMLFromMap(ddeMap) {
+function generateXMLFromMap(manifest, ddeMap) {
     const indent = '';
     const xml_ = [];
     function xml(s, condition = true) {
@@ -67,8 +68,8 @@ function generateXMLFromMap(ddeMap) {
             xmlAttr('download', '0');
         }
         // set edit=99 on upward containers to reject write access via API
-        if ([TransferDirection.up, TransferDirection.upPlus].includes(containerDefinition.transferDirection)) {
-            // containerAttributes['edit'] = '99';
+        if ((manifest_1.Manifest.isApp(manifest) || manifest_1.Manifest.isLibrary(manifest)) &&
+            [TransferDirection.up, TransferDirection.upPlus].includes(containerDefinition.transferDirection)) {
             xmlAttr('edit', '99');
         }
         //insert fields:

package/out/dde/yamlDdePreCompiler.js

@@ -29,6 +29,7 @@ var YamlPreCompiler;
         usedContainerNames = {};
         fileDiagnostics = [];
         libraryDDE = [];
+        libraryYaml = {};
         constructor(manifest, libraryFiles, ddeHistory) {
             this.manifest = manifest;
             this.libraryFiles = libraryFiles;
@@ -41,9 +42,10 @@ var YamlPreCompiler;
             this.libraryDDE.length = 0;
             const libDiagnostics = [];
             this.libraryFiles.forEach(file => {
-                const { parsedDDE, diagnostics } = this.parseYamlFile(file.path, file.yaml, file.libraryName);
+                const { parsedDDE, diagnostics, parsedYaml } = this.parseYamlFile(file.path, file.yaml, file.libraryName);
                 libDiagnostics.push(...diagnostics);
                 this.libraryDDE.push(parsedDDE);
+                this.libraryYaml[file.libraryName] = parsedYaml;
             });
             return libDiagnostics;
         }
@@ -84,7 +86,8 @@ var YamlPreCompiler;
                         containers: {},
                         setPointList: {}
                     },
-                    diagnostics: []
+                    diagnostics: [],
+                    parsedYaml: null
                 };
             }
             const docContent = yamlDoc.contents || new yaml_1.YAMLMap();
@@ -96,7 +99,8 @@ var YamlPreCompiler;
             // mapAsMap is used to keep order of fields:
             return {
                 parsedDDE: this.yamlDocToDdeJson(yamlDoc.toJS({ mapAsMap: true }), libraryName),
-                diagnostics: [...this.fileDiagnostics]
+                diagnostics: [...this.fileDiagnostics],
+                parsedYaml: yamlDoc
             };
         }
         // eslint-disable-next-line sonarjs/cognitive-complexity
@@ -594,8 +598,10 @@ var YamlPreCompiler;
         validateContainerRelation(itemType, itemValue, yamlDoc, sourceUri, lineCounter) {
             //validate if the relation exist
             const [root, fieldRef, arrayField] = itemValue.value.split('.', 3);
-            const containerName = root.substring(1); //remove the @
-            const containerExist = yamlDoc.contents?.get(containerName);
+            const [libraryRelation, containerName] = root.split('@');
+            const libraryName = libraryRelation ? libraryRelation.split(':')[1] : null;
+            const yamlContentToSearch = libraryName && this.libraryYaml[libraryName] ? this.libraryYaml[libraryName] : yamlDoc;
+            const containerExist = yamlContentToSearch.contents?.get(containerName);
             const referencedField = fieldRef.split('[')[0];
             let relatedField = null;
             if (containerExist) {
@@ -631,6 +637,14 @@ var YamlPreCompiler;
                     });
                 }
             }
+            else if (libraryName && !this.libraryYaml[libraryName]) {
+                this.fileDiagnostics.push({
+                    file: sourceUri,
+                    level: 'error',
+                    message: `Related library "${libraryName}" does not exist.`,
+                    ...yamlRangeToLineInformation(lineCounter, itemValue.range)
+                });
+            }
             else {
                 this.fileDiagnostics.push({
                     file: sourceUri,

package/out/dlo/CustomWasmFS.js

@@ -41,7 +41,7 @@ const MODE_FILE = S_IFREG | DEFAULT_FILE_MODE;
 const preCompiler = new preCompiler_1.DloPreCompiler();
 const modifiedFileCache = {};
 exports.precompilerDiagnostics = [];
-const CUSTOM_WASM_FS = (FS, cwd, manifest) => {
+const CUSTOM_WASM_FS = (FS, cwd, manifest, logger) => {
     // clear all cached artifacts during FS setup ( this is needed when loaded in vscode context )
     exports.precompilerDiagnostics.length = 0;
     Object.keys(modifiedFileCache).forEach(key => delete modifiedFileCache[key]);
@@ -52,7 +52,7 @@ const CUSTOM_WASM_FS = (FS, cwd, manifest) => {
             if (!nodeFs.existsSync(fsPath)) {
                 throw new FS.ErrnoError(44 /* ENOENT */);
             }
-            const modifiedFileContent = getUpdateModifiedFileCache(cwd, manifest, path);
+            const modifiedFileContent = getUpdateModifiedFileCache(cwd, logger, manifest, path);
             const stat = nodeFs.statSync(fsPath);
             const size = modifiedFileContent?.length || stat.size;
             return {
@@ -131,7 +131,7 @@ const CUSTOM_WASM_FS = (FS, cwd, manifest) => {
     const streamOps = {
         open(stream) {
             const path = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(stream.node.mount.opts.root), FS.getPath(stream.node));
-            stream.modifiedContent = getUpdateModifiedFileCache(cwd, manifest, path);
+            stream.modifiedContent = getUpdateModifiedFileCache(cwd, logger, manifest, path);
             if (!stream.modifiedContent) {
                 stream.nfd = nodeFs.openSync(path.fsPath, flagsToMode(stream.flags));
             }
@@ -232,18 +232,18 @@ function copyToBuffer(source, target, targetOffset, sourceStart, sourceEnd) {
         }
     }
 }
-function getUpdateModifiedFileCache(cwd, manifest, filePath) {
+function getUpdateModifiedFileCache(cwd, logger, manifest, filePath) {
     const fsPath = filePath.fsPath;
     if (!modifiedFileCache[fsPath] && (fsPath.endsWith('.dlo') || fsPath.endsWith('.inc'))) {
-        modifiedFileCache[fsPath] = precompileRequestedDloFile(cwd, manifest, filePath);
+        modifiedFileCache[fsPath] = precompileRequestedDloFile(cwd, logger, manifest, filePath);
     }
     return modifiedFileCache[fsPath];
 }
-function precompileRequestedDloFile(cwd, manifest, filePath) {
+function precompileRequestedDloFile(cwd, logger, manifest, filePath) {
     // Simple example: convert buffer content to a string, modify and convert back
     const originalContent = nodeFs.readFileSync(filePath.fsPath);
     const fileBlob = convertBlobToStringArray(originalContent);
-    const preCompiled = preCompiler.preCompileDloFile(cwd, manifest, filePath, fileBlob);
+    const preCompiled = preCompiler.preCompileDloFile(cwd, logger, manifest, filePath, fileBlob);
     exports.precompilerDiagnostics.push(...preCompiled.diagnostics);
     return iconv.encode(preCompiled.data, 'cp1252');
 }

package/out/dlo/compiler.js

@@ -51,7 +51,7 @@ class DloCompiler {
         const FS = this.dloCC.FS;
         const manifest = await manifest_1.Manifest.read(this.cwd, this.fs);
         // Register our new FS type under a name
-        FS.filesystems.NODEFS_TS = (0, CustomWasmFS_1.CUSTOM_WASM_FS)(FS, this.cwd, manifest);
+        FS.filesystems.NODEFS_TS = (0, CustomWasmFS_1.CUSTOM_WASM_FS)(FS, this.cwd, manifest, this.logger);
         FS.mkdir(rootDir);
         FS.mount(FS.filesystems.NODEFS_TS, { root: '/' }, rootDir);
         // Set the current working directory to the root directory

package/out/dlo/preCompiler.js

@@ -87,23 +87,22 @@ class DloPreCompiler {
         }
     }
     // eslint-disable-next-line sonarjs/cognitive-complexity
-    preCompileDloFile(cwd, manifest, fileUri, fileBlob) {
+    preCompileDloFile(cwd, logger, manifest, fileUri, fileBlob) {
         this.dloFileSequencer.workspacePath = cwd;
         const fileDiagnostics = [];
         const filePath = fileUri.path;
         let mangleDDEFunctions = false;
         const baseName = vscode_uri_1.Utils.basename(fileUri);
         // look for autogenerated xxx-dde.inc files
-        if (filePath.includes(defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.path) && baseName.endsWith('-dde.inc')) {
+        if (filePath.includes(defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.path)) {
             const ddeIncSource = baseName.substring(0, baseName.length - 8);
-            if (!['app', 'main'].includes(ddeIncSource)) {
+            if (!['app', 'main'].includes(ddeIncSource) && baseName.endsWith('-dde.inc')) {
                 // this is a library specific file!
                 mangleDDEFunctions = helper_1.Helper.generateHashForLibraryName(ddeIncSource);
                 // console.log('MANGLED LIB DDE', baseName, ddeIncSource, mangleDDEFunctions);
             }
         }
-        // look for library source files:
-        if (filePath.includes(defaultFiles_1.DefaultFiles.filePaths.studio.libdeps)) {
+        else if (filePath.includes(defaultFiles_1.DefaultFiles.filePaths.studio.libdeps)) {
             const libPath = filePath.split('libdeps/')[1];
             const [libName] = libPath.split('/');
             if (!['dlo-core'].includes(libName)) {
@@ -111,9 +110,16 @@ class DloPreCompiler {
                 // console.log('MANGLED LIB', baseName, mangleDDEFunctions);
             }
         }
-        else if (manifest_1.Manifest.isLibrary(manifest) && baseName === `${manifest.name}.inc`) {
-            mangleDDEFunctions = helper_1.Helper.generateHashForLibraryName(manifest.name);
-            // console.log('MANGLED PROJECT LIB', baseName, mangleDDEFunctions);
+        else if (manifest_1.Manifest.isLibrary(manifest)) {
+            // mangle dde functions within the project files if the current project is a library project
+            // exclude main.dlo and /example and /test folder
+            if (baseName.endsWith('.dlo') || filePath.includes('/dlo/examples/') || filePath.includes('/dlo/test/')) {
+                logger.log('Skipping dde mangling for project file', baseName);
+            }
+            else {
+                mangleDDEFunctions = helper_1.Helper.generateHashForLibraryName(manifest.name);
+                // console.log('MANGLED PROJECT LIB', baseName, mangleDDEFunctions);
+            }
         }
         if (filePath.endsWith('.auto/default.inc')) {
             return {

package/out/main.js

@@ -22,11 +22,14 @@ const devPath = () => {
         return './dev/app';
     }
     else if (process.env.NODE_ENV === 'local-dev-lib') {
-        return './dev/lib';
+        return './dev/modbus-master';
     }
     else if (process.env.NODE_ENV === 'local-dev-addon') {
         return './dev/addon';
     }
+    else if (process.env.NODE_ENV === 'local-dev-analytics') {
+        return './dev/analytics';
+    }
     return '';
 };
 const cwd = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.file(process.cwd()), devPath());

package/out/manifest.js

@@ -155,6 +155,9 @@ var Manifest;
      * @param manifest
      */
     function isApp(manifest) {
+        if (manifest.type === undefined && !isLibrary(manifest)) {
+            return true;
+        }
         return manifest.type === ProjectTypes.app;
     }
     Manifest.isApp = isApp;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@microtronics/studio-cli",
-	"version": "0.35.0",
+	"version": "0.37.0",
 	"description": "Microtronics Studio CLI Tool",
 	"main": "./out/api.js",
 	"typings": "./dist/studio-cli.d.ts",

package/studio-cli-addon

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-// used for local development only
-process.env.NODE_ENV = 'local-dev-addon';
-require('./out/main')(process.argv);