@microtronics/studio-cli 0.5.1 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## 0.6.1 (2024-12-12)
+
+
+### Bug Fixes
+
+* **studio-cli:** prevent `default.inc` to be removed due to race condition ([fbf3fcf](https://bitbucket.org/microtronics-core/vscode-studio/commits/fbf3fcfa2ef0af6ec2359aa99ccb90768d7a25ec))
+
+## 0.6.0 (2024-12-11)
+
+
+### Features
+
+* **studio-cli:** moved generation of `default.inc` to the cli ([e78ce9e](https://bitbucket.org/microtronics-core/vscode-studio/commits/e78ce9ed8dc6fd73a74a25ad8c89c3a2013ca32d))
+
 ## 0.5.1 (2024-12-11)
 
 

package/dist/studio-cli.d.ts

@@ -1037,6 +1037,13 @@ export declare namespace DDE {
      * @param ddeJSON
      */
     export function exportHistoryJson(cwd: URI, fs: LocalFS, ddeJSON: DDEJson): Promise<void>;
+    /**
+     * Clean up the .studio/auto/dlo directory
+     * @param cwd
+     * @param fs
+     * @internal
+     */
+    export function clearAutoDloDir(cwd: URI, fs: LocalFS): Promise<any>;
     /**
      * Generate all dde related dlo files
      * @param cwd
@@ -1051,6 +1058,13 @@ export declare namespace DDE {
      * @param ddeMap
      */
     export function exportOpenApi(cwd: URI, fs: LocalFS, ddeMap: DDEJson): Promise<void>;
+    /**
+     * Generate and export the default.inc file
+     * @param cwd
+     * @param fs
+     * @internal
+     */
+    export function exportDefaultInc(cwd: URI, fs: LocalFS): Promise<void>;
 }
 
 export declare namespace DDE_Core {
@@ -1474,6 +1488,16 @@ export declare namespace Dependencies {
      * @param libraryName
      */
     export function uninstallDependency(cwd: URI, fs: LocalFS, publisherId: string, libraryName: string): Promise<void>;
+    export interface DLOLibrary {
+        name: string;
+        path: URI;
+    }
+    /**
+     * Get all libraries that have dlo source
+     * @param cwd
+     * @param fs
+     */
+    export function getDloDependencies(cwd: URI, fs: LocalFS): Promise<DLOLibrary[]>;
 }
 
 export declare const DeviceProfiles: any;

package/out/dde/dde.d.ts.map

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

package/out/dde/dde.js

@@ -213,6 +213,16 @@ var DDE;
         console.log('Generated', defaultFiles_1.DefaultFiles.filePaths.dist.historyJson);
     }
     DDE.exportHistoryJson = exportHistoryJson;
+    /**
+     * Clean up the .studio/auto/dlo directory
+     * @param cwd
+     * @param fs
+     * @internal
+     */
+    async function clearAutoDloDir(cwd, fs) {
+        return fs.rm(vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.path));
+    }
+    DDE.clearAutoDloDir = clearAutoDloDir;
     /**
      * Generate all dde related dlo files
      * @param cwd
@@ -220,6 +230,7 @@ var DDE;
      * @param ddeJSON
      */
     async function exportAutoDloFiles(cwd, fs, ddeJSON) {
+        await clearAutoDloDir(cwd, fs);
         const manifest = await manifest_1.Manifest.read(cwd, fs);
         const dependencies = await getDependencies(cwd, fs, manifest);
         const globalDefines = await globals_1.Globals.read(cwd, fs);
@@ -233,8 +244,10 @@ var DDE;
             const libraryInc = [...globals, ...helper].join('\r\n');
             const autoIncName = defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.autoDdeInc.replace('X', dependency.libraryName);
             const incPath = vscode_uri_1.Utils.joinPath(cwd, autoIncName);
-            console.log(`Generated:`, autoIncName);
-            await fs.writeFile(incPath, libraryInc);
+            if (libraryInc.length) {
+                console.log(`Generated`, autoIncName);
+                await fs.writeFile(incPath, libraryInc);
+            }
         }
         const mainDDEInc = (0, dlo_1.generateMainDDEIncFromMap)(ddeJSON);
         const autoUplink = (0, dlo_1.generateAutoUplinkIncFromMap)(ddeJSON, dependencies.map(dep => dep.libraryName));
@@ -250,6 +263,7 @@ var DDE;
         const autoDdeMainPath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.autoDdeInc.replace('X', 'main'));
         await fs.writeFile(autoDdeMainPath, mainDDEInc);
         console.log('Generated', defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.autoDdeInc.replace('X', 'main'));
+        await exportDefaultInc(cwd, fs);
     }
     DDE.exportAutoDloFiles = exportAutoDloFiles;
     /**
@@ -270,12 +284,34 @@ var DDE;
         // generate the api description for the library part of the project
         if (isLibrary) {
             const libPath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dist.ddeApiPath, `${manifest.name}.yaml`);
-            await fs.writeFile(libPath, (0, api_1.generateAPIFromMap)(ddeMap, manifest, manifest.name));
-            console.log(`Generated`, defaultFiles_1.DefaultFiles.filePaths.dist.ddeApiPath + `${manifest.name}.yaml`);
+            const content = (0, api_1.generateAPIFromMap)(ddeMap, manifest, manifest.name);
+            if (content.length) {
+                await fs.writeFile(libPath, content);
+                console.log(`Generated`, defaultFiles_1.DefaultFiles.filePaths.dist.ddeApiPath + `${manifest.name}.yaml`);
+            }
         }
     }
     DDE.exportOpenApi = exportOpenApi;
+    /**
+     * Generate and export the default.inc file
+     * @param cwd
+     * @param fs
+     * @internal
+     */
+    async function exportDefaultInc(cwd, fs) {
+        const defaultIncPaht = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.defaultInc);
+        const content = await (0, dlo_1.buildDefaultInc)(cwd, fs);
+        await fs.writeFile(defaultIncPaht, content);
+        console.log('Generated', defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.defaultInc);
+    }
+    DDE.exportDefaultInc = exportDefaultInc;
 })(DDE || (exports.DDE = DDE = {}));
