@microtronics/studio-cli 0.4.1 → 0.5.1

package/out/defaultFiles.js

@@ -14,7 +14,7 @@ var DefaultFiles;
         mainAmxReport: 'main.xml',
         ddeXml: 'dde.xml',
         ddeOpenApi: 'main.yaml',
-        ddeJson: 'history.json',
+        historyJson: 'history.json',
         mainDDE: 'main.dde',
         // autogenerated dlo files
         autoInc: 'auto.inc',
@@ -58,7 +58,7 @@ var DefaultFiles;
             ddeApiPath: `${deployDirectoryName}api/`,
             ddeApi: `${deployDirectoryName}api/${DefaultFiles.fileNames.ddeOpenApi}`,
             // ddeJson has changed to history.json and is now in dde/ dir
-            ddeJson: `${ddeDirectoryName}${DefaultFiles.fileNames.ddeJson}`,
+            historyJson: `${ddeDirectoryName}${DefaultFiles.fileNames.historyJson}`,
             povPath: `${deployDirectoryName}pov`,
             povDetailsPath: `${deployDirectoryName}pov/details`,
             dfilesPath: `${deployDirectoryName}dfiles`,

package/out/globals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"globals.d.ts","sourceRoot":"","sources":["../src/globals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,OAAO,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AAQxC,yBAAiB,OAAO,CAAC;IACxB,UAAiB,OAAO;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACtB;IAED;;;;OAIG;IACH,SAAsB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAkClE;CACD"}

package/out/globals.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Globals = void 0;
+const FS_1 = require("./FS");
+const vscode_uri_1 = require("vscode-uri");
+const dependencies_1 = require("./dependencies");
+const manifest_1 = require("./manifest");
+const defaultFiles_1 = require("./defaultFiles");
+const ini = __importStar(require("ini"));
+const DLO_PATH = defaultFiles_1.DefaultFiles.filePaths.dlo.path;
+var Globals;
+(function (Globals) {
+    /**
+     * Read all ini files from the project directory
+     * @param cwd
+     * @param fs
+     */
+    async function read(cwd, fs) {
+        const manifest = await manifest_1.Manifest.read(cwd, fs);
+        const allDependencies = await dependencies_1.Dependencies.getAll(manifest);
+        const allDefines = {};
+        for (const dependencyId in allDependencies) {
+            const depPath = dependencies_1.Dependencies.dependencyToPath(cwd, dependencyId);
+            const name = dependencies_1.Dependencies.dependencyIdToName(dependencyId);
+            const libIniPath = vscode_uri_1.Utils.joinPath(depPath, DLO_PATH, `${name}.ini`);
+            const hasIni = await fs.stat(libIniPath);
+            if (hasIni) {
+                const iniContent = await readIniFile(fs, libIniPath);
+                Object.assign(allDefines, iniContent);
+            }
+        }
+        // load the library projects specific ini file
+        if (manifest_1.Manifest.isLibraryProject(manifest)) {
+            const libIni = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dlo.path, `${manifest.name}.ini`);
+            if (await fs.stat(libIni)) {
+                const iniContent = await readIniFile(fs, libIni);
+                Object.assign(allDefines, iniContent);
+            }
+        }
+        // load the projects main.ini and overwrite existing defines
+        const mainIni = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dlo.mainINI);
+        if (await fs.stat(mainIni)) {
+            const iniContent = await readIniFile(fs, mainIni);
+            Object.assign(allDefines, iniContent);
+        }
+        return allDefines;
+    }
+    Globals.read = read;
+})(Globals || (exports.Globals = Globals = {}));
+/**
+ * Read given ini file from disk
+ * @param filePath
+ * @param fs
+ */
+async function readIniFile(fs, filePath) {
+    const iniContent = await fs.readFile(filePath);
+    return ini.parse((0, FS_1.convertBlobToString)(iniContent));
+}
+//# sourceMappingURL=globals.js.map

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;AAE1C,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;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;CACD"}

package/out/helper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Helper = void 0;
+const crc_1 = require("./crc");
 var Helper;
 (function (Helper) {
     /**
@@ -18,5 +19,26 @@ var Helper;
         };
     }
     Helper.yamlRangeToLineInformation = yamlRangeToLineInformation;
+    const textEncoder = new TextEncoder();
+    /**
+     * Generates based on the name of the library a CRC16 Modbus hash
+     * @param libraryName
+     */
+    function generateHashForLibraryName(libraryName) {
+        return (0, crc_1.crc32_ethernet)(textEncoder.encode(libraryName)).toString(16);
+    }
+    Helper.generateHashForLibraryName = generateHashForLibraryName;
+    function generateHashForFilePath(filePath) {
+        return (0, crc_1.crc32_ethernet)(textEncoder.encode(filePath)).toString(16);
+    }
+    Helper.generateHashForFilePath = generateHashForFilePath;
+    /**
+     * Generate CRC32 for any binary blob
+     * @param content
+     */
+    function generateCRC32ForFileContent(content) {
+        return (0, crc_1.crc32_ethernet)(content).toString(16).toUpperCase().padStart(8, '0');
+    }
+    Helper.generateCRC32ForFileContent = generateCRC32ForFileContent;
 })(Helper || (exports.Helper = Helper = {}));
 //# sourceMappingURL=helper.js.map

