amxxpack 1.4.4 → 1.4.6

package/README.md

@@ -106,6 +106,19 @@ You can use multiple directories as builder inputs, just specify an array of dir
   }
 ```
 
+### Disabling output
+Use `null` value for outputs to disable copying of specific output.
+
+For example, in this case, include files will not be copied to the output folder:
+
+```json
+  {
+    "output": {
+      "include": null
+    }
+  }
+```
+
 ### Assets filtering and subdirectories
 Using glob filters you can specify which assets should be copied.
 

package/lib/builder/builder.js

@@ -468,7 +468,7 @@ var AmxxBuilder = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         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)];
+                        return [4 /*yield*/, globule_1.default.find(pathPattern, { nodir: true })];
                     case 1:
                         matches = _a.sent();
                         return [2 /*return*/, matches.filter(function (filePath) { return path_1.default.extname(filePath) === '.sma'; })];
@@ -479,9 +479,10 @@ var AmxxBuilder = /** @class */ (function () {
     AmxxBuilder.prototype.compilePlugin = function (srcDir, srcFile, compileOptions) {
         if (compileOptions === void 0) { compileOptions = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var srcPath, _a, scriptName, srcNestedDir, destDir, pluginDest, isUpdated, _b, relateiveSrcPath, executablePath, result, destPath, relativeFilePath;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var srcPath, _a, scriptName, srcNestedDir, destDir, pluginDest, isUpdated, _b, relateiveSrcPath, executablePath, result, _c, _d, _e, destPath, relativeFilePath;
+            var _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         if (!this.projectConfig.output.plugins) {
                             return [2 /*return*/];
@@ -495,8 +496,8 @@ var AmxxBuilder = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, this.pluginCache.isPluginUpdated(srcPath, pluginDest)];
                     case 2:
-                        _b = _c.sent();
-                        _c.label = 3;
+                        _b = _g.sent();
+                        _g.label = 3;
                     case 3:
                         isUpdated = _b;
                         relateiveSrcPath = path_1.default.relative(process.cwd(), srcPath);
@@ -507,28 +508,35 @@ var AmxxBuilder = /** @class */ (function () {
                         executablePath = path_1.default.join(this.projectConfig.compiler.dir, this.projectConfig.compiler.executable);
                         return [4 /*yield*/, (0, mkdirp_1.default)(destDir)];
                     case 4:
-                        _c.sent();
-                        return [4 /*yield*/, (0, amxxpc_1.default)({
-                                path: srcPath,
-                                dest: pluginDest,
-                                compiler: executablePath,
-                                includeDir: __spreadArray(__spreadArray([
-                                    path_1.default.join(this.projectConfig.compiler.dir, 'include')
-                                ], this.projectConfig.include, true), this.projectConfig.input.include, true)
-                            })];
+                        _g.sent();
+                        _c = amxxpc_1.default;
+                        _f = {
+                            path: srcPath,
+                            dest: pluginDest,
+                            compiler: executablePath
+                        };
+                        _d = [[
+                                path_1.default.join(this.projectConfig.compiler.dir, 'include')
+                            ]];
+                        return [4 /*yield*/, globule_1.default.find(this.projectConfig.include)];
                     case 5:
-                        result = _c.sent();
-                        if (!!compileOptions.noCache) return [3 /*break*/, 9];
-                        if (!!result.error) return [3 /*break*/, 7];
+                        _e = [__spreadArray.apply(void 0, _d.concat([_g.sent(), true]))];
+                        return [4 /*yield*/, globule_1.default.find(this.projectConfig.input.include)];
+                    case 6: return [4 /*yield*/, _c.apply(void 0, [(_f.includeDir = __spreadArray.apply(void 0, _e.concat([_g.sent(), true])),
+                                _f)])];
+                    case 7:
+                        result = _g.sent();
+                        if (!!compileOptions.noCache) return [3 /*break*/, 11];
+                        if (!!result.error) return [3 /*break*/, 9];
                         return [4 /*yield*/, this.pluginCache.updatePlugin(srcPath, pluginDest)];
-                    case 6:
-                        _c.sent();
-                        return [3 /*break*/, 9];
-                    case 7: return [4 /*yield*/, this.pluginCache.deletePlugin(srcPath)];
                     case 8:
-                        _c.sent();
-                        _c.label = 9;
-                    case 9:
+                        _g.sent();
+                        return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, this.pluginCache.deletePlugin(srcPath)];
+                    case 10:
+                        _g.sent();
+                        _g.label = 11;
+                    case 11:
                         result.output.messages.forEach(function (message) {
                             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;

package/lib/builder/constants.d.ts

@@ -1,3 +1,3 @@
 export declare const SCRIPTS_PATH_PATTERN = "**/*.sma";
-export declare const INCLUDE_PATH_PATTERN = "**/*.inc";
+export declare const INCLUDE_PATH_PATTERN = "*.inc";
 export declare const ASSETS_PATH_PATTERN = "**/*.*";

package/lib/builder/constants.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ASSETS_PATH_PATTERN = exports.INCLUDE_PATH_PATTERN = exports.SCRIPTS_PATH_PATTERN = void 0;
 exports.SCRIPTS_PATH_PATTERN = '**/*.sma';
-exports.INCLUDE_PATH_PATTERN = '**/*.inc';
+exports.INCLUDE_PATH_PATTERN = '*.inc';
 exports.ASSETS_PATH_PATTERN = '**/*.*';

package/lib/builder/plugins-cache.js

@@ -157,7 +157,7 @@ var PluginsCache = /** @class */ (function () {
                     case 0: return [4 /*yield*/, (0, create_dir_hash_1.default)(includeDirs, function (p) { return !p.info.isFile() || path_1.default.parse(p.info.name).ext === '.inc'; })];
                     case 1:
                         includeHash = _a.sent();
-                        return [2 /*return*/, includeHash];
+                        return [2 /*return*/, includeHash.digest('hex')];
                 }
             });
         });

package/lib/cli/controller.js

@@ -247,7 +247,9 @@ var Controller = /** @class */ (function () {
     Controller.prototype.cleanCache = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                fs_1.default.promises.rm(config_1.default.cacheFile);
+                if (fs_1.default.existsSync(config_1.default.cacheFile)) {
+                    fs_1.default.promises.rm(config_1.default.cacheFile);
+                }
                 fs_1.default.promises.rm(config_1.default.downloadDir, { recursive: true, force: true });
                 return [2 /*return*/];
             });

package/lib/utils/create-dir-hash.d.ts

@@ -5,5 +5,5 @@ import crypto from 'crypto';
 declare function createDirHash(dirs: string[], filterFn?: (p: {
     dir: string;
     info: fs.Dirent;
-}) => boolean, initialHash?: crypto.Hash): Promise<string>;
+}) => boolean, initialHash?: crypto.Hash): Promise<crypto.Hash>;
 export default createDirHash;

package/lib/utils/create-dir-hash.js

@@ -54,10 +54,10 @@ function createDirHash(dirs, filterFn, initialHash) {
                     _i = 0, dirs_1 = dirs;
                     _b.label = 1;
                 case 1:
-                    if (!(_i < dirs_1.length)) return [3 /*break*/, 8];
+                    if (!(_i < dirs_1.length)) return [3 /*break*/, 9];
                     dir = dirs_1[_i];
                     if (!fs_1.default.existsSync(dir)) {
-                        return [3 /*break*/, 7];
+                        return [3 /*break*/, 8];
                     }
                     return [4 /*yield*/, fs_1.default.promises.readdir(dir, { withFileTypes: true })];
                 case 2:
@@ -65,11 +65,11 @@ function createDirHash(dirs, filterFn, initialHash) {
                     _a = 0, items_1 = items;
                     _b.label = 3;
                 case 3:
-                    if (!(_a < items_1.length)) return [3 /*break*/, 7];
+                    if (!(_a < items_1.length)) return [3 /*break*/, 8];
                     item = items_1[_a];
                     fullPath = path_1.default.join(dir, item.name);
                     if (filterFn && !filterFn({ dir: dir, info: item })) {
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 7];
                     }
                     if (!item.isFile()) return [3 /*break*/, 5];
                     return [4 /*yield*/, fs_1.default.promises.stat(fullPath)];
@@ -77,19 +77,20 @@ function createDirHash(dirs, filterFn, initialHash) {
                     fileStat = _b.sent();
                     data = "".concat(fullPath, ":").concat(fileStat.size, ":").concat(fileStat.mtimeMs);
                     hashSum.update(data);
-                    return [3 /*break*/, 6];
+                    return [3 /*break*/, 7];
                 case 5:
-                    if (item.isDirectory()) {
-                        createDirHash([fullPath], filterFn, hashSum);
-                    }
-                    _b.label = 6;
+                    if (!item.isDirectory()) return [3 /*break*/, 7];
+                    return [4 /*yield*/, createDirHash([fullPath], filterFn, hashSum)];
                 case 6:
+                    _b.sent();
+                    _b.label = 7;
+                case 7:
                     _a++;
                     return [3 /*break*/, 3];
-                case 7:
+                case 8:
                     _i++;
                     return [3 /*break*/, 1];
-                case 8: return [2 /*return*/, hashSum.digest('hex')];
+                case 9: return [2 /*return*/, hashSum];
             }
         });
     });

package/package.json

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