@microtronics/studio-cli 0.8.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 
 
+## 0.9.1 (2024-12-19)
+
+## 0.9.0 (2024-12-19)
+
+
+### Features
+
+* **studio-cli:** dlo-core 0.3.0 requires APM_VERSION to be semver ([62188e0](https://bitbucket.org/microtronics-core/vscode-studio/commits/62188e089769c0d5d37eecf7b1bddc656381700e))
+
 ## 0.8.0 (2024-12-19)
 
 

package/dist/studio-cli.d.ts

@@ -1754,6 +1754,11 @@ export declare namespace Helper {
     export function convertBlobToString(blob: Uint8Array | any): string;
     export function normalizeLF(stringToNormalize?: string): string;
     export function convertBlobToStringArray(blob: Uint8Array | any): string[];
+    /**
+     * Check if the given value is numeric
+     * @param v
+     */
+    const isNumeric: (v: any) => boolean;
 }
 
 declare interface LocalFS {

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;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;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,mBAmB1D"}
+{"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;AA8CnC,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,UA4LlH;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;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,mBAmB1D"}

package/out/dde/fileGenerators/dlo.js

@@ -31,6 +31,7 @@ exports.buildDefaultInc = buildDefaultInc;
 const semver = __importStar(require("semver"));
 const coreDefinitions_1 = require("../coreDefinitions");
 const DeviceProfiles_1 = require("../../DeviceProfiles");
+const manifest_1 = require("../../manifest");
 const helper_1 = require("../../helper");
 var ContainerType = coreDefinitions_1.DDE_Core.ContainerType;
 var TransferDirection = coreDefinitions_1.DDE_Core.TransferDirection;
@@ -42,6 +43,7 @@ var fieldTypeDefinitions = coreDefinitions_1.DDE_Core.fieldTypeDefinitions;
 const vscode_uri_1 = require("vscode-uri");
 const defaultFiles_1 = require("../../defaultFiles");
 const dependencies_1 = require("../../dependencies");
+var isNumeric = helper_1.Helper.isNumeric;
 /** get effective field type for pawn access (may be overriden or skipped using attribute dlorw=...)
  * @return {*} | 'skip' | null - null=error occured
  */
@@ -57,6 +59,28 @@ function getPawnTypeDefinition(field) {
     // regular pawn access
     return tdef.pwn;
 }
+const MICROTRONICS_DLO_CORE = 'Microtronics/dlo-core';
+function getRequiredDloCoreVersion(manifest) {
+    if (manifest_1.Manifest.isLibraryProject(manifest) && manifest.name === 'dlo-core') {
+        return manifest.version;
+    }
+    else if (manifest.libraryDependencies && Object.hasOwn(manifest.libraryDependencies, MICROTRONICS_DLO_CORE)) {
+        return dependencies_1.Dependencies.rangeToVersion(manifest.libraryDependencies[MICROTRONICS_DLO_CORE]);
+    }
+    else if (manifest.libraryDevDependencies && Object.hasOwn(manifest.libraryDevDependencies, MICROTRONICS_DLO_CORE)) {
+        return dependencies_1.Dependencies.rangeToVersion(manifest.libraryDevDependencies[MICROTRONICS_DLO_CORE]);
+    }
+    return null;
+}
+function getApmVersion(manifest) {
+    const requiredVersion = getRequiredDloCoreVersion(manifest);
+    if (requiredVersion === null || semver.gte(requiredVersion, '0.3.0')) {
+        return semver.valid(manifest.version) ? manifest.version : semver.coerce(`${manifest.version}`);
+    }
+    else {
+        return semver.coerce(manifest.version)?.major;
+    }
+}
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function generateAutoIncFromMap(ddeMap, globalDefines, manifest) {
     const _pwn = []; // sample code output for pawn
@@ -68,9 +92,6 @@ function generateAutoIncFromMap(ddeMap, globalDefines, manifest) {
      * generate PROJECT META definitions
      */
     pwn_section('PROJECT META');
-    const isNumeric = (v) => {
-        return !Array.isArray(v) && v - parseFloat(v) + 1 >= 0;
-    };
     function addDefinition(name, value, noString = false) {
         let quotes = isNumeric(value) ? '' : '"';
         if (noString) {
@@ -84,7 +105,8 @@ function generateAutoIncFromMap(ddeMap, globalDefines, manifest) {
     addDefinition(`APM_DPID_${dpid}`, `1`);
     addDefinition(`APM_DPID_${dpid.toUpperCase()}`, `1`);
     addDefinition(`APM_ID`, registry?.id || ''); //
-    addDefinition(`APM_VERSION`, `${semver.coerce(manifest.version)?.major}`); // 1,
+    const currVersion = getApmVersion(manifest);
+    addDefinition(`APM_VERSION`, `${currVersion}`); // 1,
     addDefinition(`APM_NAME`, `${manifest.name}`); // "project X",
     addDefinition(`APM_AUTHOR`, `${manifest.publisher}`);
     for (const [name, value] of Object.entries(auto_inc)) {

package/out/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAG1C,yBAAiB,MAAM,CAAC;IACvB;;;;OAIG;IACH,SAAgB,0BAA0B,CACzC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,KAAK,GACf;QACF,IAAI,EAAE,MAAM,CAAC;QACb,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACrB,CAQA;IAID;;;OAGG;IACH,SAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,UAE7D;IAED,SAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,UAEvD;IAED;;;OAGG;IACH,SAAgB,2BAA2B,CAAC,OAAO,EAAE,UAAU,UAE9D;IAED,SAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,UAazD;IACD,SAAgB,WAAW,CAAC,iBAAiB,GAAE,MAAW,UAEzD;IAED,SAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,GAAG,MAAM,EAAE,CAOzE;CACD"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAG1C,yBAAiB,MAAM,CAAC;IACvB;;;;OAIG;IACH,SAAgB,0BAA0B,CACzC,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,KAAK,GACf;QACF,IAAI,EAAE,MAAM,CAAC;QACb,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACrB,CAQA;IAID;;;OAGG;IACH,SAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,UAE7D;IAED,SAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,UAEvD;IAED;;;OAGG;IACH,SAAgB,2BAA2B,CAAC,OAAO,EAAE,UAAU,UAE9D;IAED,SAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,UAazD;IACD,SAAgB,WAAW,CAAC,iBAAiB,GAAE,MAAW,UAEzD;IAED,SAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,GAAG,MAAM,EAAE,CAOzE;IAED;;;OAGG;IACI,MAAM,SAAS,MAAO,GAAG,YAE/B,CAAC;CACF"}

package/out/helper.js

@@ -71,5 +71,12 @@ var Helper;
         }
     }
     Helper.convertBlobToStringArray = convertBlobToStringArray;
+    /**
+     * Check if the given value is numeric
+     * @param v
+     */
+    Helper.isNumeric = (v) => {
+        return !Array.isArray(v) && v - parseFloat(v) + 1 >= 0;
+    };
 })(Helper || (exports.Helper = Helper = {}));
 //# sourceMappingURL=helper.js.map

package/package.json

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