package/out/main.js

@@ -60,6 +60,9 @@ program
         // todo log warning and errors!
         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);
         }
     }
 });

package/out/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAuB,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpD,yBAAiB,QAAQ,CAAC;IACzB,UAAiB,QAAQ;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE;YACT,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;YAChB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;QACF,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,mBAAmB,CAAC,EAAE,YAAY,CAAC;QACnC,sBAAsB,CAAC,EAAE,YAAY,CAAC;QACtC;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,GAAG,CAAC,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC;YACjB,cAAc,EAAE,MAAM,EAAE,CAAC;SACzB,CAAC;QACF,QAAQ,CAAC,EAAE;YACV,EAAE,CAAC,EAAE,MAAM,CAAC;YACZ,eAAe,CAAC,EAAE,IAAI,GAAG,GAAG,GAAG,MAAM,EAAE,CAAC;YACxC,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,GAAG,OAAO,CAAC;SACvC,CAAC;QACF;;WAEG;QACH,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,GAAG,OAAO,CAAC;QACvC,GAAG,CAAC,EAAE;YACL,OAAO,CAAC,EAAE,cAAc,CAAC;SACzB,CAAC;QACF,GAAG,CAAC,EAAE,cAAc,CAAC;KACrB;IAED,UAAiB,YAAY;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACtB;IAED,UAAiB,cAAc;QAC9B,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACpB;IAED;;;;OAIG;IACH,SAAsB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAInE;IAED;;;;;OAKG;IACH,SAAsB,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAExF;IAED;;OAEG;IACH,SAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAErE;CACD"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAuB,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpD,yBAAiB,QAAQ,CAAC;IACzB,KAAY,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;IAE9F,UAAiB,QAAQ;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,cAAc,CAAC;QACrB,OAAO,CAAC,EAAE;YACT,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;YAChB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;QACF,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,mBAAmB,CAAC,EAAE,YAAY,CAAC;QACnC,sBAAsB,CAAC,EAAE,YAAY,CAAC;QACtC;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,GAAG,CAAC,EAAE;YACL,QAAQ,EAAE,MAAM,CAAC;YACjB,cAAc,EAAE,MAAM,EAAE,CAAC;SACzB,CAAC;QACF,QAAQ,CAAC,EAAE;YACV,EAAE,CAAC,EAAE,MAAM,CAAC;YACZ,eAAe,CAAC,EAAE,IAAI,GAAG,GAAG,GAAG,MAAM,EAAE,CAAC;YACxC,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,GAAG,OAAO,CAAC;SACvC,CAAC;QACF;;WAEG;QACH,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,GAAG,OAAO,CAAC;QACvC,GAAG,CAAC,EAAE;YACL,OAAO,CAAC,EAAE,cAAc,CAAC;SACzB,CAAC;QACF,GAAG,CAAC,EAAE,cAAc,CAAC;KACrB;IAED,UAAiB,YAAY;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KACtB;IAED,UAAiB,cAAc;QAC9B,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACpB;IAED;;;;OAIG;IACH,SAAsB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAInE;IAED;;;;;OAKG;IACH,SAAsB,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAExF;IAED;;OAEG;IACH,SAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAErE;CACD"}

package/package.json

