@microtronics/studio-cli 0.29.3 → 0.30.0

package/CHANGELOG.md

@@ -1,10 +1,32 @@
 
 
-## 0.29.3 (2025-04-25)
+## 0.30.0 (2025-05-05)
+
+
+### Features
+
+* **studio-cli:** add support for packaging app projects ([280115f](https://bitbucket.org/microtronics-core/vscode-studio/commits/280115fa77afb78754884a4eb83bd0365ff5b319))
+* **studio-cli:** add support for packaging library projects ([1888df1](https://bitbucket.org/microtronics-core/vscode-studio/commits/1888df1b5d8c2f53a9705756d28d42360109e3ba))
 
 
 ### Bug Fixes
 
+* **studio-cli:** ensure dist/dlo directory is created on compile ([f110636](https://bitbucket.org/microtronics-core/vscode-studio/commits/f110636fc5042a5e25cc2d26fc98df4356d706bb))
+* **studio-cli:** rename method in CustomWasmFS ([c3e1a22](https://bitbucket.org/microtronics-core/vscode-studio/commits/c3e1a227d7e57e91f9ddea45f11412ed59f71614))
+* **studio-cli:** run dlo compiler relative to the cwd ([110b476](https://bitbucket.org/microtronics-core/vscode-studio/commits/110b4767bda8134aca2781c51f6e06bf800c4c67))
+
+## 0.29.4 (2025-04-25)
+
+
+### Bug Fixes
+
+* **studio-cli:** always use a clean app version as reference for dde generation ([da0b45b](https://bitbucket.org/microtronics-core/vscode-studio/commits/da0b45b5d9482056b3ead821e5b20e4083f4f06e))
+
+## 0.29.3 (2025-04-25)
+
+
+### Bug Fixes
+
 * **studio-cli:** use current dde version as reference to ([b07ab04](https://bitbucket.org/microtronics-core/vscode-studio/commits/b07ab04f97d560d8b51935b673088dc7b7c21ed4))
 
 ## 0.29.2 (2025-04-04)

package/dist/studio-cli.d.ts

@@ -1807,48 +1807,17 @@ declare class DloCompiler {
     private cwd;
     private fs;
     private logger;
-    private preCompiler;
     private dloCC;
     private stdout;
     private stderr;
     constructor(cwd: URI, fs: LocalFS, logger: Log.Logger);
     private initDloCC;
-    private get MEMFS();
     compile(cwd: URI, fs: LocalFS): Promise<{
         code: number;
         stdout: string[];
         stderr: string[];
         diagnostics: Diagnostics.File[];
     }>;
-    private persistGeneratedFiles;
-    /**
-     * Search for all dlo files and persist it to the MEMFS
-     * @param cwd
-     * @param fs
-     * @param manifest
-     * @private
-     */
-    /**
-     * Precompile the given file and pass it to the MEMFS
-     * @param cwd
-     * @param manifest
-     * @param file
-     * @param stringBlob
-     */
-    memFSwriteFile(cwd: URI, manifest: Manifest.Manifest, file: URI, stringBlob: string[]): Promise<Diagnostics.File[]>;
-    /**
-     * Move a file within the MEMFS
-     * @param oldUri
-     * @param newUri
-     */
-    memFSmove(oldUri: URI, newUri: URI): Promise<void>;
-    /**
-     * Remove a file from the MEMFS
-     * @param uri
-     */
-    memFSunlink(uri: URI): Promise<void>;
-    private memFSmkdir;
-    private memFSstat;
     /**
      * Get a symbol compiler instance
      */
@@ -2146,6 +2115,12 @@ declare interface LocalFS {
      * @param target The destination location.
      */
     copy: (source: URI, target: URI) => Promise<any>;
+    /**
+     * Create a new directory
+     *
+     * @param path The directory path that should be created.
+     */
+    mkdir: (path: URI) => Promise<any>;
 }
 
 export declare namespace Log {
@@ -2319,6 +2294,19 @@ export declare namespace Manifest {
     export function isApmPartEnabled(cwd: URI, fs: LocalFS, apmPart: APM.Part, manifest?: Manifest.Manifest): Promise<boolean>;
 }
 
+/**
+ * Packs the given directory into a deployable package using the specified configuration.
+ *
+ * @param {URI} cwd - The current working directory URI where the package is located.
+ * @param {LocalFS} fs - The file system interface to perform file-related operations.
+ * @param {Log.Logger} logger - The logger instance for logging activity during the packaging process.
+ * @param {Globals.ENV} env - The environment variables and settings to use during packaging.
+ * @param {string | null} apiToken - The API token used for authentication, if required.
+ * @param {APM.TagPhase} [optsPhase] - An optional tag phase for the package tagging process.
+ * @return {Promise<Package>} A promise that resolves to the packaged result.
+ */
+export declare function pack(cwd: URI, fs: LocalFS, logger: Log.Logger, env: Globals.ENV, apiToken: string | null, optsPhase?: APM.TagPhase): Promise<void>;
+
 export declare namespace Package {
     export interface MergedDiagnostics {
         [APM.Part.dde]: Diagnostics.File[];
@@ -2350,6 +2338,7 @@ export declare namespace Package {
      * @param env
      */
     export function release(cwd: URI, fs: LocalFS, logger: Log.Logger, env: Globals.ENV, token: Registry.AuthToken, releasePhase?: APM.TagPhase, allowedBackends?: Registry.ApiNewApplication['allowedBackends']): Promise<void>;
+    export function pack(cwd: URI, fs: LocalFS, logger: Log.Logger, env: Globals.ENV, token: Registry.AuthToken, releasePhase?: APM.TagPhase): Promise<void>;
     /**
      * Publish an application model tag
      * @param cwd
@@ -2395,7 +2384,7 @@ export declare namespace Package {
     export function validatePublishSettings(cwd: URI, fs: LocalFS, token: Registry.AuthToken, env: Globals.ENV): Promise<void>;
 }
 
-declare function parseWarningsAndErrors(stderr: string[], relatedFile?: URI): Diagnostics.File[];
+declare function parseWarningsAndErrors(cwd: URI, stderr: string[], relatedFile?: URI): Diagnostics.File[];
 
 /**
  * This file was auto-generated by openapi-typescript.

package/out/api.js

@@ -4,6 +4,7 @@ exports.Log = exports.ENV = exports.DFILES = exports.Library = exports.APM = exp
 exports.install = install;
 exports.build = build;
 exports.publish = publish;
+exports.pack = pack;
 const dependencies_1 = require("./dependencies");
 Object.defineProperty(exports, "Dependencies", { enumerable: true, get: function () { return dependencies_1.Dependencies; } });
 const manifest_1 = require("./manifest");
@@ -79,6 +80,26 @@ async function install(cwd, fs, env, apiToken, dependencies) {
 async function build(cwd, fs, logger, env, apiToken = null, selectedParts = true, errorWithDiagnostics) {
     return package_1.Package.buildAll(cwd, fs, logger, env, apiToken, selectedParts, errorWithDiagnostics);
 }
+/**
+ * Parses and validates the allowed backends configuration.
+ *
+ * @param {string | undefined} optsAllowedBackends - A string defining allowed backends,
+ * either as a semicolon-separated list of backends or the wildcard '*'. It may also be undefined.
+ * @return {Promise<Registry.ApiNewApplication['allowedBackends']>} A promise that resolves to
+ * an array of allowed backends or null if none are provided.
+ * @throws {Error} Throws an error if the validation of the allowed backends fails.
+ */
+async function parseAllowedBackends(optsAllowedBackends) {
+    let allowedBackends = null;
+    if (optsAllowedBackends) {
+        allowedBackends = optsAllowedBackends === '*' ? optsAllowedBackends : optsAllowedBackends.split(';');
+        const errorMessage = await manifest_1.Manifest.validateRegistryAllowedBackends(allowedBackends);
+        if (errorMessage) {
+            throw new Error(errorMessage);
+        }
+    }
+    return allowedBackends;
+}
 /**
  * Publishes a package to the registry with the specified settings and configurations.
  *
@@ -93,14 +114,22 @@ async function build(cwd, fs, logger, env, apiToken = null, selectedParts = true
  */
 async function publish(cwd, fs, logger, env, apiToken, optsAllowedBackends, optsPhase) {
     logger.info('Publishing package...');
-    let allowedBackends = null;
-    if (optsAllowedBackends) {
-        allowedBackends = optsAllowedBackends === '*' ? optsAllowedBackends : optsAllowedBackends.split(';');
-        const errorMessage = await manifest_1.Manifest.validateRegistryAllowedBackends(allowedBackends);
-        if (errorMessage) {
-            throw new Error(errorMessage);
-        }
-    }
+    const allowedBackends = await parseAllowedBackends(optsAllowedBackends);
+    await package_1.Package.validatePublishSettings(cwd, fs, apiToken, env);
     return package_1.Package.release(cwd, fs, logger, env, apiToken, optsPhase, allowedBackends);
 }
+/**
+ * Packs the given directory into a deployable package using the specified configuration.
+ *
+ * @param {URI} cwd - The current working directory URI where the package is located.
+ * @param {LocalFS} fs - The file system interface to perform file-related operations.
+ * @param {Log.Logger} logger - The logger instance for logging activity during the packaging process.
+ * @param {Globals.ENV} env - The environment variables and settings to use during packaging.
+ * @param {string | null} apiToken - The API token used for authentication, if required.
+ * @param {APM.TagPhase} [optsPhase] - An optional tag phase for the package tagging process.
+ * @return {Promise<Package>} A promise that resolves to the packaged result.
+ */
+async function pack(cwd, fs, logger, env, apiToken, optsPhase) {
+    return package_1.Package.pack(cwd, fs, logger, env, apiToken, optsPhase);
+}
 //# sourceMappingURL=api.js.map

package/out/cliFS.js

@@ -66,6 +66,9 @@ exports.cliFS = {
         else {
             return promises_1.default.copyFile(source.fsPath, target.fsPath);
         }
+    },
+    async mkdir(path) {
+        await promises_1.default.mkdir(path.fsPath, { recursive: true });
     }
 };
 //# sourceMappingURL=cliFS.js.map

package/out/dde/dde.js

@@ -191,7 +191,7 @@ var DDE;
             logger.warn('Could not fetch dde of previous version: No API token provided.');
             return;
         }
-        const currentVersion = semver.valid(manifest.version) ? manifest.version : semver.coerce(manifest.version);
+        const currentVersion = semver.coerce(manifest.version);
         try {
             const appProfile = await registryAPI_1.Registry.getExistingApplication(apiToken, manifest.publisher, manifest.registry.id, env);
             const appVersions = appProfile.versions;

package/out/dlo/CustomWasmFS.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CUSTOM_WASM_FS = exports.precompilerDiagnostics = void 0;
 exports.uriToMemFsPath = uriToMemFsPath;
+exports.relativeMemFsPath = relativeMemFsPath;
 const nodeFs = __importStar(require("fs"));
 const vscode_uri_1 = require("vscode-uri");
 const preCompiler_1 = require("./preCompiler");
@@ -62,6 +63,25 @@ const CUSTOM_WASM_FS = (FS, cwd, manifest) => {
                 ctime: stat.ctime
             };
         },
+        setattr(node, attr) {
+            const path = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(node.mount.opts.root), FS.getPath(node)).fsPath;
+            if (!nodeFs.existsSync(path)) {
+                throw new FS.ErrnoError(44 /* ENOENT */);
+            }
+            // Change file size (truncate/grow)
+            if (typeof attr.size === 'number') {
+                nodeFs.truncateSync(path, attr.size);
+            }
+            // Change file mode (permissions)
+            if (typeof attr.mode === 'number') {
+                nodeFs.chmodSync(path, attr.mode);
+            }
+            // Change access/modification time
+            if (attr.atime || attr.mtime) {
+                const stat = nodeFs.statSync(path);
+                nodeFs.utimesSync(path, attr.atime ?? stat.atime, attr.mtime ?? stat.mtime);
+            }
+        },
         lookup(parent, name) {
             const currPath = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(parent.mount.opts.root), FS.getPath(parent), name);
             const path = currPath.fsPath;
@@ -81,7 +101,10 @@ const CUSTOM_WASM_FS = (FS, cwd, manifest) => {
         mknod(parent, name, mode, dev) {
             const path = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(parent.mount.opts.root), FS.getPath(parent), name).fsPath;
             nodeFs.writeFileSync(path, '');
-            return FS.createNode(parent, name, mode, dev);
+            const node = FS.createNode(parent, name, mode, dev);
+            node.node_ops = parent.node_ops;
+            node.stream_ops = parent.stream_ops;
+            return node;
         },
         unlink(parent, name) {
             const path = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(parent.mount.opts.root), FS.getPath(parent), name).fsPath;
@@ -90,14 +113,17 @@ const CUSTOM_WASM_FS = (FS, cwd, manifest) => {
         mkdir(parent, name, mode) {
             const path = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(parent.mount.opts.root), FS.getPath(parent), name).fsPath;
             nodeFs.mkdirSync(path, { mode });
-            return FS.createNode(parent, name, mode | MODE_DIR, 0);
+            const node = FS.createNode(parent, name, mode | MODE_DIR, 0);
+            node.node_ops = parent.node_ops;
+            node.stream_ops = parent.stream_ops;
+            return node;
         },
         rmdir(parent, name) {
             const path = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(parent.mount.opts.root), FS.getPath(parent), name).fsPath;
             nodeFs.rmdirSync(path);
         },
-        rename(oldParent, oldName, newParent, newName) {
-            const oldPath = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(oldParent.mount.opts.root), FS.getPath(oldParent), oldName).fsPath;
+        rename(oldParent, newParent, newName) {
+            const oldPath = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(oldParent.mount.opts.root), FS.getPath(oldParent)).fsPath;
             const newPath = vscode_uri_1.Utils.joinPath(vscode_uri_1.URI.parse(newParent.mount.opts.root), FS.getPath(newParent), newName).fsPath;
             nodeFs.renameSync(oldPath, newPath);
         }
@@ -224,4 +250,9 @@ function precompileRequestedDloFile(cwd, manifest, filePath) {
 function uriToMemFsPath(path) {
     return path.fsPath.replace(/\\/g, '/');
 }
+function relativeMemFsPath(cwd, path) {
+    const cwdPath = uriToMemFsPath(cwd);
+    const fsPath = uriToMemFsPath(path);
+    return fsPath.replace(cwdPath, '');
+}
 //# sourceMappingURL=CustomWasmFS.js.map

package/out/dlo/compiler.js

@@ -1,37 +1,12 @@
 "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.DloCompiler = void 0;
 exports.parseWarningsAndErrors = parseWarningsAndErrors;
 exports.generateConfigFile = generateConfigFile;
-const preCompiler_1 = require("./preCompiler");
 const vscode_uri_1 = require("vscode-uri");
 const manifest_1 = require("../manifest");
 const defaultFiles_1 = require("../defaultFiles");
 const dependencies_1 = require("../dependencies");
-const iconv = __importStar(require("iconv-lite"));
 const apm_1 = require("../package/apm");
 const CustomWasmFS_1 = require("./CustomWasmFS");
 const DLO_MODULE = require('./dlocc.js');
@@ -39,7 +14,6 @@ class DloCompiler {
     cwd;
     fs;
     logger;
-    preCompiler = new preCompiler_1.DloPreCompiler();
     dloCC;
     stdout = [];
     stderr = [];
@@ -55,16 +29,18 @@ class DloCompiler {
         this.dloCC = await DLO_MODULE({
             noExitRuntime: noExit,
             print: (data) => {
-                this.logger.log(data);
+                const patched = parseCompilerMessage(this.cwd, data);
+                this.logger.log(patched ? patched.message : data);
                 this.stdout.push(data);
             },
             printErr: (err) => {
+                const patched = parseCompilerMessage(this.cwd, err);
                 // filter for warn messages
                 if (err.includes(': warning')) {
-                    this.logger.warn(err);
+                    this.logger.warn(patched ? patched.message : err);
                 }
                 else {
-                    this.logger.error(err);
+                    this.logger.error(patched ? patched.message : err);
                 }
                 this.stderr.push(err);
                 this.stdout.push(err);
@@ -78,9 +54,8 @@ class DloCompiler {
         FS.filesystems.NODEFS_TS = (0, CustomWasmFS_1.CUSTOM_WASM_FS)(FS, this.cwd, manifest);
         FS.mkdir(rootDir);
         FS.mount(FS.filesystems.NODEFS_TS, { root: '/' }, rootDir);
-    }
-    get MEMFS() {
-        return this.dloCC.FS;
+        // Set the current working directory to the root directory
+        FS.chdir((0, CustomWasmFS_1.uriToMemFsPath)(this.cwd));
     }
     async compile(cwd, fs) {
         const manifest = await manifest_1.Manifest.read(cwd, fs);
@@ -94,18 +69,17 @@ class DloCompiler {
             };
         }
         await this.initDloCC();
+        await fs.mkdir(vscode_uri_1.Utils.joinPath(cwd, 'dist/dlo'));
         const mainFile = vscode_uri_1.Utils.joinPath(cwd, manifest.dlo?.mainFile || defaultFiles_1.DefaultFiles.filePaths.dlo.mainDLO);
         const options = [];
         // read config file
         const configFilePath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.cfg);
-        options.push(`-T${(0, CustomWasmFS_1.uriToMemFsPath)(configFilePath)}`);
+        const configFile = (0, CustomWasmFS_1.relativeMemFsPath)(cwd, configFilePath);
+        options.push(`-T.${configFile}`);
         let exitCode = 0;
         try {
-            exitCode = await this.dloCC.callMain([(0, CustomWasmFS_1.uriToMemFsPath)(mainFile), ...options]);
-            // compiler doesn't have any errors
-            if (exitCode === 0) {
-                await this.persistGeneratedFiles(cwd, fs, mainFile);
-            }
+            const mainFilePath = `.${(0, CustomWasmFS_1.relativeMemFsPath)(cwd, mainFile)}`;
+            exitCode = await this.dloCC.callMain([mainFilePath, ...options]);
         }
         catch (e) {
             this.logger.error(e);
@@ -114,109 +88,9 @@ class DloCompiler {
             code: exitCode,
             stdout: this.stdout,
             stderr: this.stderr,
-            diagnostics: [...CustomWasmFS_1.precompilerDiagnostics, ...parseWarningsAndErrors(this.stderr, mainFile)]
+            diagnostics: [...CustomWasmFS_1.precompilerDiagnostics, ...parseWarningsAndErrors(cwd, this.stderr, mainFile)]
         };
     }
-    async persistGeneratedFiles(cwd, fs, mainFile) {
-        const baseName = vscode_uri_1.Utils.basename(mainFile).split('.')[0];
-        const possibleFiles = this.MEMFS.readdir('/');
-        for (const fileName of possibleFiles) {
-            if (fileName.startsWith(baseName)) {
-                const blob = this.MEMFS.readFile(fileName);
-                const distPath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.dist.dloPath, fileName);
-                await fs.writeFile(distPath, blob);
-            }
-        }
-    }
-    /**
-     * Search for all dlo files and persist it to the MEMFS
-     * @param cwd
-     * @param fs
-     * @param manifest
-     * @private
-     */
-    /*	private async persistDloFiles(cwd: URI, fs: LocalFS, manifest: Manifest.Manifest) {
-        const files = await fs.findFiles(cwd, '**!/!*.{dlo,inc}');
-        const precompilerDiagnostics: Diagnostics.File[] = [];
-        // add dlo.cfg file to the file list
-        for (const file of files) {
-            if (await fs.stat(file)) {
-                const content = await fs.readFile(file);
-                const stringBlob = convertBlobToStringArray(content);
-                const diagnostics = await this.memFSwriteFile(cwd, manifest, file, stringBlob);
-                precompilerDiagnostics.push(...diagnostics);
-            }
-        }
-        return precompilerDiagnostics;
-    }*/
-    /**
-     * Precompile the given file and pass it to the MEMFS
-     * @param cwd
-     * @param manifest
-     * @param file
-     * @param stringBlob
-     */
-    async memFSwriteFile(cwd, manifest, file, stringBlob) {
-        const precompilerDiagnostics = [];
-        const preCompiled = this.preCompiler.preCompileDloFile(cwd, manifest, file, stringBlob);
-        precompilerDiagnostics.push(...preCompiled.diagnostics);
-        this.memFSmkdir(file);
-        this.MEMFS.writeFile((0, CustomWasmFS_1.uriToMemFsPath)(file), iconv.encode(preCompiled.data, 'cp1252'));
-        return precompilerDiagnostics;
-    }
-    /**
-     * Move a file within the MEMFS
-     * @param oldUri
-     * @param newUri
-     */
-    async memFSmove(oldUri, newUri) {
-        try {
-            this.memFSmkdir(newUri);
-            this.MEMFS.rename((0, CustomWasmFS_1.uriToMemFsPath)(oldUri), (0, CustomWasmFS_1.uriToMemFsPath)(newUri));
-        }
-        catch (e) {
-            this.logger.error('memFSmove', e);
-        }
-    }
-    /**
-     * Remove a file from the MEMFS
-     * @param uri
-     */
-    async memFSunlink(uri) {
-        try {
-            this.MEMFS.unlink((0, CustomWasmFS_1.uriToMemFsPath)(uri));
-        }
-        catch (e) {
-            this.logger.error('memFSunlink', e);
-        }
-    }
-    memFSmkdir(uri) {
-        const split = (0, CustomWasmFS_1.uriToMemFsPath)(vscode_uri_1.Utils.dirname(uri)).split('/');
-        let dirname = '';
-        split.forEach(folder => {
-            if (!folder) {
-                return;
-            }
-            try {
-                dirname += `${folder}/`;
-                if (!this.memFSstat(dirname)) {
-                    this.MEMFS.mkdir(dirname);
-                }
-            }
-            catch (e) {
-                this.logger.error('memFSmkdir', e);
-            }
-        });
-    }
-    memFSstat(dirname) {
-        try {
-            this.MEMFS.stat(dirname);
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
     //Symbol Compiler handling
     /**
      * Get a symbol compiler instance
@@ -253,7 +127,7 @@ class DloCompiler {
     }
 }
 exports.DloCompiler = DloCompiler;
-function parseWarningsAndErrors(stderr, relatedFile) {
+function parseWarningsAndErrors(cwd, stderr, relatedFile) {
     const compilerDiagnostics = [];
     const messages = stderr.filter(line => !!line.trim());
     for (const message of messages) {
@@ -266,35 +140,44 @@ function parseWarningsAndErrors(stderr, relatedFile) {
             });
             continue;
         }
-        // regular error/warning - such as:
-        // 		C:\Users\aai\rmstudio\apmparts\dlo-pawn\stdlib\rm-dde.inc(392) : error 036: empty statement
-        // 		main.p(138) : warning 203: symbol is never used: "log_str"
-        //		main.p(6) : fatal error 100: cannot read from file: "oTests/module_t"
-        const i0 = message.indexOf(' : ');
-        const i1 = message.indexOf(': ', i0 + 3);
-        const fileNameAndLineNumber = message.substring(0, i0).trim();
-        const levelAndCode = message.substring(i0 + 3, i1).trim();
-        const msg = message.substring(i1 + 2).trim();
-        // ignore lines which do not contain err/warn msg (or are empty)
-        if (!fileNameAndLineNumber || !levelAndCode || !msg) {
+        const parsedMessage = parseCompilerMessage(cwd, message);
+        if (!parsedMessage) {
             continue;
         }
-        const [fileName, lineNumber] = fileNameAndLineNumber.split(/[()(-)]/);
-        const decodeLevelAndCode = levelAndCode.split(' ');
-        const level = decodeLevelAndCode[decodeLevelAndCode.length - 2]; //lvl is always the second last
-        let posix = fileName.replace(/\\/g, '/');
-        if (posix.startsWith('/')) {
-            posix = posix.substring(1);
-        }
         compilerDiagnostics.push({
-            file: vscode_uri_1.URI.parse(`file:///${posix}`),
-            level,
-            line: Number(lineNumber) - 1,
-            message: msg
+            file: vscode_uri_1.URI.parse(`file:///${parsedMessage?.posixPath}`),
+            level: parsedMessage.level,
+            line: Number(parsedMessage.lineNumber) - 1,
+            message: parsedMessage.msg
         });
     }
     return compilerDiagnostics;
 }
+function parseCompilerMessage(cwd, message) {
+    // regular error/warning - such as:
+    // 		C:\Users\aai\rmstudio\apmparts\dlo-pawn\stdlib\rm-dde.inc(392) : error 036: empty statement
+    // 		main.p(138) : warning 203: symbol is never used: "log_str"
+    //		main.p(6) : fatal error 100: cannot read from file: "oTests/module_t"
+    const i0 = message.indexOf(' : ');
+    const i1 = message.indexOf(': ', i0 + 3);
+    const fileNameAndLineNumber = message.substring(0, i0).trim();
+    const levelAndCode = message.substring(i0 + 3, i1).trim();
+    const msg = message.substring(i1 + 2).trim();
+    // ignore lines which do not contain err/warn msg (or are empty)
+    if (!fileNameAndLineNumber || !levelAndCode || !msg) {
+        return null;
+    }
+    const [fileName, lineNumber] = fileNameAndLineNumber.split(/[()(-)]/);
+    const decodeLevelAndCode = levelAndCode.split(' ');
+    const level = decodeLevelAndCode[decodeLevelAndCode.length - 2]; //lvl is always the second last
+    const filePath = vscode_uri_1.Utils.joinPath(cwd, fileName);
+    let posixPath = filePath.fsPath.replace(/\\/g, '/');
+    if (posixPath.startsWith('/')) {
+        posixPath = posixPath.substring(1);
+    }
+    const patchedMessage = message.replace(fileName, posixPath);
+    return { level, msg, posixPath, lineNumber, message: patchedMessage };
+}
 /**
  * Generates the DLO .cfg file for the dlo compiler
  * @param cwd
@@ -307,16 +190,17 @@ async function generateConfigFile(cwd, fs, manifest) {
         '-v2' // verbosity of stdout -> 0=quiet, 1=normal, 2=code/data/stack usage report
     ];
     const defaultIncPath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.defaultInc);
-    compileOptions.push(`-p${(0, CustomWasmFS_1.uriToMemFsPath)(defaultIncPath)}`);
+    compileOptions.push(`-p.${(0, CustomWasmFS_1.relativeMemFsPath)(cwd, defaultIncPath)}`);
     const dloLibs = await dependencies_1.Dependencies.getApmPartDependencies(cwd, fs, apm_1.APM.Part.dlo);
     for (const dloLib of dloLibs) {
         const dirName = vscode_uri_1.Utils.dirname(dloLib.path);
-        compileOptions.push(`-i${(0, CustomWasmFS_1.uriToMemFsPath)(dirName)}`);
+        compileOptions.push(`-i.${(0, CustomWasmFS_1.relativeMemFsPath)(cwd, dirName)}`);
     }
     const dloConfiguration = manifest.dlo;
     if (dloConfiguration) {
         compileOptions.push(...dloConfiguration.compileOptions);
     }
+    compileOptions.push(`-o./dist/dlo/main.amx`);
     return {
         path: vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.cfg),
         data: compileOptions.join('\n')

package/out/main.js

@@ -69,6 +69,23 @@ const optionStudioEnv = new commander_1.Option('-e, --env <environment>', 'CLI t
  * Generic option for the STUDIO_TOKEN
  */
 const optionStudioToken = new commander_1.Option('--token <API-token>', 'API Access Token (defaults to STUDIO_TOKEN environment variable)').default(process.env['STUDIO_TOKEN']);
+/**
+ * Represents a command-line option for specifying the allowed backends deployment for a version.
+ *
+ * This variable represents an instance of an `Option` that determines which backends are permitted
+ * during the deployment process. The backends can be specified as*/
+const optionAllowedBackends = new commander_1.Option('--allowedBackends <null|*|server.xz;server.yz>', 'specify the allowedBackends deployment for this version.').default(null);
+const releasePhaseArguments = Object.values(apm_1.APM.TagPhase);
+/**
+ * Represents a command-line option for specifying a release phase in a software deployment process.
+ *
+ * The option includes a flag `-ph` or `--phase`, followed by the user-defined release phase value. It offers predefined
+ * choices for acceptable release phase arguments, ensuring input validation. If no value is explicitly provided,
+ * the default release phase is set to 'release'.
+ */
+const optionReleasePhase = new commander_1.Option('-ph --phase <release phase>', 'specify a release phase')
+    .choices(releasePhaseArguments)
+    .default('release');
 program
     .command('install')
     .aliases(['i'])
@@ -91,19 +108,27 @@ program
     const { env, token } = getDefaultOptions(opts);
     main((0, api_1.build)(cwd, cliFS_1.cliFS, logger, env, token, opts.part));
 });
-const releasePhaseArguments = Object.values(apm_1.APM.TagPhase);
 program
     .command('publish')
-    .addOption(new commander_1.Option('-ph --phase <release phase>', 'specify a release phase')
-    .choices(releasePhaseArguments)
-    .default('release'))
-    .addOption(new commander_1.Option('--allowedBackends <null|*|server.xz;server.yz>', 'specify the allowedBackends deployment for this version.').default(null))
+    .addOption(optionReleasePhase)
+    .addOption(optionAllowedBackends)
     .addOption(optionStudioEnv)
     .addOption(optionStudioToken)
     .action(async (opts) => {
     const { env, token } = getDefaultOptions(opts);
     main((0, api_1.publish)(cwd, cliFS_1.cliFS, logger, env, token, opts.allowedBackends, opts.phase));
 });
+program
+    .command('package')
+    .alias('pack')
+    .description('Package the project')
+    .addOption(optionReleasePhase)
+    .addOption(optionStudioEnv)
+    .addOption(optionStudioToken)
+    .action(async (opts) => {
+    const { env, token } = getDefaultOptions(opts);
+    main((0, api_1.pack)(cwd, cliFS_1.cliFS, logger, env, token, opts.phase));
+});
 module.exports = function (argv) {
     program.parse(argv);
 };

package/out/package/package.js

@@ -14,6 +14,8 @@ const registryAPI_1 = require("../registryAPI");
 const manifest_1 = require("../manifest");
 const library_1 = require("./library");
 const dfiles_1 = require("../dfiles/dfiles");
+const pako = require('pako');
+const tarball = require('tarballjs');
 var Package;
 (function (Package) {
     class BuildError extends Error {
@@ -114,6 +116,29 @@ var Package;
         }
     }
     Package.release = release;
+    async function pack(cwd, fs, logger, env, token, releasePhase) {
+        const manifest = await manifest_1.Manifest.read(cwd, fs);
+        const archiveName = `${manifest.name}-${manifest.version}.tar.gz`;
+        let archive = null;
+        if (manifest_1.Manifest.isLibrary(manifest)) {
+            logger.info('Library project detected. Packing library...');
+            archive = await createLibraryPackage(cwd, fs, logger, token, env);
+        }
+        else {
+            logger.info('App project detected. Packing app...');
+            const apmTag = await createAPMPackage(cwd, fs, logger, token, releasePhase, env);
+            archive = await createArchiveFromApmPackage(apmTag);
+        }
+        const archivePath = vscode_uri_1.Utils.joinPath(cwd, archiveName);
+        if (archive !== null) {
+            await fs.writeFile(archivePath, archive);
+            logger.done(`Packaged: ${archivePath.fsPath}`);
+        }
+        else {
+            logger.error(`Could not create archive: ${archivePath.fsPath}`);
+        }
+    }
+    Package.pack = pack;
     /**
      * Publish an application model tag
      * @param cwd
@@ -125,19 +150,13 @@ var Package;
      * @param env
      */
     async function releaseAPM(cwd, fs, logger, token, releasePhase, allowedBackends = null, env) {
-        if (!Object.values(apm_1.APM.TagPhase).includes(releasePhase)) {
-            throw new Error(`ReleasePhase: ${releasePhase} is not a valid release phase`);
-        }
-        await manifest_1.Manifest.validateBasicManifest(cwd, fs, null);
         const application = await apm_1.APM.validateAccess(cwd, fs, token, false, env);
         if (!application) {
-            return;
+            throw new Error('Could not validate access to application');
         }
-        // build the complete project
-        await buildAll(cwd, fs, logger, env, token);
+        const tagContent = await createAPMPackage(cwd, fs, logger, token, releasePhase, env);
         // update the store apm with the actual name/description/...
         await apm_1.APM.updateProfile(cwd, fs, token, env);
-        const tagContent = await apm_1.APM.createTag(cwd, fs, releasePhase);
         const newTag = await apm_1.APM.publishTag(cwd, fs, token, tagContent, env);
         if (allowedBackends !== null) {
             const manifest = await manifest_1.Manifest.read(cwd, fs);
@@ -160,11 +179,7 @@ var Package;
      */
     async function releaseLibrary(cwd, fs, logger, token, env) {
         const manifest = await manifest_1.Manifest.read(cwd, fs);
-        await manifest_1.Manifest.validateBasicManifest(cwd, fs, manifest);
-        await validatePublishSettings(cwd, fs, token, env);
-        // build the complete project
-        await buildAll(cwd, fs, logger, env, token);
-        const archive = await library_1.Library.createArchive(cwd, fs);
+        const archive = await createLibraryPackage(cwd, fs, logger, token, env);
         await library_1.Library.publishPackage(cwd, fs, token, archive, env);
         logger.done(`Library "${manifest.publisher}/${manifest.name}" with version "${manifest.version}" published!`);
     }
@@ -357,4 +372,36 @@ function logDiagnostics(logger, diagnostics) {
         }
     });
 }
+async function createLibraryPackage(cwd, fs, logger, token, env) {
+    const manifest = await manifest_1.Manifest.read(cwd, fs);
+    await manifest_1.Manifest.validateBasicManifest(cwd, fs, manifest);
+    // build the complete project
+    await Package.buildAll(cwd, fs, logger, env, token);
+    return await library_1.Library.createArchive(cwd, fs);
+}
+async function createAPMPackage(cwd, fs, logger, token, releasePhase, env) {
+    if (!Object.values(apm_1.APM.TagPhase).includes(releasePhase)) {
+        throw new Error(`ReleasePhase: ${releasePhase} is not a valid release phase`);
+    }
+    await manifest_1.Manifest.validateBasicManifest(cwd, fs, null);
+    // build the complete project
+    await Package.buildAll(cwd, fs, logger, env, token);
+    return await apm_1.APM.createTag(cwd, fs, releasePhase);
+}
+async function createArchiveFromApmPackage(data) {
+    const tar = new tarball.TarWriter();
+    // @ts-ignore .entries is valid on FormData
+    for (const [name, value] of data.entries()) {
+        if (name === 'tag') {
+            const fileNode = value;
+            tar.addTextFile(name, fileNode);
+        }
+        else {
+            const fileNode = value;
+            tar.addFileArrayBuffer(name, await fileNode.arrayBuffer());
+        }
+    }
+    const tarBuffer = await tar.write();
+    return pako.gzip(tarBuffer);
+}
 //# sourceMappingURL=package.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@microtronics/studio-cli",
-	"version": "0.29.3",
+	"version": "0.30.0",
 	"description": "Microtronics Studio CLI Tool",
 	"main": "./out/api.js",
 	"typings": "./dist/studio-cli.d.ts",
@@ -63,9 +63,11 @@
 		"chai": "^4.3.8",
 		"chai-as-promised": "^7.1.2",
 		"cross-env": "^7.0.3",
+		"extract-zip": "^2.0.1",
 		"mocha": "^10.8.2",
 		"mocha-junit-reporter": "^2.2.1",
 		"openapi-typescript": "^7.6.0",
+		"tar": "^7.4.3",
 		"ts-node": "^10.9.2",
 		"typescript": "^5.6.3"
 	},