@microtronics/studio-cli 0.6.1 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 
 
+## 0.7.0 (2024-12-16)
+
+
+### Features
+
+* **studio-cli:** dlo compiler returns errors as diagnostic information ([eb14ac9](https://bitbucket.org/microtronics-core/vscode-studio/commits/eb14ac9460d3dfd3be9221adde0a87e15eb13cd9))
+* **studio-cli:** first working version of dlo compiler ([158e85f](https://bitbucket.org/microtronics-core/vscode-studio/commits/158e85f3e51a9288835017b928e8306896f5655e))
+* **studio-cli:** implement `findFiles` function ([984ab83](https://bitbucket.org/microtronics-core/vscode-studio/commits/984ab83aacb1fbbd06b8b4ce7a88095a346470a1))
+* **studio-cli:** moved dlo precompiler to the cli ([3087cbc](https://bitbucket.org/microtronics-core/vscode-studio/commits/3087cbcbe9fb494bf368ee50f6774be80c80987d))
+
 ## 0.6.1 (2024-12-12)
 
 

package/dist/studio-cli.d.ts

@@ -1344,6 +1344,7 @@ export declare namespace DefaultFiles {
         legacyAutoDdeInc: string;
         legacyAutoUplinkInc: string;
         reportTemplate: string;
+        dloCfg: string;
     };
     const filePaths: {
         studio: {
@@ -1360,12 +1361,14 @@ export declare namespace DefaultFiles {
                     legacyAutoInc: string;
                     legacyAutoDdeInc: string;
                     legacyAutoUplinkInc: string;
+                    cfg: string;
                 };
             };
             libdeps: string;
         };
         dist: {
             path: string;
+            dloPath: string;
             mainAmxPath: string;
             mainAmxReportPath: string;
             ddeXmlPath: string;
@@ -1521,6 +1524,73 @@ export declare namespace Diagnostics {
     }
 }
 
+export declare namespace DLO {
+    const FileSequencer: typeof DloFileSequencer;
+    export type FileSequencer = DloFileSequencer;
+    const PreCompiler: typeof DloPreCompiler;
+    export type PreCompiler = DloPreCompiler;
+    /**
+     * The DLO Compiler
+     */
+    const Compiler: typeof DloCompiler;
+    export type Compiler = DloCompiler;
+    /**
+     * Generate the dlo.cfg file and write it to the .studio/auto/dlo directory
+     * @param cwd
+     * @param fs
+     */
+    export function exportDloConfig(cwd: URI, fs: LocalFS): Promise<void>;
+}
+
+declare class DloCompiler {
+    private preCompiler;
+    private pawnCC;
+    private stdout;
+    private stderr;
+    constructor();
+    private initPawnCC;
+    private get MEMFS();
+    compile(cwd: URI, fs: LocalFS): Promise<{
+        code: number;
+        stdout: string[];
+        stderr: string[];
+        diagnostics: Diagnostics.File[];
+    }>;
+    private persistGeneratedFiles;
+    private readConfigFile;
+    /**
+     * Precompile the given file and pass it to the MEMFS
+     * @param cwd
+     * @param fs
+     * @param manifest
+     * @private
+     */
+    private memFSwriteFile;
+    private memFSmkdir;
+    private memFSstat;
+    private parseWarningsAndErrors;
+}
+
+declare class DloFileSequencer {
+    private readonly dloFileMap;
+    private rootUri;
+    constructor();
+    set workspacePath(workspacePath: URI);
+    getSequenceForFile(filePath: string): string;
+    getFilePathForSequence(sequenceId: string): string | null;
+}
+
+declare class DloPreCompiler {
+    private pragmaDynamic;
+    private dloFileSequencer;
+    constructor();
+    get pragmaDynamicFlag(): string | null;
+    preCompileDloFile(cwd: URI, manifest: Manifest.Manifest, fileUri: URI, fileBlob: string[]): Promise<{
+        diagnostics: Diagnostics.File[];
+        data: string;
+    }>;
+}
+
 /**
  * Permissions of a file.
  */
@@ -1611,6 +1681,24 @@ export declare namespace Globals {
     export function read(cwd: URI, fs: LocalFS): Promise<Defines>;
 }
 
+/**
+ * A file glob pattern to match file paths against. This can either be a glob pattern string
+ *
+ * Glob patterns can have the following syntax:
+ * * `*` to match zero or more characters in a path segment
+ * * `?` to match on one character in a path segment
+ * * `**` to match any number of path segments, including none
+ * * `{}` to group conditions matches all TypeScript and JavaScript files)
+ * * `[]` to declare a range of characters to match in a path segment (e.g., `example.[0-9]` to match on `example.0`, `example.1`, …)
+ * * `[!...]` to negate a range of characters to match in a path segment (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but not `example.0`)
+ *
+ * Note: a backslash (`\`) is not valid within a glob pattern. If you have an existing file
+ * path to match against, consider to use the {@link RelativePattern relative pattern} support
+ * that takes care of converting any backslash into slash. Otherwise, make sure to convert
+ * any backslash to slash when creating the glob pattern.
+ */
+declare type GlobPattern = string;
+
 export declare namespace Helper {
     /**
      * Convert yaml range to an valid vscode line information
@@ -1653,6 +1741,22 @@ declare interface LocalFS {
      */
     readFile: (path: URI) => Promise<Uint8Array>;
     stat: (path: URI) => Promise<FileStat | null>;
+    /**
+     * Find files across all folders
+     *
+     *
+     * @param include A {@link GlobPattern glob pattern} that defines the files to search for. The glob pattern
+     * will be matched against the file paths of resulting matches relative to their workspace. Use a {@link RelativePattern relative pattern}
+     * to restrict the search results to a {@link WorkspaceFolder workspace folder}.
+     * @param exclude  A {@link GlobPattern glob pattern} that defines files and folders to exclude. The glob pattern
+     * will be matched against the file paths of resulting matches relative to their workspace. When `undefined`, default file-excludes (e.g. the `files.exclude`-setting
+     * but not `search.exclude`) will apply. When `null`, no excludes will apply.
+     * @param maxResults An upper-bound for the result.
+     * @param token A token that can be used to signal cancellation to the underlying search engine.
+     * @return A thenable that resolves to an array of resource identifiers. Will return no results if no
+     * {@link workspace.workspaceFolders workspace folders} are opened.
+     */
+    findFiles: (cwd: URI, include: GlobPattern, exclude?: GlobPattern) => Promise<URI[]>;
 }
 
 export declare namespace Manifest {

package/out/FS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FS.d.ts","sourceRoot":"","sources":["../src/FS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,MAAM,WAAW,OAAO;IACvB;;;OAGG;IACH,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC;;;;OAIG;IACH,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACrE;;;OAGG;IACH,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;CAC9C;AACD;;;;GAIG;AACH,oBAAY,QAAQ;IACnB;;OAEG;IACH,OAAO,IAAI;IACX;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,SAAS,IAAI;IACb;;OAEG;IACH,YAAY,KAAK;CACjB;AAED;;GAEG;AACH,oBAAY,cAAc;IACzB;;;;;;;OAOG;IACH,QAAQ,IAAI;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACxB;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,WAAW,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,UAazD"}
+{"version":3,"file":"FS.d.ts","sourceRoot":"","sources":["../src/FS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,MAAM,WAAW,OAAO;IACvB;;;OAGG;IACH,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC;;;;OAIG;IACH,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACrE;;;OAGG;IACH,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;IAC9C;;;;;;;;;;;;;;OAcG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;CACrF;AACD;;;;GAIG;AACH,oBAAY,QAAQ;IACnB;;OAEG;IACH,OAAO,IAAI;IACX;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,SAAS,IAAI;IACb;;OAEG;IACH,YAAY,KAAK;CACjB;AAED;;GAEG;AACH,oBAAY,cAAc;IACzB;;;;;;;OAOG;IACH,QAAQ,IAAI;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACxB;;;;;OAKG;IACH,IAAI,EAAE,QAAQ,CAAC;IACf;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,WAAW,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AAEjC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,UAazD;AACD,wBAAgB,WAAW,CAAC,iBAAiB,GAAE,MAAW,UAEzD;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,GAAG,GAAG,MAAM,EAAE,CAOzE"}

package/out/FS.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilePermission = exports.FileType = void 0;
 exports.convertBlobToString = convertBlobToString;
+exports.normalizeLF = normalizeLF;
+exports.convertBlobToStringArray = convertBlobToStringArray;
 /**
  * Enumeration of file types. The types `File` and `Directory` can also be
  * a symbolic links, in that case use `FileType.File | FileType.SymbolicLink` and
@@ -57,4 +59,16 @@ function convertBlobToString(blob) {
         return '';
     }
 }
+function normalizeLF(stringToNormalize = '') {
+    return stringToNormalize.replace(/\r\n|\n\r|\r/g, '\n');
+}
+function convertBlobToStringArray(blob) {
+    try {
+        const textData = convertBlobToString(blob).trim();
+        return normalizeLF(textData).split('\n');
+    }
+    catch (e) {
+        return [];
+    }
+}
 //# sourceMappingURL=FS.js.map

package/out/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEhC,OAAO,EACN,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,GAAG,EACH,MAAM,EACN,WAAW,EACX,YAAY,EACZ,cAAc,EACd,OAAO,EACP,GAAG,EACH,CAAC"}

package/out/api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Globals = exports.DeviceProfiles = exports.DefaultFiles = exports.Diagnostics = exports.Helper = exports.DDE = exports.DDE_Core = exports.Registry = exports.Manifest = exports.Dependencies = void 0;
+exports.DLO = exports.Globals = exports.DeviceProfiles = exports.DefaultFiles = exports.Diagnostics = exports.Helper = exports.DDE = exports.DDE_Core = exports.Registry = exports.Manifest = exports.Dependencies = void 0;
 const dependencies_1 = require("./dependencies");
 Object.defineProperty(exports, "Dependencies", { enumerable: true, get: function () { return dependencies_1.Dependencies; } });
 const manifest_1 = require("./manifest");
@@ -21,4 +21,6 @@ const DeviceProfiles_1 = require("./DeviceProfiles");
 Object.defineProperty(exports, "DeviceProfiles", { enumerable: true, get: function () { return DeviceProfiles_1.DeviceProfiles; } });
 const globals_1 = require("./globals");
 Object.defineProperty(exports, "Globals", { enumerable: true, get: function () { return globals_1.Globals; } });
+const dlo_1 = require("./dlo/dlo");
+Object.defineProperty(exports, "DLO", { enumerable: true, get: function () { return dlo_1.DLO; } });
 //# sourceMappingURL=api.js.map

package/out/cliFS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cliFS.d.ts","sourceRoot":"","sources":["../src/cliFS.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,OAAO,EAAE,MAAM,MAAM,CAAC;AAInD,eAAO,MAAM,KAAK,EAAE,OAmCnB,CAAC"}
+{"version":3,"file":"cliFS.d.ts","sourceRoot":"","sources":["../src/cliFS.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,OAAO,EAAE,MAAM,MAAM,CAAC;AAIhE,eAAO,MAAM,KAAK,EAAE,OAkDnB,CAAC"}

package/out/cliFS.js

@@ -7,7 +7,7 @@ exports.cliFS = void 0;
 const promises_1 = __importDefault(require("node:fs/promises"));
 const FS_1 = require("./FS");
 const vscode_uri_1 = require("vscode-uri");
-var dirname = vscode_uri_1.Utils.dirname;
+const glob_1 = require("glob");
 exports.cliFS = {
     readFile(path) {
         return promises_1.default.readFile(path.fsPath);
@@ -39,9 +39,23 @@ exports.cliFS = {
         if (typeof content === 'string') {
             content = new TextEncoder().encode(content);
         }
-        const dirPath = dirname(path);
+        const dirPath = vscode_uri_1.Utils.dirname(path);
         await promises_1.default.mkdir(dirPath.fsPath, { recursive: true });
         return promises_1.default.writeFile(path.fsPath, content, { flag: 'w' });
+    },
+    async findFiles(cwd, include, exclude) {
+        const options = {
+            ignore: exclude,
+            nodir: true,
+            absolute: true,
+            dot: true,
+            cwd: vscode_uri_1.Utils.dirname(cwd).fsPath
+        };
+        const files = await (0, glob_1.glob)(include, options);
+        return files.map(file => {
+            const posix = file.replace(/\\/g, '/');
+            return vscode_uri_1.URI.parse(`file:///${posix}`);
+        });
     }
 };
 //# sourceMappingURL=cliFS.js.map

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;;;;;GAKG;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;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"}

package/out/dde/fileGenerators/dlo.js

@@ -891,7 +891,6 @@ function generateMainDDEFunctionBody(pawnSource, containerDefinition, readWrite)
  * Generate the default.inc file
  * @param cwd
  * @param fs
- * @param dependencies
  */
 async function buildDefaultInc(cwd, fs) {
     const fileContent = [];

package/out/defaultFiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultFiles.d.ts","sourceRoot":"","sources":["../src/defaultFiles.ts"],"names":[],"mappings":"AAMA,yBAAiB,YAAY,CAAC;IACtB,MAAM,SAAS;;;;;;;;;;;;;;;;;KAkBrB,CAAC;IAIK,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkDrB,CAAC;CACF"}
+{"version":3,"file":"defaultFiles.d.ts","sourceRoot":"","sources":["../src/defaultFiles.ts"],"names":[],"mappings":"AAMA,yBAAiB,YAAY,CAAC;IACtB,MAAM,SAAS;;;;;;;;;;;;;;;;;;KAmBrB,CAAC;IAIK,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAoDrB,CAAC;CACF"}

package/out/defaultFiles.js

@@ -25,7 +25,8 @@ var DefaultFiles;
         legacyAutoInc: 'legacy-auto.inc',
         legacyAutoDdeInc: 'legacy-auto-dde.inc',
         legacyAutoUplinkInc: 'legacy-auto-uplink.inc',
-        reportTemplate: 'mdn_report_template.json'
+        reportTemplate: 'mdn_report_template.json',
+        dloCfg: 'dlo.cfg'
     };
     const studioAutoPath = `${studioDirectoryName}auto/`;
     const studioAutoDloPath = `${studioAutoPath}dlo/`;
@@ -45,13 +46,15 @@ var DefaultFiles;
                     mainDdeInc: `${studioAutoDloPath}${DefaultFiles.fileNames.mainDdeInc}`,
                     legacyAutoInc: `${studioAutoDloPath}${DefaultFiles.fileNames.legacyAutoInc}`,
                     legacyAutoDdeInc: `${studioAutoDloPath}${DefaultFiles.fileNames.legacyAutoDdeInc}`,
-                    legacyAutoUplinkInc: `${studioAutoDloPath}${DefaultFiles.fileNames.legacyAutoUplinkInc}`
+                    legacyAutoUplinkInc: `${studioAutoDloPath}${DefaultFiles.fileNames.legacyAutoUplinkInc}`,
+                    cfg: `${studioAutoDloPath}${DefaultFiles.fileNames.dloCfg}`
                 }
             },
             libdeps: `${studioDirectoryName}libdeps/`
         },
         dist: {
             path: deployDirectoryName,
+            dloPath: `${deployDirectoryName}dlo/`,
             mainAmxPath: `${deployDirectoryName}dlo/${DefaultFiles.fileNames.mainAmx}`,
             mainAmxReportPath: `${deployDirectoryName}dlo/${DefaultFiles.fileNames.mainAmxReport}`,
             ddeXmlPath: `${deployDirectoryName}dde/${DefaultFiles.fileNames.ddeXml}`,

package/out/dlo/compiler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../src/dlo/compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAA4B,OAAO,EAAE,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAO7C,qBAAa,WAAW;IACvB,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,MAAM,CAAgB;;YAKhB,UAAU;IAiBxB,OAAO,KAAK,KAAK,GAEhB;IAEY,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO;;;;;;YAkC5B,qBAAqB;YAarB,cAAc;IAS5B;;;;;;OAMG;YACW,cAAc;IAkB5B,OAAO,CAAC,UAAU;IAiBlB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,sBAAsB;CA+C9B;AAMD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;;;GAwB1F"}

package/out/dlo/compiler.js

@@ -0,0 +1,237 @@
+"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.generateConfigFile = generateConfigFile;
+const preCompiler_1 = require("./preCompiler");
+const vscode_uri_1 = require("vscode-uri");
+const FS_1 = require("../FS");
+const manifest_1 = require("../manifest");
+const defaultFiles_1 = require("../defaultFiles");
+const dependencies_1 = require("../dependencies");
+const iconv = __importStar(require("iconv-lite"));
+const PAWN_MODULE = require('./dlocc.js');
+class DloCompiler {
+    preCompiler = new preCompiler_1.DloPreCompiler();
+    pawnCC;
+    stdout = [];
+    stderr = [];
+    constructor() {
+        this.pawnCC = null;
+    }
+    async initPawnCC() {
+        this.stdout.length = 0;
+        this.stderr.length = 0;
+        this.pawnCC = await PAWN_MODULE({
+            noExitRuntime: true,
+            print: (data) => {
+                console.log(data);
+                this.stdout.push(data);
+            },
+            printErr: (err) => {
+                console.error(err);
+                this.stderr.push(err);
+                this.stdout.push(err);
+            }
+        });
+    }
+    get MEMFS() {
+        return this.pawnCC.FS;
+    }
+    async compile(cwd, fs) {
+        const manifest = await manifest_1.Manifest.read(cwd, fs);
+        await this.initPawnCC();
+        const precompilerDiagnostics = await this.memFSwriteFile(cwd, fs, manifest);
+        const mainFile = vscode_uri_1.Utils.joinPath(cwd, manifest.dlo?.mainFile || defaultFiles_1.DefaultFiles.filePaths.dlo.mainDLO);
+        const options = [];
+        // todo only add cfg file to options if not already set!
+        const configFilePath = vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.cfg);
+        options.push(...(await this.readConfigFile(fs, configFilePath)));
+        if (this.preCompiler.pragmaDynamicFlag) {
+            options.push(this.preCompiler.pragmaDynamicFlag);
+        }
+        let exitCode = 0;
+        try {
+            exitCode = await this.pawnCC.callMain([uriToMemFsPath(mainFile), ...options]);
+            // compiler doesn't have any errors
+            if (exitCode === 0) {
+                await this.persistGeneratedFiles(cwd, fs, mainFile);
+            }
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return {
+            code: exitCode,
+            stdout: this.stdout,
+            stderr: this.stderr,
+            diagnostics: [...precompilerDiagnostics, ...this.parseWarningsAndErrors(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);
+            }
+        }
+    }
+    async readConfigFile(fs, configPath) {
+        if (await fs.stat(configPath)) {
+            const content = await fs.readFile(configPath);
+            return (0, FS_1.convertBlobToStringArray)(content);
+        }
+        else {
+            return [];
+        }
+    }
+    /**
+     * Precompile the given file and pass it to the MEMFS
+     * @param cwd
+     * @param fs
+     * @param manifest
+     * @private
+     */
+    async memFSwriteFile(cwd, fs, manifest) {
+        const files = await fs.findFiles(cwd, '**/*.{dlo,inc}');
+        const precompilerDiagnostics = [];
+        // 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 = (0, FS_1.convertBlobToStringArray)(content);
+                const preCompiled = await this.preCompiler.preCompileDloFile(cwd, manifest, file, stringBlob);
+                precompilerDiagnostics.push(...preCompiled.diagnostics);
+                this.memFSmkdir(file);
+                this.MEMFS.writeFile(uriToMemFsPath(file), iconv.encode(preCompiled.data, 'cp1252'));
+            }
+        }
+        return precompilerDiagnostics;
+    }
+    memFSmkdir(uri) {
+        const split = 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) {
+                console.error('ensureDir', e);
+            }
+        });
+    }
+    memFSstat(dirname) {
+        try {
+            this.MEMFS.stat(dirname);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    parseWarningsAndErrors(stderr, relatedFile) {
+        const compilerDiagnostics = [];
+        const messages = stderr.filter(line => !!line.trim());
+        for (const message of messages) {
+            if ((message.includes('Assertion failed:') || message.includes('Compilation aborted.')) && relatedFile) {
+                compilerDiagnostics.push({
+                    file: relatedFile,
+                    level: 'error',
+                    line: 0,
+                    message: message
+                });
+                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) {
+                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
+            });
+        }
+        return compilerDiagnostics;
+    }
+}
+exports.DloCompiler = DloCompiler;
+function uriToMemFsPath(path) {
+    return path.fsPath.replace(/\\/g, '/');
+}
+/**
+ * Generates the DLO .cfg file for the dlo compiler
+ * @param cwd
+ * @param fs
+ * @param manifest
+ */
+async function generateConfigFile(cwd, fs, manifest) {
+    const compileOptions = [
+        '-M', //map output for pawndbg to generate link map
+        '-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${uriToMemFsPath(defaultIncPath)}`);
+    const dloLibs = await dependencies_1.Dependencies.getDloDependencies(cwd, fs);
+    for (const dloLib of dloLibs) {
+        const dirName = vscode_uri_1.Utils.dirname(dloLib.path);
+        compileOptions.push(`-i${uriToMemFsPath(dirName)}`);
+    }
+    const dloConfiguration = manifest.dlo;
+    if (dloConfiguration) {
+        compileOptions.push(...dloConfiguration.compileOptions);
+    }
+    return {
+        path: vscode_uri_1.Utils.joinPath(cwd, defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.cfg),
+        data: compileOptions.join('\n')
+    };
+}
+//# sourceMappingURL=compiler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dlo.d.ts","sourceRoot":"","sources":["../../src/dlo/dlo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAGjC,yBAAiB,GAAG,CAAC;IACb,MAAM,aAAa,yBAAmB,CAAC;IAC9C,KAAY,aAAa,GAAG,gBAAgB,CAAC;IAEtC,MAAM,WAAW,uBAAiB,CAAC;IAC1C,KAAY,WAAW,GAAG,cAAc,CAAC;IAEzC;;OAEG;IACI,MAAM,QAAQ,oBAAc,CAAC;IACpC,KAAY,QAAQ,GAAG,WAAW,CAAC;IAEnC;;;;OAIG;IACH,SAAsB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,iBAK1D;CACD"}

package/out/dlo/dlo.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DLO = void 0;
+const fileSequencer_1 = require("./fileSequencer");
+const preCompiler_1 = require("./preCompiler");
+const manifest_1 = require("../manifest");
+const compiler_1 = require("./compiler");
+const defaultFiles_1 = require("../defaultFiles");
+var DLO;
+(function (DLO) {
+    DLO.FileSequencer = fileSequencer_1.DloFileSequencer;
+    DLO.PreCompiler = preCompiler_1.DloPreCompiler;
+    /**
+     * The DLO Compiler
+     */
+    DLO.Compiler = compiler_1.DloCompiler;
+    /**
+     * Generate the dlo.cfg file and write it to the .studio/auto/dlo directory
+     * @param cwd
+     * @param fs
+     */
+    async function exportDloConfig(cwd, fs) {
+        const manifest = await manifest_1.Manifest.read(cwd, fs);
+        const cfgData = await (0, compiler_1.generateConfigFile)(cwd, fs, manifest);
+        await fs.writeFile(cfgData.path, cfgData.data);
+        console.log('Generated', defaultFiles_1.DefaultFiles.filePaths.studio.auto.dlo.cfg);
+    }
+    DLO.exportDloConfig = exportDloConfig;
+})(DLO || (exports.DLO = DLO = {}));
+//# sourceMappingURL=dlo.js.map

package/out/dlo/dlocc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dlocc.d.ts","sourceRoot":"","sources":["../../src/dlo/dlocc.js"],"names":[],"mappings":";AAGQ,6CA8kHN"}