@microtronics/studio-cli 0.35.0 → 0.36.0

package/CHANGELOG.md

@@ -1,10 +1,16 @@
 # Changelog
 
-## 0.35.0 (2025-09-12)
+## 0.36.0 (2025-09-25)
 
 ### Bug Fixes
 
-* **cli:** expected test fixtures ([0edb940](https://bitbucket.org/microtronics-core/vscode-studio/commits/0edb940c79aacb0cc631786f141e3cb28ff5cb78))
+* **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

@@ -203,7 +203,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"];
@@ -1844,7 +1844,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;
     };

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@microtronics/studio-cli",
-	"version": "0.35.0",
+	"version": "0.36.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);