amxxpack 1.4.3 → 1.4.5

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/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

@@ -175,7 +175,9 @@ var Controller = /** @class */ (function () {
                         return [4 /*yield*/, (0, thirdparty_1.default)({
                                 name: dependency.name,
                                 url: dependency.url,
-                                dir: projectConfig.thirdparty.dir
+                                dir: projectConfig.thirdparty.dir,
+                                strip: dependency.strip,
+                                filter: dependency.filter
                             })];
                     case 4:
                         _b.sent();

package/lib/downloaders/thirdparty/downloader.js

@@ -42,6 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var mkdirp_1 = __importDefault(require("mkdirp"));
 var decompress_1 = __importDefault(require("decompress"));
+var globule_1 = __importDefault(require("globule"));
 var download_1 = __importDefault(require("../../utils/download"));
 var config_1 = __importDefault(require("../../config"));
 function downloadThirdparty(options) {
@@ -58,7 +59,14 @@ function downloadThirdparty(options) {
                     return [4 /*yield*/, (0, mkdirp_1.default)(outDir)];
                 case 2:
                     _a.sent();
-                    return [4 /*yield*/, (0, decompress_1.default)(filePath, outDir)];
+                    return [4 /*yield*/, (0, decompress_1.default)(filePath, outDir, {
+                            strip: options.strip,
+                            filter: options.filter && (function (file) { return globule_1.default.isMatch(options.filter, file.path, {
+                                dot: true,
+                                nocase: true,
+                                matchBase: true
+                            }); })
+                        })];
                 case 3:
                     _a.sent();
                     return [2 /*return*/];

package/lib/downloaders/thirdparty/types.d.ts

@@ -2,4 +2,6 @@ export interface IDownloadThirdpartyOptions {
     name: string;
     url: string;
     dir: string;
+    strip: number;
+    filter?: string | string[];
 }

package/lib/project-config/resolve.js

@@ -42,7 +42,8 @@ function resolve(overrides, projectDir) {
             dir: resolvePath(config.compiler.dir),
         },
         thirdparty: {
-            dir: resolvePath(config.thirdparty.dir)
+            dir: resolvePath(config.thirdparty.dir),
+            dependencies: (0, lodash_1.map)(config.thirdparty.dependencies, function (dependency) { return (__assign(__assign({}, dependency), { strip: dependency.strip || 0 })); })
         }
     });
     return resolvedConfig;

package/lib/types/index.d.ts

@@ -3,6 +3,12 @@ export interface IAssetInput {
     dest?: string;
     filter?: string | string[];
 }
+export interface IDependency {
+    name: string;
+    url: string;
+    strip?: number;
+    filter?: string | string[];
+}
 export interface IProjectConfig {
     input: {
         scripts: null | string | string[];
@@ -25,10 +31,7 @@ export interface IProjectConfig {
     };
     thirdparty: {
         dir: string | null;
-        dependencies: {
-            name: string;
-            url: string;
-        }[];
+        dependencies: IDependency[];
     };
     include: null | string[];
     rules: {
@@ -67,5 +70,8 @@ export interface IResolvedProjectConfig extends IProjectConfig {
     };
     thirdparty: IProjectConfig['thirdparty'] & {
         dir: string;
+        dependencies: (IDependency & {
+            strip: number;
+        })[];
     };
 }

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.3",
+  "version": "1.4.5",
   "license": "MIT",
   "main": "lib/builder/index.js",
   "types": "lib/builder/index.d.ts",