amxxpack 1.0.1 → 1.1.0

package/README.md

@@ -28,11 +28,11 @@ npm install -g amxxpack
 
 ## ▶ Quick start
 - Open a terminal inside the project directory (existing or create a new one)
-- Execute `npm install amxxpack --save-dev` command to install `amxxpack` locally
-- Execute `npx amxxpack create .` command to create new config
-- Execute `npx amxxpack install` to download project dependencies (compiler, thirdparty etc.)
-- Use `npm run build` command to build the project
-- Use `npm run watch` command to build the project and watch changes
+- Execute `npm install amxxpack -g` command to install `amxxpack` globally
+- Execute `amxxpack create .` command to create new config
+- Execute `amxxpack install` to download project dependencies (compiler, thirdparty etc.)
+- Use `amxxpack build` command to build the project
+- Use `amxxpack watch` command to build the project and watch changes
 
 ## 📋 Commands
 - `amxxpack create <name>` - create new project

package/lib/builder/builder.js

@@ -150,7 +150,11 @@ var AmxxBuilder = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.buildDir(this.config.input.assets, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return _this.updateAsset(filePath); })];
+                    case 0:
+                        if (!this.config.input.assets) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.buildDir(this.config.input.assets, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return _this.updateAsset(filePath); })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -189,7 +193,11 @@ var AmxxBuilder = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.watchDir(this.config.input.assets, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return _this.updateAsset(filePath); })];
+                    case 0:
+                        if (!this.config.input.assets) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.watchDir(this.config.input.assets, constants_1.ASSETS_PATH_PATTERN, function (filePath) { return _this.updateAsset(filePath); })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -218,6 +226,9 @@ var AmxxBuilder = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (!this.config.output.scripts) {
+                            return [2 /*return*/];
+                        }
                         srcPath = path_1.default.resolve(filePath);
                         destPath = path_1.default.join(this.config.output.scripts, path_1.default.parse(filePath).base);
                         return [4 /*yield*/, (0, mkdirp_1.default)(this.config.output.scripts)];
@@ -283,7 +294,7 @@ var AmxxBuilder = /** @class */ (function () {
                         return [4 /*yield*/, (0, glob_promise_1.default)(pathPattern)];
                     case 1:
                         matches = _a.sent();
-                        return [2 /*return*/, matches];
+                        return [2 /*return*/, matches.filter(function (filePath) { return path_1.default.extname(filePath) === '.sma'; })];
                 }
             });
         });
