amxxpack 1.2.0 → 1.3.0

package/README.md

@@ -64,3 +64,79 @@ npm install -g amxxpack
 - `amxpack n` - alias to `new` command
 - `amxpack b` - alias to `build` command
 - `amxpack c` - alias to `compile` command
+
+## 🦸 Advanced configuration
+
+### Thir-party dependencies
+In case your project requires third-party modules you can specify a link to third-party archives and these archives will be downloaded and extracted to the third-party directory.
+```json
+{
+  "thirdparty": {
+    "dir": "./.thirdparty",
+    "dependencies": [
+      {
+        "name": "somemodule",
+        "url": "https://website/somemodule-v100.zip"
+      }
+    ]
+  }
+}
+```
+
+configuration above will download `somemodule-v100.zip` archive and extract it to the `./.thirdparty/somemodule` directory then you can use thirparty files in your project. For example add thirparty directory to include list:
+```json
+{
+    "include": [
+      "./.thirdparty/somemodule/include"
+    ]
+}
+```
+
+### Multiple directories as an input
+You can use multiple directories as builder inputs, just specify an array of directories in the project configuration. Example:
+
+```json
+  {
+    "input": {
+      "scripts": ["./src/scripts", "./src/extra-scripts"],
+      "include": ["./src/include", "./src/extra-include"],
+      "assets": ["./assets", "./extra-assets"]
+    }
+  }
+```
+
+### Assets filtering and subdirectories
+Using glob filters you can specify which assets should be copied.
+
+For example, you can exclude all assets except `*.mdl`:
+```json
+  {
+    "input": {
+      "assets": [
+        { "dir": "./assets", "filter": "*.mdl" }
+      ]
+    }
+  }
+```
+
+or exclude `*.tga` and `*.wav` files:
+```json
+  {
+    "input": {
+      "assets": [
+        { "dir": "./assets", "filter": "*.!(tga|wav)" }
+      ]
+    }
+  }
+```
+
+You can also specify subdirectories for copying. With this configuration the builder will copy all files from `./assets/models` to `./models/myproject` of the project build directory.
+```json
+  {
+    "input": {
+      "assets": [
+        { "dir": "./assets/models", "dest": "./models/myproject" }
+      ]
+    }
+  }
+```

package/lib/builder/builder.d.ts