+/**
+ * Get dde files from any included library
+ * @param cwd
+ * @param fs
+ * @param manifest
+ */
 async function getDependencies(cwd, fs, manifest) {
     const ddeFiles = [];
     const allDependencies = await dependencies_1.Dependencies.getAll(manifest);

package/out/dde/fileGenerators/dlo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dlo.d.ts","sourceRoot":"","sources":["../../../src/dde/fileGenerators/dlo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;AAUlC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAqBxC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,UA+LlH;AAED,qBAAa,gBAAgB;IAWhB,OAAO,CAAC,MAAM;IAAW,OAAO,CAAC,OAAO;IAVpD,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,UAAU,CAA+F;gBAC7F,MAAM,EAAE,OAAO,EAAU,OAAO,EAAE,IAAI,GAAG,MAAM;IAGnE,OAAO,CAAC,IAAI;IAiBL,QAAQ;;;;IAoCf,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,gBAAgB;IAwBxB,OAAO,CAAC,8BAA8B;IAoEtC,OAAO,CAAC,uBAAuB;IAY/B,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,uBAAuB;IA8D/B,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,2BAA2B;IAmBnC;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,0BAA0B;IA8BlC,OAAO,CAAC,mBAAmB;IAiD3B;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,sBAAsB;IAmC9B,OAAO,CAAC,iBAAiB;IAoDzB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;CA6B7B;AAGD,wBAAgB,4BAA4B,CAC3C,MAAM,EAAE,OAAO;AACf;;GAEG;AACH,gBAAgB,EAAE,MAAM,EAAE,UAsI1B;AAID,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,OAAO,UAqExD"}
+{"version":3,"file":"dlo.d.ts","sourceRoot":"","sources":["../../../src/dde/fileGenerators/dlo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;AAUlC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAuBnC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,UA+LlH;AAED,qBAAa,gBAAgB;IAWhB,OAAO,CAAC,MAAM;IAAW,OAAO,CAAC,OAAO;IAVpD,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,UAAU,CAA+F;gBAC7F,MAAM,EAAE,OAAO,EAAU,OAAO,EAAE,IAAI,GAAG,MAAM;IAGnE,OAAO,CAAC,IAAI;IAiBL,QAAQ;;;;IAoCf,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,gBAAgB;IAwBxB,OAAO,CAAC,8BAA8B;IAoEtC,OAAO,CAAC,uBAAuB;IAY/B,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,uBAAuB;IA8D/B,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,2BAA2B;IAmBnC;;;;;;OAMG;IACH,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,0BAA0B;IA8BlC,OAAO,CAAC,mBAAmB;IAiD3B;;;;;;OAMG;IACH,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,sBAAsB;IAmC9B,OAAO,CAAC,iBAAiB;IAoDzB;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;CA6B7B;AAGD,wBAAgB,4BAA4B,CAC3C,MAAM,EAAE,OAAO;AACf;;GAEG;AACH,gBAAgB,EAAE,MAAM,EAAE,UAsI1B;AAID,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,OAAO,UAqExD;AAqBD;;GAEG;AAEH;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,mBAmB1D"}

package/out/dde/fileGenerators/dlo.js

@@ -27,6 +27,7 @@ exports.AutoDDEGenerator = void 0;
 exports.generateAutoIncFromMap = generateAutoIncFromMap;
 exports.generateAutoUplinkIncFromMap = generateAutoUplinkIncFromMap;
 exports.generateMainDDEIncFromMap = generateMainDDEIncFromMap;
+exports.buildDefaultInc = buildDefaultInc;
 const semver = __importStar(require("semver"));
 const coreDefinitions_1 = require("../coreDefinitions");
 const DeviceProfiles_1 = require("../../DeviceProfiles");
@@ -38,6 +39,9 @@ var CONFIG_CONTAINER = coreDefinitions_1.DDE_Core.CONFIG_CONTAINER;
 var CONTAINER_DEF_DLO_CID_BASE = coreDefinitions_1.DDE_Core.CONTAINER_DEF_DLO_CID_BASE;
 var CONTAINER_DEFS = coreDefinitions_1.DDE_Core.CONTAINER_DEFS;
 var fieldTypeDefinitions = coreDefinitions_1.DDE_Core.fieldTypeDefinitions;
+const vscode_uri_1 = require("vscode-uri");
+const defaultFiles_1 = require("../../defaultFiles");
+const dependencies_1 = require("../../dependencies");
 /** get effective field type for pawn access (may be overriden or skipped using attribute dlorw=...)
  * @return {*} | 'skip' | null - null=error occured
  */
@@ -880,4 +884,55 @@ function generateMainDDEFunctionBody(pawnSource, containerDefinition, readWrite)
         pawnSource(`\t#endif`);
     }
 }