@@ -1,69 +1,71 @@
-{
-	"name": "@microtronics/studio-cli",
-	"version": "0.4.1",
-	"description": "Microtronics Studio CLI Tool",
-	"main": "./out/api.js",
-	"typings": "./dist/studio-cli.d.ts",
-	"bin": {
-		"studio-cli": "studio-cli"
-	},
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"release": "release-it --ci",
-		"compile": "npm run build:registryApiTypings && tsc",
-		"api": "api-extractor run --local --verbose",
-		"build": "npm run compile && npm run api",
-		"watch:build": "npm run compile -- --watch",
-		"test": "cross-env STUDIO_ENV=lucky mocha",
-		"test-ci": "cross-env STUDIO_ENV=lucky mocha --reporter mocha-junit-reporter",
-		"watch:test": "npm run test -- --watch",
-		"prepublishOnly": "npm run build",
-		"build:registryApiTypings": "npx openapi-typescript https://api.registry.stage.microtronics.com/v1/openapi.yaml -o ./src/typings/registry.ts"
-	},
-	"author": "Microtronics",
-	"license": "ISC",
-	"dependencies": {
-		"ajv": "^8.17.1",
-		"ajv-keywords": "^5.1.0",
-		"ajv-formats": "^3.0.1",
-		"commander": "^12.1.0",
-		"cross-fetch": "^4.0.0",
-		"openapi-fetch": "^0.13.0",
-		"pako": "^2.1.0",
-		"semver": "^7.6.3",
-		"tarballjs": "github:ankitrohatgi/tarballjs",
-		"tinytar-fix": "^0.1.1",
-		"vscode-uri": "^3.0.8",
-		"yaml": "^2.6.1"
-	},
-	"engines": {
-		"node": ">= 20"
-	},
-	"devDependencies": {
-		"@microsoft/api-extractor": "^7.47.11",
-		"@types/chai": "^4.3.6",
-		"@types/chai-as-promised": "^7.1.5",
-		"@types/mocha": "^10.0.9",
-		"@types/node": "^22.9.1",
-		"@types/semver": "^7.5.6",
-		"@types/vscode": "^1.86.2",
-		"chai": "^4.3.8",
-		"chai-as-promised": "^7.1.2",
-		"cross-env": "^7.0.3",
-		"mocha": "^10.8.2",
-		"mocha-junit-reporter": "^2.2.1",
-		"openapi-typescript": "^7.4.3",
-		"ts-node": "^10.9.2",
-		"typescript": "^5.6.3"
-	},
-	"mocha": {
-		"require": [
-			"ts-node/register"
-		],
-		"watch-files": "src/**",
-		"spec": "./test/**/*.spec.ts",
-		"recursive": true
-	}
-}
+{
+	"name": "@microtronics/studio-cli",
+	"version": "0.5.1",
+	"description": "Microtronics Studio CLI Tool",
+	"main": "./out/api.js",
+	"typings": "./dist/studio-cli.d.ts",
+	"bin": {
+		"studio-cli": "studio-cli"
+	},
+	"publishConfig": {
+		"access": "public"
+	},
+	"scripts": {
+		"release": "release-it --ci",
+		"compile": "npm run build:registryApiTypings && tsc",
+		"api": "api-extractor run --local --verbose",
+		"build": "npm run compile && npm run api",
+		"watch:build": "npm run compile -- --watch",
+		"test": "cross-env STUDIO_ENV=lucky mocha",
+		"test-ci": "cross-env STUDIO_ENV=lucky mocha --reporter mocha-junit-reporter",
+		"watch:test": "npm run test -- --watch",
+		"prepublishOnly": "npm run build",
+		"build:registryApiTypings": "npx openapi-typescript https://api.registry.stage.microtronics.com/v1/openapi.yaml -o ./src/typings/registry.ts"
+	},
+	"author": "Microtronics",
+	"license": "ISC",
+	"dependencies": {
+		"ajv": "^8.17.1",
+		"ajv-formats": "^3.0.1",
+		"ajv-keywords": "^5.1.0",
+		"commander": "^12.1.0",
+		"cross-fetch": "^4.0.0",
+		"ini": "^5.0.0",
+		"openapi-fetch": "^0.13.0",
+		"pako": "^2.1.0",
+		"semver": "^7.6.3",
+		"tarballjs": "github:ankitrohatgi/tarballjs",
+		"tinytar-fix": "^0.1.1",
+		"vscode-uri": "^3.0.8",
+		"yaml": "^2.6.1"
+	},
+	"engines": {
+		"node": ">= 20"
+	},
+	"devDependencies": {
+		"@types/ini": "^4.1.1",
+		"@microsoft/api-extractor": "^7.47.11",
+		"@types/chai": "^4.3.6",
+		"@types/chai-as-promised": "^7.1.5",
+		"@types/mocha": "^10.0.9",
+		"@types/node": "^22.9.1",
+		"@types/semver": "^7.5.6",
+		"@types/vscode": "^1.86.2",
+		"chai": "^4.3.8",
+		"chai-as-promised": "^7.1.2",
+		"cross-env": "^7.0.3",
+		"mocha": "^10.8.2",
+		"mocha-junit-reporter": "^2.2.1",
+		"openapi-typescript": "^7.4.3",
+		"ts-node": "^10.9.2",
+		"typescript": "^5.6.3"
+	},
+	"mocha": {
+		"require": [
+			"ts-node/register"
+		],
+		"watch-files": "src/**",
+		"spec": "./test/**/*.spec.ts",
+		"recursive": true
+	}
+}