amxxpack 1.3.2 → 1.4.0

package/README.md

@@ -52,7 +52,7 @@ npm install -g amxxpack
 - `amxxpack compile <path|glob>` - compile specific plugin in the project
   - `--config` - config file
   - `--no-cache` - disable caching
-- `amxxpack new <script|lib|include> [name]` - create a new file in the project workspace
+- `amxxpack generate <script|lib|include> [name]` - create a new file in the project workspace
   - `--config` - config file
   - `--name` - plugin name
   - `--version` - plugin version
@@ -61,7 +61,7 @@ npm install -g amxxpack
   - `--include` - include list separated by a comma
   - `--overwrite` - overwrite the file if it already exists
 - `amxpack i` - alias to `install` command
-- `amxpack n` - alias to `new` command
+- `amxpack g` - alias to `generate` command
 - `amxpack b` - alias to `build` command
 - `amxpack c` - alias to `compile` command
 
@@ -140,3 +140,27 @@ You can also specify subdirectories for copying. With this configuration, the bu
     }
   }
 ```
+
+### Compiler configuration
+Using the `compiler` configuration you can specify the compiler version you want to use.
+
+For example, if you want to use AmxModX 1.9 with `cstrike` addon in your project, then use this configuration:
+```json
+{
+  "compiler": {
+    "version": "1.9",
+    "addons": ["cstrike"]
+  }
+}
+```
+
+In case you want to use a dev build from `amxxdrop` you should set `dev` flag to `true` and specify the build you want to use in the `version` field:
+```json
+{
+  "compiler": {
+    "version": "1.10.0-git5467",
+    "dev": true,
+    "addons": ["cstrike"]
+  }
+}
+```

package/lib/builder/builder.js

@@ -428,6 +428,9 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!this.projectConfig.output.include) {
+                            return [2 /*return*/];
+                        }
                         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:
@@ -510,10 +513,10 @@ var AmxxBuilder = /** @class */ (function () {
                             var startLine = message.startLine, type = message.type, code = message.code, text = message.text, filename = message.filename;
                             var relativeFilePath = filename ? path_1.default.relative(process.cwd(), filename) : relateiveSrcPath;
                             if (type === amxxpc_1.AMXPCMessageType.Error || type === amxxpc_1.AMXPCMessageType.FatalError) {
-                                logger_1.default.error("".concat((0, normalize_path_1.default)(relativeFilePath), "(").concat(startLine, ")"), type, code, ':', text);
+                                logger_1.default.error("".concat((0, normalize_path_1.default)(relativeFilePath), ":").concat(startLine), '-', type, code, ':', text);
                             }
                             else if (type === amxxpc_1.AMXPCMessageType.Warning) {
-                                logger_1.default.warn("".concat((0, normalize_path_1.default)(relativeFilePath), "(").concat(startLine, ")"), type, code, ':', text);
+                                logger_1.default.warn("".concat((0, normalize_path_1.default)(relativeFilePath), ":").concat(startLine), '-', type, code, ':', text);
                             }
                             else if (type === amxxpc_1.AMXPCMessageType.Echo) {
                                 logger_1.default.debug(text);
@@ -554,10 +557,23 @@ var AmxxBuilder = /** @class */ (function () {
     AmxxBuilder.prototype.watchDir = function (baseDir, pattern, cb) {
         return __awaiter(this, void 0, void 0, function () {
             var pathPattern, watcher, updateFn;
+            var _this = this;
             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(path_1.default.normalize(filePath)).catch(function (err) { return logger_1.default.error(err.message); }); };
+                updateFn = function (filePath) { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                logger_1.default.info('File change detected. Starting incremental compilation...');
+                                return [4 /*yield*/, cb(path_1.default.normalize(filePath)).catch(function (err) { return logger_1.default.error(err.message); })];
+                            case 1:
+                                _a.sent();
+                                logger_1.default.info('Compilation complete. Watching for file changes.');
+                                return [2 /*return*/];
+                        }
+                    });
+                }); };
                 watcher.on('add', updateFn);
                 watcher.on('change', updateFn);
                 return [2 /*return*/];

package/lib/cli/program.js

@@ -141,8 +141,10 @@ program
     });
 }); });
 program
-    .command('new')
+    .command('generate')
+    .alias('new')
     .alias('n')
+    .alias('g')
     .arguments('<type> <filename>')
     .option('--config, -c <path>', 'Config file', config_1.default.projectConfig)
     .option('--name, -n <name>', 'Plugin name')

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

@@ -183,7 +183,7 @@ var ProjectCreator = /** @class */ (function () {
     };
     ProjectCreator.prototype.createConfig = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var configPath;
+            var configPath, projectConfig;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -192,7 +192,16 @@ var ProjectCreator = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         configPath = path_1.default.join(this.projectDir, config_1.default.projectConfig);
-                        return [4 /*yield*/, fs_1.default.promises.writeFile(configPath, JSON.stringify(project_config_1.default.defaults, null, 2))];
+                        projectConfig = (0, lodash_1.merge)({}, project_config_1.default.defaults, {
+                            output: {
+                                base: './dist',
+                                scripts: './addons/amxmodx/scripting',
+                                plugins: './addons/amxmodx/plugins',
+                                include: './addons/amxmodx/scripting/include',
+                                assets: './'
+                            },
+                        });
+                        return [4 /*yield*/, fs_1.default.promises.writeFile(configPath, JSON.stringify(projectConfig, null, 2))];
                     case 2:
                         _a.sent();
                         return [2 /*return*/];

package/lib/downloaders/compiler/downloader.js

@@ -107,6 +107,9 @@ function downloadDist(dist) {
                 case 0: return [4 /*yield*/, getDistFileName(dist)];
                 case 1:
                     fileName = _a.sent();
+                    if (!fileName) {
+                        throw new Error('Failed to fetch dist file meta!');
+                    }
                     downloadOpts = (0, resolvers_1.resolveDownloadDistOpts)(fileName, dist);
                     return [4 /*yield*/, (0, download_1.default)(downloadOpts.url, downloadOpts.path)];
                 case 2:
@@ -166,6 +169,7 @@ function downloadCompiler(options) {
                     return [4 /*yield*/, Promise.all((0, lodash_1.map)(dists, downloadDist))];
                 case 1:
                     distArchives = _a.sent();
+                    logger_1.default.info('Extracting compiler files...');
                     _i = 0, distArchives_1 = distArchives;
                     _a.label = 2;
                 case 2:

package/lib/logger/logger.js

@@ -68,8 +68,9 @@ var Logger = /** @class */ (function () {
             .join(' ');
         var label = this.getLevelLabel(level);
         var coloredMessage = this.colorifyMessageByLevel(level, message);
+        var time = (new Date()).toLocaleTimeString();
         // eslint-disable-next-line no-console
-        console.log(label, coloredMessage);
+        console.log("[".concat(time, "]"), label, coloredMessage);
     };
     Logger.prototype.colorifyMessageByLevel = function (level, message) {
         switch (level) {

package/lib/project-config/defaults.js

@@ -7,6 +7,7 @@ exports.default = {
         assets: './assets',
     },
     output: {
+        base: '',
         scripts: './dist/addons/amxmodx/scripting',
         plugins: './dist/addons/amxmodx/plugins',
         include: './dist/addons/amxmodx/scripting/include',

package/lib/project-config/resolve.js

@@ -17,26 +17,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var lodash_1 = require("lodash");
 var path_1 = __importDefault(require("path"));
 var defaults_1 = __importDefault(require("./defaults"));
+var mergeConfigFn = function (val1, val2) { return ((0, lodash_1.isNil)(val2) ? val1 : undefined); };
 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);
+    var resolvePath = function (p) { return (!(0, lodash_1.isNil)(p) ? path_1.default.resolve(projectDir || '', p) : null); };
+    var config = (0, lodash_1.mergeWith)({}, defaults_1.default, overrides, mergeConfigFn);
+    var outputBaseDir = resolvePath(config.output.base);
     // 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'
+            scripts: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.scripts), resolvePath),
+            include: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.include), resolvePath),
+            assets: (0, lodash_1.map)((0, lodash_1.castArray)(config.input.assets), function (input) { return ((0, lodash_1.isObject)(input)
                 ? __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)
+            scripts: path_1.default.resolve(outputBaseDir, config.output.scripts),
+            plugins: path_1.default.resolve(outputBaseDir, config.output.plugins),
+            include: path_1.default.resolve(outputBaseDir, config.output.include),
+            assets: path_1.default.resolve(outputBaseDir, config.output.assets)
         },
-        include: (0, lodash_1.map)(config.include, function (include) { return resolvePath(include); }),
+        include: (0, lodash_1.map)(config.include, resolvePath),
         compiler: {
             dir: resolvePath(config.compiler.dir),
         },

package/lib/types/index.d.ts

@@ -5,31 +5,32 @@ export interface IAssetInput {
 }
 export interface IProjectConfig {
     input: {
-        scripts: string | string[];
-        include: string | string[];
-        assets: string | string[] | IAssetInput | IAssetInput[];
+        scripts: null | string | string[];
+        include: null | string | string[];
+        assets: null | string | IAssetInput | (string | IAssetInput)[];
     };
     output: {
-        scripts: string;
-        plugins: string;
-        include: string;
-        assets: string;
+        base?: null | string;
+        scripts: null | string;
+        plugins: null | string;
+        include: null | string;
+        assets: null | string;
     };
     compiler: {
-        dir: string;
+        dir: null | string;
         version: string;
         addons: [];
         dev: boolean;
         executable: string;
     };
     thirdparty: {
-        dir: string;
+        dir: string | null;
         dependencies: {
             name: string;
             url: string;
         }[];
     };
-    include: string[];
+    include: null | string[];
     rules: {
         flatCompilation: boolean;
     };
@@ -54,4 +55,17 @@ export interface IResolvedProjectConfig extends IProjectConfig {
         include: string[];
         assets: IAssetInput[];
     };
+    output: {
+        scripts: string;
+        plugins: string;
+        include: string;
+        assets: string;
+    };
+    include: string[];
+    compiler: IProjectConfig['compiler'] & {
+        dir: string;
+    };
+    thirdparty: IProjectConfig['thirdparty'] & {
+        dir: string;
+    };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "amxxpack",
   "description": "AMXXPack",
   "author": "Hedgehog Fog",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "license": "MIT",
   "main": "lib/builder/index.js",
   "types": "lib/builder/index.d.ts",