+/**
+ * Default INC handling
+ */
+/**
+ * Generate the default.inc file
+ * @param cwd
+ * @param fs
+ * @param dependencies
+ */
+async function buildDefaultInc(cwd, fs) {
+    const fileContent = [];
+    const dloLibs = await dependencies_1.Dependencies.getDloDependencies(cwd, fs);
+    await addInclude(cwd, fs, fileContent, defaultFiles_1.DefaultFiles.fileNames.autoInc);
+    const autoDdeIncs = await getAutoDDEIncludes(cwd, fs, dloLibs);
+    for (const dloLib of dloLibs) {
+        // todo use relative path as include?
+        fileContent.push(`#include <${dloLib.name}>`);
+        if (dloLib.name === 'dlo-core') {
+            fileContent.push(...autoDdeIncs);
+            await addInclude(cwd, fs, fileContent, defaultFiles_1.DefaultFiles.fileNames.autoDdeInc.replace('X', 'app'));
+            await addInclude(cwd, fs, fileContent, defaultFiles_1.DefaultFiles.fileNames.autoDdeInc.replace('X', 'main'));
+            await addInclude(cwd, fs, fileContent, defaultFiles_1.DefaultFiles.fileNames.autoUplinkInc);
+        }
+    }
+    return fileContent.join('\n');
+}
+/**
+ * Get all <library-name>-dde.inc files
+ * @param cwd
+ * @param fs
+ * @param dependencies
+ */
+async function getAutoDDEIncludes(cwd, fs, dependencies) {
+    const includes = [];
+    for (const dependency of dependencies) {
+        const includePath = defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.autoDdeInc.replace('X', dependency.name);
+        if (await fs.stat(vscode_uri_1.Utils.joinPath(cwd, includePath))) {
+            includes.push(`#include "${defaultFiles_1.DefaultFiles.fileNames.autoDdeInc.replace('X', dependency.name)}"`);
+        }
+    }
+    return includes;
+}
+/**
+ * Validate if the given file exist within the .studio/auto/dlo directory
+ */
+async function addInclude(cwd, fs, fileContent, fileName) {
+    const basePath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.path, fileName);
+    if (await fs.stat(basePath)) {
+        fileContent.push(`#include "${fileName}"`);
+    }
+}
 //# sourceMappingURL=dlo.js.map