@@ -1,4 +1,4 @@
-import { IProjectConfig } from '../types';
+import { IAssetInput, IResolvedProjectConfig } from '../types';
 export interface CompileOptions {
     ignoreErrors?: boolean;
     noCache?: boolean;
@@ -6,7 +6,7 @@ export interface CompileOptions {
 export default class AmxxBuilder {
     private projectConfig;
     private pluginCache;
-    constructor(projectConfig: IProjectConfig);
+    constructor(projectConfig: IResolvedProjectConfig);
     build(compileOptions: CompileOptions): Promise<void>;
     watch(compileOptions: CompileOptions): Promise<void>;
     buildScripts(compileOptions: CompileOptions): Promise<boolean>;
@@ -17,11 +17,12 @@ export default class AmxxBuilder {
     watchAssets(): Promise<void>;
     updatePlugin(srcDir: string, srcFile: string, compileOptions: CompileOptions): Promise<boolean>;
     updateScript(srcDir: string, srcFile: string): Promise<void>;
-    updateAsset(srcDir: string, srcFile: string): Promise<void>;
+    updateAsset(filePath: string, assetInput: IAssetInput): Promise<void>;
     updateInclude(filePath: string): Promise<void>;
     findPlugins(pattern: string): Promise<string[]>;
     compilePlugin(srcDir: string, srcFile: string, compileOptions?: CompileOptions): Promise<void>;
     private buildDir;
     private watchDir;
     private initPluginCache;
+    private execPathFilter;
 }

package/lib/builder/builder.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -104,10 +108,10 @@ var AmxxBuilder = /** @class */ (function () {
                     case 4:
                         success = _a.sent();
                         if (success) {
-                            logger_1.default.success('Build finished!');
+                            logger_1.default.success('Build completed successfully!');
                         }
                         else {
-                            logger_1.default.error('Build finished with errors!');
+                            logger_1.default.error('Build completed with errors!');
                         }
                         return [3 /*break*/, 6];
                     case 5:
@@ -140,19 +144,18 @@ var AmxxBuilder = /** @class */ (function () {
     };
     AmxxBuilder.prototype.buildScripts = function (compileOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var scriptsDirs, success, _loop_1, this_1, _i, scriptsDirs_1, scriptsDir;
+            var success, _loop_1, this_1, _i, _a, scriptsDir;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        scriptsDirs = (0, lodash_1.castArray)(this.projectConfig.input.scripts);
                         success = true;
-                        _a.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _a.trys.push([1, , 6, 7]);
+                        _b.trys.push([1, , 6, 7]);
                         _loop_1 = function (scriptsDir) {
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
                                     case 0: return [4 /*yield*/, this_1.buildDir(scriptsDir, constants_1.SCRIPTS_PATH_PATTERN, 
                                         // eslint-disable-next-line @typescript-eslint/no-loop-func
                                         function (filePath) { return __awaiter(_this, void 0, void 0, function () {
@@ -170,21 +173,21 @@ var AmxxBuilder = /** @class */ (function () {
                                             });
                                         }); })];
                                     case 1:
-                                        _b.sent();
+                                        _c.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
                         this_1 = this;
-                        _i = 0, scriptsDirs_1 = scriptsDirs;
-                        _a.label = 2;
+                        _i = 0, _a = this.projectConfig.input.scripts;
+                        _b.label = 2;
                     case 2:
-                        if (!(_i < scriptsDirs_1.length)) return [3 /*break*/, 5];
-                        scriptsDir = scriptsDirs_1[_i];
+                        if (!(_i < _a.length)) return [3 /*break*/, 5];
+                        scriptsDir = _a[_i];
                         return [5 /*yield**/, _loop_1(scriptsDir)];
                     case 3:
-                        _a.sent();
-                        _a.label = 4;
+                        _b.sent();
+                        _b.label = 4;
                     case 4:
                         _i++;
                         return [3 /*break*/, 2];
@@ -214,47 +217,34 @@ var AmxxBuilder = /** @class */ (function () {
     };
     AmxxBuilder.prototype.buildAssets = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var assetsDirs, _loop_2, this_2, _i, assetsDirs_1, assetsDir;
+            var _loop_2, this_2, _i, _a, assetInput;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!this.projectConfig.input.assets) {
                             return [2 /*return*/];
                         }
-                        assetsDirs = (0, lodash_1.castArray)(this.projectConfig.input.assets);
-                        _loop_2 = function (assetsDir) {
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0: return [4 /*yield*/, this_2.buildDir(assetsDir, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return __awaiter(_this, void 0, void 0, function () {
-                                            var assetFile;
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0:
-                                                        assetFile = path_1.default.relative(assetsDir, filePath);
-                                                        return [4 /*yield*/, this.updateAsset(assetsDir, assetFile)];
-                                                    case 1:
-                                                        _a.sent();
-                                                        return [2 /*return*/];
-                                                }
-                                            });
-                                        }); })];
+                        _loop_2 = function (assetInput) {
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
+                                    case 0: return [4 /*yield*/, this_2.buildDir(assetInput.dir, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return _this.updateAsset(filePath, assetInput); })];
                                     case 1:
-                                        _b.sent();
+                                        _c.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
                         this_2 = this;
-                        _i = 0, assetsDirs_1 = assetsDirs;
-                        _a.label = 1;
+                        _i = 0, _a = this.projectConfig.input.assets;
+                        _b.label = 1;
                     case 1:
-                        if (!(_i < assetsDirs_1.length)) return [3 /*break*/, 4];
-                        assetsDir = assetsDirs_1[_i];
-                        return [5 /*yield**/, _loop_2(assetsDir)];
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        assetInput = _a[_i];
+                        return [5 /*yield**/, _loop_2(assetInput)];
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _b.sent();
+                        _b.label = 3;
                     case 3:
                         _i++;
                         return [3 /*break*/, 1];
@@ -265,15 +255,14 @@ var AmxxBuilder = /** @class */ (function () {
     };
     AmxxBuilder.prototype.watchScripts = function (compileOptions) {
         return __awaiter(this, void 0, void 0, function () {
-            var scriptsDirs, _loop_3, this_3, _i, scriptsDirs_2, scriptsDir;
+            var _loop_3, this_3, _i, _a, scriptsDir;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        scriptsDirs = (0, lodash_1.castArray)(this.projectConfig.input.scripts);
                         _loop_3 = function (scriptsDir) {
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
                                     case 0: return [4 /*yield*/, this_3.watchDir(scriptsDir, constants_1.SCRIPTS_PATH_PATTERN, function (filePath) { return __awaiter(_this, void 0, void 0, function () {
                                             var srcFile;
                                             return __generator(this, function (_a) {
@@ -288,21 +277,21 @@ var AmxxBuilder = /** @class */ (function () {
                                             });
                                         }); })];
                                     case 1:
-                                        _b.sent();
+                                        _c.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
                         this_3 = this;
-                        _i = 0, scriptsDirs_2 = scriptsDirs;
-                        _a.label = 1;
+                        _i = 0, _a = this.projectConfig.input.scripts;
+                        _b.label = 1;
                     case 1:
-                        if (!(_i < scriptsDirs_2.length)) return [3 /*break*/, 4];
-                        scriptsDir = scriptsDirs_2[_i];
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        scriptsDir = _a[_i];
                         return [5 /*yield**/, _loop_3(scriptsDir)];
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _b.sent();
+                        _b.label = 3;
                     case 3:
                         _i++;
                         return [3 /*break*/, 1];
@@ -326,47 +315,34 @@ var AmxxBuilder = /** @class */ (function () {
     };
     AmxxBuilder.prototype.watchAssets = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var assetsDirs, _loop_4, this_4, _i, assetsDirs_2, assetsDir;
+            var _loop_4, this_4, _i, _a, assetInput;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!this.projectConfig.input.assets) {
                             return [2 /*return*/];
                         }
-                        assetsDirs = (0, lodash_1.castArray)(this.projectConfig.input.assets);
-                        _loop_4 = function (assetsDir) {
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0: return [4 /*yield*/, this_4.watchDir(assetsDir, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return __awaiter(_this, void 0, void 0, function () {
-                                            var assetFile;
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0:
-                                                        assetFile = path_1.default.relative(assetsDir, filePath);
-                                                        return [4 /*yield*/, this.updateAsset(assetsDir, assetFile)];
-                                                    case 1:
-                                                        _a.sent();
-                                                        return [2 /*return*/];
-                                                }
-                                            });
-                                        }); })];
+                        _loop_4 = function (assetInput) {
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
+                                    case 0: return [4 /*yield*/, this_4.watchDir(assetInput.dir, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return _this.updateAsset(filePath, assetInput); })];
                                     case 1:
-                                        _b.sent();
+                                        _c.sent();
                                         return [2 /*return*/];
                                 }
                             });
                         };
                         this_4 = this;
-                        _i = 0, assetsDirs_2 = assetsDirs;
-                        _a.label = 1;
+                        _i = 0, _a = this.projectConfig.input.assets;
+                        _b.label = 1;
                     case 1:
-                        if (!(_i < assetsDirs_2.length)) return [3 /*break*/, 4];
-                        assetsDir = assetsDirs_2[_i];
-                        return [5 /*yield**/, _loop_4(assetsDir)];
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        assetInput = _a[_i];
+                        return [5 /*yield**/, _loop_4(assetInput)];
                     case 2:
-                        _a.sent();
-                        _a.label = 3;
+                        _b.sent();
+                        _b.label = 3;
                     case 3:
                         _i++;
                         return [3 /*break*/, 1];
@@ -409,7 +385,7 @@ var AmxxBuilder = /** @class */ (function () {
                         if (!this.projectConfig.output.scripts) {
                             return [2 /*return*/];
                         }
-                        srcPath = path_1.default.resolve(srcDir, srcFile);
+                        srcPath = path_1.default.join(srcDir, srcFile);
                         destPath = path_1.default.join(this.projectConfig.output.scripts, path_1.default.parse(srcFile).base);
                         return [4 /*yield*/, (0, mkdirp_1.default)(this.projectConfig.output.scripts)];
                     case 1:
@@ -423,21 +399,24 @@ var AmxxBuilder = /** @class */ (function () {
             });
         });
     };
-    AmxxBuilder.prototype.updateAsset = function (srcDir, srcFile) {
+    AmxxBuilder.prototype.updateAsset = function (filePath, assetInput) {
         return __awaiter(this, void 0, void 0, function () {
-            var srcPath, destPath;
+            var srcFile, destPath;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        srcPath = path_1.default.resolve(srcDir, srcFile);
-                        destPath = path_1.default.join(this.projectConfig.output.assets, srcFile);
+                        srcFile = path_1.default.relative(assetInput.dir, filePath);
+                        if (assetInput.filter && !this.execPathFilter(srcFile, assetInput.filter)) {
+                            return [2 /*return*/];
+                        }
+                        destPath = path_1.default.join(this.projectConfig.output.assets, assetInput.dest || '', srcFile);
                         return [4 /*yield*/, (0, mkdirp_1.default)(path_1.default.parse(destPath).dir)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, (0, copy_file_1.default)(srcPath, destPath)];
+                        return [4 /*yield*/, (0, copy_file_1.default)(filePath, destPath)];
                     case 2:
                         _a.sent();
-                        logger_1.default.info('Asset updated', (0, normalize_path_1.default)(destPath));
+                        logger_1.default.info('Asset updated:', (0, normalize_path_1.default)(destPath));
                         return [2 /*return*/];
                 }
             });
@@ -445,16 +424,15 @@ var AmxxBuilder = /** @class */ (function () {
     };
     AmxxBuilder.prototype.updateInclude = function (filePath) {
         return __awaiter(this, void 0, void 0, function () {
-            var srcPath, destPath;
+            var destPath;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        srcPath = path_1.default.resolve(filePath);
                         destPath = path_1.default.join(this.projectConfig.output.include, path_1.default.parse(filePath).base);
                         return [4 /*yield*/, (0, mkdirp_1.default)(this.projectConfig.output.include)];
                     case 1:
                         _a.sent();
-                        return [4 /*yield*/, (0, copy_file_1.default)(srcPath, destPath)];
+                        return [4 /*yield*/, (0, copy_file_1.default)(filePath, destPath)];
                     case 2:
                         _a.sent();
                         logger_1.default.info('Include updated:', (0, normalize_path_1.default)(destPath));
@@ -469,7 +447,7 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        pathPattern = (0, lodash_1.map)((0, lodash_1.castArray)(this.projectConfig.input.scripts), function (dir) { return path_1.default.join(dir, '**', pattern); });
+                        pathPattern = (0, lodash_1.map)(this.projectConfig.input.scripts, function (dir) { return path_1.default.join(dir, '**', pattern); });
                         return [4 /*yield*/, globule_1.default.find(pathPattern)];
                     case 1:
                         matches = _a.sent();
@@ -485,9 +463,9 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        srcPath = path_1.default.resolve(srcDir, srcFile);
+                        srcPath = path_1.default.join(srcDir, srcFile);
                         _a = path_1.default.parse(srcFile), scriptName = _a.name, srcNestedDir = _a.dir;
-                        destDir = path_1.default.resolve(this.projectConfig.output.plugins, this.projectConfig.rules.flatCompilation ? '.' : srcNestedDir);
+                        destDir = path_1.default.join(this.projectConfig.output.plugins, this.projectConfig.rules.flatCompilation ? '.' : srcNestedDir);
                         pluginDest = path_1.default.join(destDir, "".concat(scriptName, ".amxx"));
                         if (!compileOptions.noCache) return [3 /*break*/, 1];
                         _b = false;
@@ -500,7 +478,7 @@ var AmxxBuilder = /** @class */ (function () {
                         isUpdated = _b;
                         relateiveSrcPath = path_1.default.relative(process.cwd(), srcPath);
                         if (isUpdated) {
-                            logger_1.default.info("Script \"".concat((0, normalize_path_1.default)(relateiveSrcPath), "\" is already up to date. Skipped!"));
+                            logger_1.default.info('Script is already up to date:', (0, normalize_path_1.default)(relateiveSrcPath), 'Skipped!');
                             return [2 /*return*/];
                         }
                         executablePath = path_1.default.join(this.projectConfig.compiler.dir, this.projectConfig.compiler.executable);
@@ -513,7 +491,7 @@ var AmxxBuilder = /** @class */ (function () {
                                 compiler: executablePath,
                                 includeDir: __spreadArray(__spreadArray([
                                     path_1.default.join(this.projectConfig.compiler.dir, 'include')
-                                ], this.projectConfig.include, true), (0, lodash_1.castArray)(this.projectConfig.input.include), true)
+                                ], this.projectConfig.include, true), this.projectConfig.input.include, true)
                             })];
                     case 5:
                         result = _c.sent();
@@ -544,7 +522,7 @@ var AmxxBuilder = /** @class */ (function () {
                         if (result.success) {
                             destPath = path_1.default.join(destDir, result.plugin);
                             relativeFilePath = path_1.default.relative(process.cwd(), srcPath);
-                            logger_1.default.success('Compilation success:', (0, normalize_path_1.default)(relativeFilePath));
+                            logger_1.default.success('Script compiled successfully:', (0, normalize_path_1.default)(relativeFilePath));
                             logger_1.default.info('Plugin updated:', (0, normalize_path_1.default)(destPath));
                         }
                         else {
@@ -565,7 +543,7 @@ var AmxxBuilder = /** @class */ (function () {
                         return [4 /*yield*/, globule_1.default.find(pathPattern, { nodir: true })];
                     case 1:
                         matches = _a.sent();
-                        return [4 /*yield*/, matches.reduce(function (acc, match) { return acc.then(function () { return cb(match); }); }, Promise.resolve())];
+                        return [4 /*yield*/, matches.reduce(function (acc, match) { return acc.then(function () { return cb(path_1.default.normalize(match)); }); }, Promise.resolve())];
                     case 2:
                         _a.sent();
                         return [2 /*return*/];
@@ -579,7 +557,7 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 pathPattern = (0, lodash_1.map)((0, lodash_1.castArray)(baseDir), function (dir) { return path_1.default.join(dir, pattern); });
                 watcher = (0, setup_watch_1.default)(pathPattern);
-                updateFn = function (filePath) { return cb(filePath).catch(function (err) { return logger_1.default.error(err.message); }); };
+                updateFn = function (filePath) { return cb(path_1.default.normalize(filePath)).catch(function (err) { return logger_1.default.error(err.message); }); };
                 watcher.on('add', updateFn);
                 watcher.on('change', updateFn);
                 return [2 /*return*/];
@@ -590,6 +568,13 @@ var AmxxBuilder = /** @class */ (function () {
         this.pluginCache = new plugins_cache_1.default();
         this.pluginCache.load(config_1.default.cacheFile);
     };
+    AmxxBuilder.prototype.execPathFilter = function (filePath, filter) {
+        return globule_1.default.isMatch(filter, filePath, {
+            dot: true,
+            nocase: true,
+            matchBase: true
+        });
+    };
     return AmxxBuilder;
 }());
 exports.default = AmxxBuilder;

package/lib/cli/controller.js

@@ -56,7 +56,7 @@ var Controller = /** @class */ (function () {
             var projectConfig, builder;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, project_config_1.default.resolve(configPath)];
+                    case 0: return [4 /*yield*/, project_config_1.default.load(configPath)];
                     case 1:
                         projectConfig = _a.sent();
                         builder = new builder_1.default(projectConfig);
@@ -98,7 +98,7 @@ var Controller = /** @class */ (function () {
     };
     Controller.prototype.compile = function (scriptPath, configPath, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var compileOptions, builder, matches, _i, matches_1, filePath, absFilePath, _a, srcDir, srcFile;
+            var compileOptions, builder, matches, _i, matches_1, filePath, _a, srcDir, srcFile;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -114,8 +114,7 @@ var Controller = /** @class */ (function () {
                     case 3:
                         if (!(_i < matches_1.length)) return [3 /*break*/, 6];
                         filePath = matches_1[_i];
-                        absFilePath = path_1.default.resolve(filePath);
-                        _a = path_1.default.parse(absFilePath), srcDir = _a.dir, srcFile = _a.base;
+                        _a = path_1.default.parse(filePath), srcDir = _a.dir, srcFile = _a.base;
                         return [4 /*yield*/, builder.compilePlugin(srcDir, srcFile, compileOptions)];
                     case 4:
                         _b.sent();
@@ -155,7 +154,7 @@ var Controller = /** @class */ (function () {
             var projectConfig, _i, _a, dependency;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, project_config_1.default.resolve(configPath)];
+                    case 0: return [4 /*yield*/, project_config_1.default.load(configPath)];
                     case 1:
                         projectConfig = _b.sent();
                         return [4 /*yield*/, (0, compiler_1.default)({
@@ -192,7 +191,7 @@ var Controller = /** @class */ (function () {
             var projectConfig, includeName, templateBuilder, resolveFilePath, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, project_config_1.default.resolve(configPath)];
+                    case 0: return [4 /*yield*/, project_config_1.default.load(configPath)];
                     case 1:
                         projectConfig = _b.sent();
                         includeName = path_1.default.parse(fileName).base;

package/lib/cli/services/project-creator.d.ts

@@ -1,8 +1,8 @@
 import { IProjectOptions } from '../types';
-import { IProjectConfig } from '../../types';
+import { IResolvedProjectConfig } from '../../types';
 declare class ProjectCreator {
     projectDir: string;
-    projectConfig: IProjectConfig;
+    projectConfig: IResolvedProjectConfig;
     options: IProjectOptions;
     isCurrentDir: boolean;
     constructor(options?: IProjectOptions);

package/lib/cli/services/project-creator.js

@@ -85,7 +85,7 @@ var ProjectCreator = /** @class */ (function () {
                 ? cwd
                 : path_1.default.join(cwd, this.options.name);
         }
-        this.projectConfig = project_config_1.default.defaults;
+        this.projectConfig = project_config_1.default.resolve({}, this.projectDir);
     }
     ProjectCreator.prototype.createProject = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -207,13 +207,13 @@ var ProjectCreator = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         logger_1.default.info('📁 Creating project directories...');
-                        dirs = __spreadArray(__spreadArray(__spreadArray([], (0, lodash_1.castArray)(this.projectConfig.input.assets), true), (0, lodash_1.castArray)(this.projectConfig.input.include), true), (0, lodash_1.castArray)(this.projectConfig.input.scripts), true);
+                        dirs = __spreadArray(__spreadArray(__spreadArray([], (0, lodash_1.map)(this.projectConfig.input.assets, 'dir'), true), this.projectConfig.input.include, true), this.projectConfig.input.scripts, true);
                         _i = 0, dirs_1 = dirs;
                         _a.label = 1;
                     case 1:
                         if (!(_i < dirs_1.length)) return [3 /*break*/, 4];
                         dir = dirs_1[_i];
-                        return [4 /*yield*/, (0, mkdirp_1.default)(path_1.default.join(this.projectDir, dir))];
+                        return [4 /*yield*/, (0, mkdirp_1.default)(dir)];
                     case 2:
                         _a.sent();
                         _a.label = 3;

package/lib/cli/services/template-builder.js

@@ -43,6 +43,7 @@ var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var lodash_1 = require("lodash");
 var mkdirp_1 = __importDefault(require("mkdirp"));
+var logger_1 = __importDefault(require("../../logger/logger"));
 var TemplateBuilder = /** @class */ (function () {
     function TemplateBuilder(projectConfig, context, contextDefaults) {
         this.projectConfig = projectConfig;
@@ -94,6 +95,7 @@ var TemplateBuilder = /** @class */ (function () {
                     case 3: return [4 /*yield*/, _b.apply(_a, _c.concat([_d.sent(), { flag: overwrite ? 'w' : 'wx' }]))];
                     case 4:
                         _d.sent();
+                        logger_1.default.info('New file created:', filePath);
                         return [2 /*return*/];
                 }
             });

package/lib/downloaders/compiler/constants.d.ts

@@ -1,9 +1,12 @@
+export declare enum DistSource {
+    AmxxDrop = "amxxdrop",
+    Release = "release"
+}
 export declare enum CompilerPlatform {
     Windows = "windows",
     Linux = "linux",
     Mac = "mac"
 }
-export declare enum DistSource {
-    Dev = "amxxdrop",
-    Release = "release"
-}
+export declare const BASE_DIST = "base";
+export declare const LATEST_RELEASE_VERSION = "1.8.2";
+export declare const LATEST_RELEASE_VERSION_NUM = 182;

package/lib/downloaders/compiler/constants.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DistSource = exports.CompilerPlatform = void 0;
+exports.LATEST_RELEASE_VERSION_NUM = exports.LATEST_RELEASE_VERSION = exports.BASE_DIST = exports.CompilerPlatform = exports.DistSource = void 0;
+var DistSource;
+(function (DistSource) {
+    DistSource["AmxxDrop"] = "amxxdrop";
+    DistSource["Release"] = "release";
+})(DistSource = exports.DistSource || (exports.DistSource = {}));
 var CompilerPlatform;
 (function (CompilerPlatform) {
     CompilerPlatform["Windows"] = "windows";
     CompilerPlatform["Linux"] = "linux";
     CompilerPlatform["Mac"] = "mac";
 })(CompilerPlatform = exports.CompilerPlatform || (exports.CompilerPlatform = {}));
-var DistSource;
-(function (DistSource) {
-    DistSource["Dev"] = "amxxdrop";
-    DistSource["Release"] = "release";
-})(DistSource = exports.DistSource || (exports.DistSource = {}));
+exports.BASE_DIST = 'base';
+exports.LATEST_RELEASE_VERSION = '1.8.2';
+exports.LATEST_RELEASE_VERSION_NUM = 182;

package/lib/downloaders/compiler/downloader.js

@@ -60,24 +60,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
+var fs_1 = __importDefault(require("fs"));
 var mkdirp_1 = __importDefault(require("mkdirp"));
 var normalize_path_1 = __importDefault(require("normalize-path"));
 var decompress_1 = __importDefault(require("decompress"));
+var lodash_1 = require("lodash");
 var download_1 = __importDefault(require("../../utils/download"));
 var resolvers_1 = require("./resolvers");
+var constants_1 = require("./constants");
 var config_1 = __importDefault(require("../../config"));
-function downloadDist(dist) {
+var logger_1 = __importDefault(require("../../logger/logger"));
+function getDistFileName(dist) {
     return __awaiter(this, void 0, void 0, function () {
-        var fileName, filePath, source, url, result;
+        var releaseVersion, releaseVersionNum, metaFileName, downloadOpts, result, fileName;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    fileName = (0, resolvers_1.resolveFileName)(dist);
-                    filePath = path_1.default.join(config_1.default.downloadDir, fileName);
-                    source = (0, resolvers_1.resolveSource)(dist);
-                    url = (0, resolvers_1.resolveUrl)(source, fileName);
-                    return [4 /*yield*/, (0, download_1.default)(url, filePath)];
+                    releaseVersion = (0, resolvers_1.resolveReleaseVersion)(dist.version);
+                    releaseVersionNum = (0, resolvers_1.resolveVersionNum)(releaseVersion);
+                    if (dist.dev) {
+                        return [2 /*return*/, (0, resolvers_1.resolveFileName)(dist)];
+                    }
+                    // Starting from latest release (version 1.8.2) all versions are stored in the amxxdrop repository
+                    if (releaseVersionNum <= constants_1.LATEST_RELEASE_VERSION_NUM) {
+                        // the latest release version is the only version we can download from the release repository
+                        return [2 /*return*/, (0, resolvers_1.resolveFileName)(__assign(__assign({}, dist), { version: constants_1.LATEST_RELEASE_VERSION }))];
+                    }
+                    metaFileName = (0, resolvers_1.resolveMetaFileName)(dist);
+                    downloadOpts = (0, resolvers_1.resolveDownloadDistOpts)(metaFileName, dist);
+                    return [4 /*yield*/, (0, download_1.default)(downloadOpts.url, downloadOpts.path)];
+                case 1:
+                    result = _a.sent();
+                    return [4 /*yield*/, fs_1.default.promises.readFile(result.path, 'utf8')];
+                case 2:
+                    fileName = _a.sent();
+                    return [2 /*return*/, fileName.trim()];
+            }
+        });
+    });
+}
+function downloadDist(dist) {
+    return __awaiter(this, void 0, void 0, function () {
+        var fileName, downloadOpts, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getDistFileName(dist)];
                 case 1:
+                    fileName = _a.sent();
+                    downloadOpts = (0, resolvers_1.resolveDownloadDistOpts)(fileName, dist);
+                    return [4 /*yield*/, (0, download_1.default)(downloadOpts.url, downloadOpts.path)];
+                case 2:
                     result = _a.sent();
                     return [2 /*return*/, { dist: dist, path: result.path }];
             }
@@ -88,7 +120,9 @@ function extractDist(archivePath, outDir) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, mkdirp_1.default)(outDir)];
+                case 0:
+                    logger_1.default.info("Extracting \"".concat(path_1.default.parse(archivePath).base, "\"..."));
+                    return [4 /*yield*/, (0, mkdirp_1.default)(outDir)];
                 case 1:
                     _a.sent();
                     return [4 /*yield*/, (0, decompress_1.default)(archivePath, outDir, {
@@ -118,31 +152,32 @@ function extractDist(archivePath, outDir) {
 }
 function downloadCompiler(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var version, dev, dists, compilerPath, platform, newDists, _i, newDists_1, dist, distArchive;
+        var version, dev, compilerPath, distNames, dists, distArchives, _i, distArchives_1, distArchive;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    version = options.version, dev = options.dev, dists = options.dists, compilerPath = options.path;
-                    platform = (0, resolvers_1.resolvePlatform)();
-                    newDists = __spreadArray([], dists, true);
-                    if (!newDists.includes('base')) {
-                        newDists.unshift('base');
+                    version = options.version, dev = options.dev, compilerPath = options.path;
+                    distNames = __spreadArray([], options.dists, true);
+                    if (!distNames.includes(constants_1.BASE_DIST)) {
+                        distNames.unshift(constants_1.BASE_DIST);
                     }
-                    _i = 0, newDists_1 = newDists;
-                    _a.label = 1;
+                    dists = (0, lodash_1.map)(distNames, function (distName) { return (0, resolvers_1.resolveDist)({ name: distName, version: version, dev: dev }); });
+                    logger_1.default.info('Downloading compiler...');
+                    return [4 /*yield*/, Promise.all((0, lodash_1.map)(dists, downloadDist))];
                 case 1:
-                    if (!(_i < newDists_1.length)) return [3 /*break*/, 5];
-                    dist = newDists_1[_i];
-                    return [4 /*yield*/, downloadDist({ name: dist, version: version, platform: platform, dev: dev })];
+                    distArchives = _a.sent();
+                    _i = 0, distArchives_1 = distArchives;
+                    _a.label = 2;
                 case 2:
-                    distArchive = _a.sent();
+                    if (!(_i < distArchives_1.length)) return [3 /*break*/, 5];
+                    distArchive = distArchives_1[_i];
                     return [4 /*yield*/, extractDist(distArchive.path, compilerPath)];
                 case 3:
                     _a.sent();
                     _a.label = 4;
                 case 4:
                     _i++;
-                    return [3 /*break*/, 1];
+                    return [3 /*break*/, 2];
                 case 5: return [2 /*return*/];
             }
         });

package/lib/downloaders/compiler/resolvers.d.ts

@@ -1,6 +1,19 @@
 import { CompilerPlatform } from './constants';
 import { IDist } from './types';
-export declare function resolveSource({ dev, version }: IDist): string;
+export declare function resolveVersionNum(version: string): number;
+export declare function resolveReleaseVersion(version: string): string;
 export declare function resolveFileName({ name: dist, version, platform }: IDist): string;
+export declare function resolveMetaFileName({ name: dist, platform }: IDist): string;
 export declare function resolvePlatform(): CompilerPlatform;
 export declare function resolveUrl(source: string, file: string): string;
+export declare function resolveSource({ dev, version }: IDist): string;
+export declare function resolveDownloadDistOpts(fileName: string, dist: IDist): {
+    url: string;
+    path: string;
+};
+export declare function resolveDist(options: Partial<IDist>): {
+    name: string;
+    version: string;
+    platform: CompilerPlatform;
+    dev: boolean;
+};

package/lib/downloaders/compiler/resolvers.js

@@ -3,27 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUrl = exports.resolvePlatform = exports.resolveFileName = exports.resolveSource = void 0;
+exports.resolveDist = exports.resolveDownloadDistOpts = exports.resolveSource = exports.resolveUrl = exports.resolvePlatform = exports.resolveMetaFileName = exports.resolveFileName = exports.resolveReleaseVersion = exports.resolveVersionNum = void 0;
 var os_1 = __importDefault(require("os"));
+var path_1 = __importDefault(require("path"));
 var constants_1 = require("./constants");
 var config_1 = __importDefault(require("../../config"));
-function resolveSource(_a) {
-    var dev = _a.dev, version = _a.version;
-    var urlPath = [
-        dev ? constants_1.DistSource.Dev : constants_1.DistSource.Release
-    ];
-    if (dev) {
-        urlPath.push(version.split('.').slice(0, 2).join('.'));
+var logger_1 = __importDefault(require("../../logger/logger"));
+function resolveVersionNum(version) {
+    var versionSegments = version.split('.').slice(0, 3);
+    for (var i = 0; i < 3 - versionSegments.length; ++i) {
+        versionSegments.push('0');
     }
-    return urlPath.join('/');
+    return parseInt(versionSegments.join(''), 10);
 }
-exports.resolveSource = resolveSource;
+exports.resolveVersionNum = resolveVersionNum;
+function resolveReleaseVersion(version) {
+    return version.split('.').slice(0, 2).join('.');
+}
+exports.resolveReleaseVersion = resolveReleaseVersion;
 function resolveFileName(_a) {
     var dist = _a.name, version = _a.version, platform = _a.platform;
     var ext = platform === 'linux' ? '.tar.gz' : '.zip';
     return "amxmodx-".concat(version, "-").concat(dist, "-").concat(platform).concat(ext);
 }
 exports.resolveFileName = resolveFileName;
+function resolveMetaFileName(_a) {
+    var dist = _a.name, platform = _a.platform;
+    return "amxmodx-latest-".concat(dist, "-").concat(platform);
+}
+exports.resolveMetaFileName = resolveMetaFileName;
 function resolvePlatform() {
     var platform = os_1.default.platform();
     switch (platform) {
@@ -38,3 +46,35 @@ function resolveUrl(source, file) {
     return "".concat(config_1.default.downloadHost, "/").concat(source, "/").concat(file);
 }
 exports.resolveUrl = resolveUrl;
+function resolveSource(_a) {
+    var dev = _a.dev, version = _a.version;
+    var releaseVersion = resolveReleaseVersion(version);
+    var releaseVersionNum = resolveVersionNum(releaseVersion);
+    var isNewVersion = releaseVersionNum > constants_1.LATEST_RELEASE_VERSION_NUM;
+    var distSource = dev || isNewVersion ? constants_1.DistSource.AmxxDrop : constants_1.DistSource.Release;
+    var urlPath = [distSource];
+    if (distSource === constants_1.DistSource.AmxxDrop) {
+        urlPath.push(releaseVersion);
+    }
+    return urlPath.join('/');
+}
+exports.resolveSource = resolveSource;
+function resolveDownloadDistOpts(fileName, dist) {
+    var filePath = path_1.default.join(config_1.default.downloadDir, fileName);
+    var source = resolveSource(dist);
+    var url = resolveUrl(source, fileName);
+    return { url: url, path: filePath };
+}
+exports.resolveDownloadDistOpts = resolveDownloadDistOpts;
+function resolveDist(options) {
+    var _a = options.name, name = _a === void 0 ? constants_1.BASE_DIST : _a, _b = options.dev, dev = _b === void 0 ? false : _b;
+    var version = dev
+        ? options.version
+        : resolveReleaseVersion(options.version || constants_1.LATEST_RELEASE_VERSION);
+    if (options.version !== version && name === constants_1.BASE_DIST) {
+        logger_1.default.warn("The \"".concat(options.version, "\" version format is redundant. Change the compiler version to \"").concat(version, "\" in the project configuration to remove this warning."));
+    }
+    var platform = resolvePlatform();
+    return { name: name, version: version, platform: platform, dev: dev };
+}
+exports.resolveDist = resolveDist;

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/lib/project-config/defaults.js

@@ -14,7 +14,7 @@ exports.default = {
     },
     compiler: {
         dir: './.compiler',
-        version: '1.8.2',
+        version: '1.8',
         dev: false,
         addons: [],
         executable: 'amxxpc'

package/lib/project-config/index.d.ts

@@ -1,6 +1,8 @@
+import load from './load';
 import resolve from './resolve';
 declare const _default: {
     resolve: typeof resolve;
+    load: typeof load;
     defaults: import("../types").IProjectConfig;
 };
 export default _default;

package/lib/project-config/index.js

@@ -4,5 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var defaults_1 = __importDefault(require("./defaults"));
+var load_1 = __importDefault(require("./load"));
 var resolve_1 = __importDefault(require("./resolve"));
-exports.default = { resolve: resolve_1.default, defaults: defaults_1.default };
+exports.default = { resolve: resolve_1.default, load: load_1.default, defaults: defaults_1.default };

package/lib/project-config/load.d.ts

@@ -0,0 +1,3 @@
+import { IResolvedProjectConfig } from '../types';
+declare function load(_configPath?: string | null, projectDir?: string): Promise<IResolvedProjectConfig>;
+export default load;

package/lib/project-config/load.js

@@ -0,0 +1,92 @@
+"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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var path_1 = __importDefault(require("path"));
+var fs_1 = __importDefault(require("fs"));
+var logger_1 = __importDefault(require("../logger/logger"));
+var resolve_1 = __importDefault(require("./resolve"));
+function load(_configPath, projectDir) {
+    if (projectDir === void 0) { projectDir = ''; }
+    return __awaiter(this, void 0, void 0, function () {
+        var resolvePath, configPath, userConfig;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    resolvePath = function (p) { return path_1.default.resolve(projectDir, p); };
+                    configPath = resolvePath(_configPath);
+                    userConfig = null;
+                    if (!fs_1.default.existsSync(configPath)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require(configPath)); })];
+                case 1:
+                    userConfig = _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    logger_1.default.error('Cannot read config file!');
+                    _a.label = 3;
+                case 3: return [2 /*return*/, (0, resolve_1.default)(userConfig, projectDir)];
+            }
+        });
+    });
+}
+exports.default = load;

package/lib/project-config/resolve.d.ts

@@ -1,3 +1,4 @@
-import { IProjectConfig } from '../types';
-declare function resolve(_configPath?: string): Promise<IProjectConfig>;
+import type { PartialDeep } from 'type-fest';
+import { IProjectConfig, IResolvedProjectConfig } from '../types';
+declare function resolve(overrides?: PartialDeep<IProjectConfig>, projectDir?: string): IResolvedProjectConfig;
 export default resolve;

package/lib/project-config/resolve.js

@@ -1,58 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
 };
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -60,52 +16,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var lodash_1 = require("lodash");
 var path_1 = __importDefault(require("path"));
-var fs_1 = __importDefault(require("fs"));
-var logger_1 = __importDefault(require("../logger/logger"));
 var defaults_1 = __importDefault(require("./defaults"));
-function resolve(_configPath) {
-    return __awaiter(this, void 0, void 0, function () {
-        var userConfig, configPath, config;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    userConfig = null;
-                    if (!_configPath) return [3 /*break*/, 3];
-                    configPath = path_1.default.resolve(_configPath);
-                    if (!fs_1.default.existsSync(configPath)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require(configPath)); })];
-                case 1:
-                    userConfig = _a.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    logger_1.default.error('Cannot read config file!');
-                    _a.label = 3;
-                case 3:
-                    config = (0, lodash_1.merge)({}, defaults_1.default, userConfig);
-                    // resolve paths
-                    (0, lodash_1.merge)(config, {
-                        input: {
-                            scripts: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.scripts), function (dir) { return path_1.default.resolve(dir); }),
-                            include: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.include), function (dir) { return path_1.default.resolve(dir); }),
-                            assets: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.assets), function (dir) { return path_1.default.resolve(dir); }),
-                        },
-                        output: {
-                            scripts: path_1.default.resolve(config.output.scripts),
-                            plugins: path_1.default.resolve(config.output.plugins),
-                            include: path_1.default.resolve(config.output.include),
-                            assets: path_1.default.resolve(config.output.assets)
-                        },
-                        include: (0, lodash_1.map)(config.include, function (include) { return path_1.default.resolve(include); }),
-                        compiler: {
-                            dir: path_1.default.resolve(config.compiler.dir),
-                        },
-                        thirdparty: {
-                            dir: path_1.default.resolve(config.thirdparty.dir)
-                        }
-                    });
-                    return [2 /*return*/, config];
-            }
-        });
+function resolve(overrides, projectDir) {
+    if (overrides === void 0) { overrides = {}; }
+    if (projectDir === void 0) { projectDir = ''; }
+    var resolvePath = function (p) { return path_1.default.resolve(projectDir || '', p); };
+    var config = (0, lodash_1.merge)({}, defaults_1.default, overrides);
+    // resolve paths
+    var resolvedConfig = (0, lodash_1.merge)(config, {
+        input: {
+            scripts: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.scripts), function (dir) { return resolvePath(dir); }),
+            include: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.include), function (dir) { return resolvePath(dir); }),
+            assets: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.assets), function (input) { return (typeof input === 'object'
+                ? __assign(__assign({}, input), { dir: resolvePath(input.dir) }) : { dir: resolvePath(input) }); })
+        },
+        output: {
+            scripts: resolvePath(config.output.scripts),
+            plugins: resolvePath(config.output.plugins),
+            include: resolvePath(config.output.include),
+            assets: resolvePath(config.output.assets)
+        },
+        include: (0, lodash_1.map)(config.include, function (include) { return resolvePath(include); }),
+        compiler: {
+            dir: resolvePath(config.compiler.dir),
+        },
+        thirdparty: {
+            dir: resolvePath(config.thirdparty.dir)
+        }
     });
+    return resolvedConfig;
 }
 exports.default = resolve;

package/lib/types/index.d.ts

@@ -1,8 +1,13 @@
+export interface IAssetInput {
+    dir: string;
+    dest?: string;
+    filter?: string | string[];
+}
 export interface IProjectConfig {
     input: {
         scripts: string | string[];
         include: string | string[];
-        assets: string | string[];
+        assets: string | string[] | IAssetInput | IAssetInput[];
     };
     output: {
         scripts: string;
@@ -43,3 +48,10 @@ export interface IProjectConfig {
         };
     };
 }
+export interface IResolvedProjectConfig extends IProjectConfig {
+    input: {
+        scripts: string[];
+        include: string[];
+        assets: IAssetInput[];
+    };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "amxxpack",
   "description": "AMXXPack",
   "author": "Hedgehog Fog",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "MIT",
   "main": "lib/builder/index.js",
   "types": "lib/builder/index.d.ts",
@@ -69,6 +69,7 @@
     "jest": "^27.5.1",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.3",
-    "typescript": "^4.5.5"
+    "type-fest": "^3.2.0",
+    "typescript": "^4.8.4"
   }
 }