@@ -318,12 +329,13 @@ var AmxxBuilder = /** @class */ (function () {
                     case 2:
                         result = _a.sent();
                         result.output.messages.forEach(function (message) {
-                            var startLine = message.startLine, type = message.type, code = message.code, text = message.text;
+                            var startLine = message.startLine, type = message.type, code = message.code, text = message.text, filename = message.filename;
+                            var relativeFilePath = path_1.default.relative(process.cwd(), filename);
                             if (type === amxxpc_1.AMXPCMessageType.Error || type === amxxpc_1.AMXPCMessageType.FatalError) {
-                                logger_1.default.error("".concat((0, normalize_path_1.default)(relateiveSrcPath), "(").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)(relateiveSrcPath), "(").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);
@@ -366,7 +378,7 @@ var AmxxBuilder = /** @class */ (function () {
             var pathPattern, watcher, updateFn;
             return __generator(this, function (_a) {
                 pathPattern = path_1.default.join(baseDir, pattern);
-                watcher = chokidar_1.default.watch(pathPattern, { ignoreInitial: true });
+                watcher = chokidar_1.default.watch(pathPattern, { ignoreInitial: true, interval: 300 });
                 updateFn = function (filePath) { return cb(filePath).catch(function (err) { return logger_1.default.error(err.message); }); };
                 watcher.on('add', updateFn);
                 watcher.on('change', updateFn);

package/lib/cli/controller.js

@@ -97,8 +97,7 @@ var Controller = /** @class */ (function () {
     };
     Controller.prototype.compile = function (scriptPath, configPath) {
         return __awaiter(this, void 0, void 0, function () {
-            var builder, matches;
-            var _this = this;
+            var builder, matches, _i, matches_1, filePath, srcPath;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.createBuilder(configPath)];
@@ -107,20 +106,20 @@ var Controller = /** @class */ (function () {
                         return [4 /*yield*/, builder.findPlugins(scriptPath)];
                     case 2:
                         matches = _a.sent();
-                        matches.map(function (filePath) { return __awaiter(_this, void 0, void 0, function () {
-                            var srcPath;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        srcPath = path_1.default.resolve(filePath);
-                                        return [4 /*yield*/, builder.compilePlugin(srcPath)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                        return [2 /*return*/];
+                        _i = 0, matches_1 = matches;
+                        _a.label = 3;
+                    case 3:
+                        if (!(_i < matches_1.length)) return [3 /*break*/, 6];
+                        filePath = matches_1[_i];
+                        srcPath = path_1.default.resolve(filePath);
+                        return [4 /*yield*/, builder.compilePlugin(srcPath)];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5:
+                        _i++;
+                        return [3 /*break*/, 3];
+                    case 6: return [2 /*return*/];
                 }
             });
         });

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

@@ -7,7 +7,7 @@ declare class ProjectCreator {
     isCurrentDir: boolean;
     constructor(options?: IProjectOptions);
     createProject(): Promise<void>;
-    createPackage(): Promise<void>;
+    updatePackage(): Promise<void>;
     createConfig(): Promise<void>;
     createDirectories(): Promise<void>;
     installDependencies(): Promise<void>;

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

@@ -98,7 +98,7 @@ var ProjectCreator = /** @class */ (function () {
                     case 2:
                         _a.sent();
                         if (!!this.options.nonpm) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.createPackage()];
+                        return [4 /*yield*/, this.updatePackage()];
                     case 3:
                         _a.sent();
                         _a.label = 4;
@@ -109,14 +109,14 @@ var ProjectCreator = /** @class */ (function () {
                         _a.sent();
                         _a.label = 6;
                     case 6:
-                        if (!this.isNpmPackageInitialized()) return [3 /*break*/, 8];
-                        return [4 /*yield*/, this.installDependencies()];
+                        if (!this.isGitInitialized()) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.updateGitignore()];
                     case 7:
                         _a.sent();
                         _a.label = 8;
                     case 8:
-                        if (!this.isGitInitialized()) return [3 /*break*/, 10];
-                        return [4 /*yield*/, this.updateGitignore()];
+                        if (!this.isNpmPackageInitialized()) return [3 /*break*/, 10];
+                        return [4 /*yield*/, this.installDependencies()];
                     case 9:
                         _a.sent();
                         _a.label = 10;
@@ -127,11 +127,11 @@ var ProjectCreator = /** @class */ (function () {
             });
         });
     };
-    ProjectCreator.prototype.createPackage = function () {
+    ProjectCreator.prototype.updatePackage = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var packagePath, packageData;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var packagePath, packageData, _a, _b, _c, _d, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         logger_1.default.info('📦 Initializing npm package...');
                         packagePath = path_1.default.join(this.projectDir, 'package.json');
@@ -139,16 +139,34 @@ var ProjectCreator = /** @class */ (function () {
                             name: this.options.name,
                             version: (0, lodash_1.get)(this.options, 'version', '0.1.0'),
                             author: (0, lodash_1.get)(this.options, 'author', 'AMXXPack'),
-                            description: (0, lodash_1.get)(this.options, 'description', 'This project was generated by AMXXPack CLI'),
+                            description: (0, lodash_1.get)(this.options, 'description', 'This project was generated by AMXXPack CLI')
+                        };
+                        if (!fs_1.default.existsSync(packagePath)) return [3 /*break*/, 4];
+                        _f.label = 1;
+                    case 1:
+                        _f.trys.push([1, 3, , 4]);
+                        _a = lodash_1.merge;
+                        _b = [packageData];
+                        _d = (_c = JSON).parse;
+                        return [4 /*yield*/, fs_1.default.promises.readFile(packagePath, 'utf8')];
+                    case 2:
+                        _a.apply(void 0, _b.concat([_d.apply(_c, [_f.sent()])]));
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _e = _f.sent();
+                        logger_1.default.error('Cannot read package.json file');
+                        return [3 /*break*/, 4];
+                    case 4:
+                        (0, lodash_1.merge)(packageData, {
                             scripts: {
                                 build: 'amxxpack build',
                                 watch: 'amxxpack build --watch',
                                 postinstall: 'amxxpack install'
                             }
-                        };
+                        });
                         return [4 /*yield*/, fs_1.default.promises.writeFile(packagePath, JSON.stringify(packageData, null, 2))];
-                    case 1:
-                        _a.sent();
+                    case 5:
+                        _f.sent();
                         return [2 /*return*/];
                 }
             });

package/package.json

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