package/out/dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAE/C,yBAAiB,YAAY,CAAC;IAC7B;;;;;OAKG;IACH,SAAsB,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,UAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAQ5G;IAED;;;;OAIG;IACH,SAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE/D;IAED;;;;;OAKG;IACH,SAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,GAAG,CAGpE;IAED;;;;OAIG;IACH,SAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,UAM7C;IAED;;;;;;OAMG;IACH,SAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,QAKvF;IAED;;;;;;OAMG;IACH,SAAsB,sBAAsB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,EACX,iBAAiB,GAAE,QAAQ,CAAC,YAAiB,EAC7C,WAAW,UAAQ,kCAgCnB;IAED;;;;;;;OAOG;IACH,SAAsB,qBAAqB,CAC1C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,oBActB;IAED;;;;;OAKG;IACH,SAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAK9E;IAED;;;;;;OAMG;IACH,SAAsB,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,iBAYjH;IAED;;;;;;;;OAQG;IACH,SAAsB,iBAAiB,CACtC,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,WAAW,UAAQ,GACjB,OAAO,CAAC,SAAS,CAAC,CA+DpB;IAED;;;;;OAKG;IACH,SAAsB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,iBAapF;IAED;;;;;;;OAOG;IACH,SAAsB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAmBxG;CACD"}
+{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../src/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAOhC,eAAO,MAAM,aAAa,oBAAoB,CAAC;AAE/C,yBAAiB,YAAY,CAAC;IAG7B;;;;;OAKG;IACH,SAAsB,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,UAAU,UAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAQ5G;IAED;;;;OAIG;IACH,SAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE/D;IAED;;;;;OAKG;IACH,SAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,GAAG,CAGpE;IAED;;;;OAIG;IACH,SAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,UAM7C;IAED;;;;;;OAMG;IACH,SAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,QAKvF;IAED;;;;;;OAMG;IACH,SAAsB,sBAAsB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,EACX,iBAAiB,GAAE,QAAQ,CAAC,YAAiB,EAC7C,WAAW,UAAQ,kCAgCnB;IAED;;;;;;;OAOG;IACH,SAAsB,qBAAqB,CAC1C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,EACX,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,oBActB;IAED;;;;;OAKG;IACH,SAAsB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAK9E;IAED;;;;;;OAMG;IACH,SAAsB,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,iBAYjH;IAED;;;;;;;;OAQG;IACH,SAAsB,iBAAiB,CACtC,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,WAAW,UAAQ,GACjB,OAAO,CAAC,SAAS,CAAC,CA+DpB;IAED;;;;;OAKG;IACH,SAAsB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,iBAapF;IAED;;;;;;;OAOG;IACH,SAAsB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAmBxG;IAED,UAAiB,UAAU;QAC1B,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,GAAG,CAAC;KACV;IAED;;;;OAIG;IACH,SAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,yBA+B7D;CACD"}

package/out/dependencies.js

@@ -28,11 +28,13 @@ const vscode_uri_1 = require("vscode-uri");
 const manifest_1 = require("./manifest");
 const semver = __importStar(require("semver"));
 const registryAPI_1 = require("./registryAPI");
+const defaultFiles_1 = require("./defaultFiles");
 const tinytar = require('tinytar-fix');
 const pako = require('pako');
 exports.LIB_DEPS_PATH = '.studio/libdeps';
 var Dependencies;
 (function (Dependencies) {
+    var isLibraryProject = manifest_1.Manifest.isLibraryProject;
     /**
      * Just combine all dependencies in one object
      * Optional devDependencies can be excluded
@@ -294,6 +296,40 @@ var Dependencies;
         }
     }
     Dependencies.uninstallDependency = uninstallDependency;
+    /**
+     * Get all libraries that have dlo source
+     * @param cwd
+     * @param fs
+     */
+    async function getDloDependencies(cwd, fs) {
+        const manifest = await manifest_1.Manifest.read(cwd, fs);
+        const allDependencies = await getAll(manifest);
+        const dloDependencies = [];
+        for (const dependencyId in allDependencies) {
+            const depPath = Dependencies.dependencyToPath(cwd, dependencyId);
+            const name = Dependencies.dependencyIdToName(dependencyId);
+            const incPath = vscode_uri_1.Utils.joinPath(depPath, defaultFiles_1.DefaultFiles.filePaths.dlo.path, `${name}.inc`);
+            const exists = await fs.stat(incPath);
+            if (exists) {
+                dloDependencies.push({
+                    name,
+                    path: incPath
+                });
+            }
+        }
+        // add current project file if it is a library project
+        if (isLibraryProject(manifest)) {
+            const incPath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dlo.path, `${manifest.name}.inc`);
+            if (await fs.stat(incPath)) {
+                dloDependencies.push({
+                    name: manifest.name,
+                    path: incPath
+                });
+            }
+        }
+        return dloDependencies;
+    }
+    Dependencies.getDloDependencies = getDloDependencies;
 })(Dependencies || (exports.Dependencies = Dependencies = {}));
 async function fetchStudioJson(token, studioJsonURL) {
     return await registryAPI_1.Registry.fetchLibraryContent(token, studioJsonURL, true);

package/out/main.js

@@ -57,12 +57,26 @@ program
     .action(async (apmPart) => {
     if (apmPart === 'dde') {
         const result = await dde_1.DDE.compileDDE(cwd, cliFS_1.cliFS);
-        // todo log warning and errors!
+        result.diagnostics.forEach(diagnostic => {
+            const message = `${diagnostic.file.path}: ${diagnostic.message}`;
+            if (diagnostic.level === 'error') {
+                console.error(message);
+            }
+            else if (diagnostic.level === 'warning') {
+                console.warn(message);
+            }
+            else {
+                console.log(message);
+            }
+        });
         if (result.ddeJSON) {
             await dde_1.DDE.exportMyDatanetXML(cwd, cliFS_1.cliFS, result.ddeJSON);
             await dde_1.DDE.exportHistoryJson(cwd, cliFS_1.cliFS, result.ddeJSON);
-            await dde_1.DDE.exportAutoDloFiles(cwd, cliFS_1.cliFS, result.ddeJSON);
             await dde_1.DDE.exportOpenApi(cwd, cliFS_1.cliFS, result.ddeJSON);
+            await dde_1.DDE.exportAutoDloFiles(cwd, cliFS_1.cliFS, result.ddeJSON);
+        }
+        else {
+            console.error('Project has errors!');
         }
     }
 });

package/package.json

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