@zokugun/artifact 0.3.1 → 0.4.1

package/lib/steps/read-editor-config.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -35,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readEditorConfig = void 0;
+exports.readEditorConfig = readEditorConfig;
 const path_1 = __importDefault(require("path"));
 const editorconfig = __importStar(require("editorconfig"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -53,22 +63,22 @@ function buildFullGlob(glob) {
     }
     return glob.replace(/\*\*/g, '{*,**/**/**}');
 } // }}}
-function readEditorConfig({ incomingPath, targetPath, formats }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function readEditorConfig(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ incomingPath, targetPath, formats }) {
         let data;
         try {
             const dir = path_1.default.join(incomingPath, 'configs');
             const file = path_1.default.join(dir, '.editorconfig');
             data = yield fs_extra_1.default.readFile(file, 'utf-8');
         }
-        catch (_a) {
+        catch (_b) {
         }
         if (!data) {
             try {
                 const file = path_1.default.join(targetPath, '.editorconfig');
                 data = yield fs_extra_1.default.readFile(file, 'utf-8');
             }
-            catch (_b) {
+            catch (_c) {
             }
         }
         if (!data) {
@@ -98,4 +108,3 @@ function readEditorConfig({ incomingPath, targetPath, formats }) {
         formats.reverse();
     });
 }
-exports.readEditorConfig = readEditorConfig;

package/lib/steps/read-files.js

@@ -12,14 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFiles = void 0;
+exports.readFiles = readFiles;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const globby_1 = __importDefault(require("globby"));
 const istextorbinary_1 = require("istextorbinary");
 const read_buffer_1 = require("../utils/read-buffer");
-function readFiles({ incomingPath, textFiles, binaryFiles, options }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function readFiles(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ incomingPath, textFiles, binaryFiles, options }) {
         const cwd = path_1.default.join(incomingPath, 'configs');
         const files = yield (0, globby_1.default)(['**/*', '!**/*.lock', '!**/*-lock.*'], {
             cwd,
@@ -66,4 +66,3 @@ function readFiles({ incomingPath, textFiles, binaryFiles, options }) {
         }
     });
 }
-exports.readFiles = readFiles;

package/lib/steps/read-incoming-config.js

@@ -9,12 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readIncomingConfig = void 0;
-const config_1 = require("../config");
+exports.readIncomingConfig = readIncomingConfig;
+const configs_1 = require("../configs");
 function readIncomingConfig(context) {
     return __awaiter(this, void 0, void 0, function* () {
-        const [config] = yield (0, config_1.readConfig)(context.incomingPath);
-        context.incomingConfig = config;
+        if (!context.incomingConfig) {
+            const config = yield (0, configs_1.readPackageConfig)(context.incomingPath);
+            if (!config) {
+                return true;
+            }
+            context.incomingConfig = config;
+        }
     });
 }
-exports.readIncomingConfig = readIncomingConfig;

package/lib/steps/read-incoming-package.js

@@ -12,16 +12,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readIncomingPackage = void 0;
+exports.readIncomingPackage = readIncomingPackage;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_1 = require("lodash");
 function readIncomingPackage(context) {
     return __awaiter(this, void 0, void 0, function* () {
         const filePath = path_1.default.resolve(context.incomingPath, './package.json');
-        context.incomingPackage = (yield fs_extra_1.default.readJSON(filePath));
-        if (!context.incomingPackage) {
+        const incomingPackage = yield fs_extra_1.default.readJSON(filePath);
+        if (!isPackageManifest(incomingPackage)) {
             throw new Error('The package of the incoming artifact can\'t be found.');
         }
+        context.incomingPackage = incomingPackage;
     });
 }
-exports.readIncomingPackage = readIncomingPackage;
+function isPackageManifest(value) {
+    if ((0, lodash_1.isNil)(value) || !(0, lodash_1.isPlainObject)(value)) {
+        return false;
+    }
+    const manifest = value;
+    return typeof manifest.name === 'string' && typeof manifest.version === 'string';
+}

package/lib/steps/remove-files.js

@@ -0,0 +1,40 @@
+"use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeFiles = removeFiles;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const globby_1 = __importDefault(require("globby"));
+const micromatch_1 = require("micromatch");
+function removeFiles(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ removedPatterns, targetPath, options }) {
+        if (removedPatterns.length === 0) {
+            return;
+        }
+        const cwd = path_1.default.join(targetPath);
+        const files = yield (0, globby_1.default)(['**/*', '!**/*.lock', '!**/*-lock.*', '!.git'], {
+            cwd,
+            dot: true,
+        });
+        for (const file of files) {
+            if ((0, micromatch_1.isMatch)(file, removedPatterns)) {
+                const filePath = path_1.default.join(cwd, file);
+                yield fs_extra_1.default.unlink(filePath);
+                if (options.verbose) {
+                    console.log(`${file} has been removed`);
+                }
+            }
+        }
+    });
+}

package/lib/steps/replace-templates.js

@@ -9,10 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceTemplates = void 0;
+exports.replaceTemplates = replaceTemplates;
 const template_1 = require("../utils/template");
-function replaceTemplates({ textFiles, binaryFiles, targetPath }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function replaceTemplates(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ textFiles, binaryFiles, targetPath }) {
         const engine = new template_1.TemplateEngine(targetPath);
         for (const file of textFiles) {
             file.data = engine.render(file.data);
@@ -23,4 +23,3 @@ function replaceTemplates({ textFiles, binaryFiles, targetPath }) {
         }
     });
 }
-exports.replaceTemplates = replaceTemplates;

package/lib/steps/validate-newer-package.js

@@ -9,17 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateNewerPackage = void 0;
+exports.validateNewerPackage = validateNewerPackage;
 const semver_1 = require("semver");
-function validateNewerPackage({ incomingPackage, config, options }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function validateNewerPackage(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ incomingPackage, config, options }) {
         if (options.force) {
             return;
         }
-        const artifact = config.artifacts.find(({ name }) => name === incomingPackage.name);
+        const artifact = config.artifacts[incomingPackage.name];
         if (artifact) {
             return !(0, semver_1.gt)(incomingPackage.version, artifact.version);
         }
     });
 }
-exports.validateNewerPackage = validateNewerPackage;

package/lib/steps/validate-not-present-package.js

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateNotPresentPackage = void 0;
-function validateNotPresentPackage({ incomingPackage, config, options }) {
-    return __awaiter(this, void 0, void 0, function* () {
+exports.validateNotPresentPackage = validateNotPresentPackage;
+function validateNotPresentPackage(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ incomingPackage, config, options }) {
         if (options.force) {
             return;
         }
         const { name } = incomingPackage;
-        const artifact = config.artifacts.find((artifact) => artifact.name === name);
+        const artifact = config.artifacts[name];
         if (artifact) {
             if (options.skip) {
                 if (options.verbose) {
@@ -30,4 +30,3 @@ function validateNotPresentPackage({ incomingPackage, config, options }) {
         }
     });
 }
-exports.validateNotPresentPackage = validateNotPresentPackage;

package/lib/steps/write-text-files.js

@@ -12,11 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeTextFiles = void 0;
+exports.writeTextFiles = writeTextFiles;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-function writeTextFiles({ mergedTextFiles, targetPath, options }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function writeTextFiles(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ mergedTextFiles, targetPath, options }) {
         for (const file of mergedTextFiles) {
             const filePath = path_1.default.join(targetPath, file.name);
             yield fs_extra_1.default.outputFile(filePath, file.data, 'utf-8');
@@ -29,4 +29,3 @@ function writeTextFiles({ mergedTextFiles, targetPath, options }) {
         }
     });
 }
-exports.writeTextFiles = writeTextFiles;

package/lib/types/format.js

@@ -5,4 +5,4 @@ var IndentStyle;
 (function (IndentStyle) {
     IndentStyle["SPACE"] = "space";
     IndentStyle["TAB"] = "tab";
-})(IndentStyle = exports.IndentStyle || (exports.IndentStyle = {}));
+})(IndentStyle || (exports.IndentStyle = IndentStyle = {}));

package/lib/utils/build-journey-plan.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildJourneyPlan = void 0;
+exports.buildJourneyPlan = buildJourneyPlan;
 function buildJourneyPlan(plan, alias) {
     return (basename) => {
         const travel = plan(basename);
@@ -15,4 +15,3 @@ function buildJourneyPlan(plan, alias) {
         }
     };
 }
-exports.buildJourneyPlan = buildJourneyPlan;

package/lib/utils/build-travel-plan.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTravelPlan = void 0;
+exports.buildTravelPlan = buildTravelPlan;
 function buildTravelPlan(...mappers) {
     return (basename) => {
         const mapper = mappers.find((mapper) => {
@@ -17,4 +17,3 @@ function buildTravelPlan(...mappers) {
         }
     };
 }
-exports.buildTravelPlan = buildTravelPlan;

package/lib/utils/command/join-command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinCommand = void 0;
+exports.joinCommand = joinCommand;
 function joinCommand(commands) {
     const subcommands = [];
     for (const [key, values] of Object.entries(commands)) {
@@ -29,4 +29,3 @@ function joinCommand(commands) {
     }
     return subcommands.join(' ');
 }
-exports.joinCommand = joinCommand;

package/lib/utils/command/split-command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitCommand = void 0;
+exports.splitCommand = splitCommand;
 const lodash_1 = require("lodash");
 function splitCommand(command) {
     const result = {};
@@ -29,4 +29,3 @@ function splitCommand(command) {
     }
     return result;
 }
-exports.splitCommand = splitCommand;

package/lib/utils/dev-null.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDevNull = void 0;
+exports.createDevNull = createDevNull;
 const fs_1 = require("fs");
 function createDevNull() {
     return (0, fs_1.createWriteStream)('/dev/null');
 }
-exports.createDevNull = createDevNull;

package/lib/utils/read-buffer.js

@@ -12,19 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readBuffer = void 0;
+exports.readBuffer = readBuffer;
 const buffer_1 = require("buffer");
 const promises_1 = __importDefault(require("fs/promises"));
-function readBuffer(filepath, size, offset = 0) {
-    return __awaiter(this, void 0, void 0, function* () {
+function readBuffer(filepath_1, size_1) {
+    return __awaiter(this, arguments, void 0, function* (filepath, size, offset = 0) {
         const buffer = buffer_1.Buffer.alloc(size);
         const file = yield promises_1.default.open(filepath, 'r');
         try {
-            const { bytesRead } = yield file.read(buffer, offset, size, 0);
+            const { bytesRead } = yield file.read(buffer, 0, size, offset);
             if (bytesRead < size) {
-                const smaller = buffer_1.Buffer.alloc(bytesRead);
-                buffer.copy(smaller, 0, 0, bytesRead);
-                return smaller;
+                return buffer.slice(0, bytesRead);
             }
             else {
                 return buffer;
@@ -35,4 +33,3 @@ function readBuffer(filepath, size, offset = 0) {
         }
     });
 }
-exports.readBuffer = readBuffer;

package/lib/utils/resolve-request.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRequest = resolveRequest;
+const untildify_1 = __importDefault(require("untildify"));
+function resolveRequest(spec) {
+    if (spec.startsWith('~')) {
+        spec = (0, untildify_1.default)(spec);
+    }
+    else if (spec.startsWith('/')) {
+        // skip
+    }
+    else if (spec.includes('/')) {
+        const [scope, name] = spec.split('/');
+        if (name.startsWith('artifact-')) {
+            // skip
+        }
+        else {
+            spec = `${scope}/artifact-${name}`;
+        }
+    }
+    else {
+        if (spec.startsWith('artifact-')) {
+            // skip
+        }
+        else {
+            spec = `artifact-${spec}`;
+        }
+    }
+    if (spec.includes(':')) {
+        const [name, variant] = spec.split(':');
+        if (variant.length === 0) {
+            throw new Error(`Missing variant in "${spec}"`);
+        }
+        return { name, variant };
+    }
+    else {
+        return { name: spec };
+    }
+} // }}}

package/lib/utils/template.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,6 +41,7 @@ const path_1 = __importDefault(require("path"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_1 = require("lodash");
 const YAML = __importStar(require("../parsers/yaml"));
 const try_json_1 = require("./try-json");
 dayjs_1.default.extend(utc_1.default);
@@ -58,7 +69,7 @@ class TemplateEngine {
             }
             const fileContent = this.readConfigFile(name);
             const value = this.getValueByPath(fileContent, propertyPath);
-            if (value === null || value === undefined) {
+            if ((0, lodash_1.isNil)(value)) {
                 throw new TemplateError(placeholder);
             }
             return String(value);
@@ -68,12 +79,12 @@ class TemplateEngine {
         const parts = propertyPath.split('.');
         let current = values;
         for (const part of parts) {
-            if (current === null || current === undefined || typeof current !== 'object') {
+            if (!(0, lodash_1.isPlainObject)(current)) {
                 throw new TemplateError(`Property path not found: ${propertyPath}`);
             }
             current = current[part];
         }
-        if (current === null || current === undefined) {
+        if ((0, lodash_1.isNil)(current)) {
             throw new TemplateError(`Property not found: ${propertyPath}`);
         }
         return current;

package/lib/utils/to-lines.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLines = void 0;
+exports.toLines = toLines;
 function toLines(value) {
     return value.split(/\r?\n/g);
 }
-exports.toLines = toLines;

package/lib/utils/trim-final-newline.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trimFinalNewLine = void 0;
+exports.trimFinalNewLine = trimFinalNewLine;
 const FINAL_NEWLINE_REGEX = /(\r?\n)*$/;
 function trimFinalNewLine(value) {
     return value.replace(FINAL_NEWLINE_REGEX, '');
 }
-exports.trimFinalNewLine = trimFinalNewLine;

package/lib/utils/try-json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryJson = void 0;
+exports.tryJson = tryJson;
 function tryJson(value) {
     try {
         return JSON.parse(value);
@@ -9,4 +9,3 @@ function tryJson(value) {
         return undefined;
     }
 }
-exports.tryJson = tryJson;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@zokugun/artifact",
 	"description": "Boilerplate your project & keep your configurations up to date",
-	"version": "0.3.1",
+	"version": "0.4.1",
 	"author": {
 		"name": "Baptiste Augrain",
 		"email": "daiyam@zokugun.org"
@@ -28,12 +28,12 @@
 		"release": "release-it",
 		"test": "tsc -p test && mocha",
 		"test:dev": "mocha",
-		"test:watch": "tsc-watch -p test --onSuccess 'mocha'",
-		"watch": "tsc-watch -p src",
+		"test:watch": "tsc-watch -p src -p test --onSuccess 'mocha'",
 		"watch:src": "tsc-watch -p src",
 		"watch:test": "tsc-watch -p test"
 	},
 	"dependencies": {
+		"@zokugun/configdotts-merge": "^0.2.0",
 		"ansi-colors": "^4.1.1",
 		"commander": "^9.0.0",
 		"dayjs": "^1.11.13",
@@ -50,6 +50,8 @@
 		"pacote": "^13.0.5",
 		"semver": "^7.3.5",
 		"tempy": "^1.0.1",
+		"typescript": "^5.9.2",
+		"untildify": "^4.0.0",
 		"yaml": "^1.10.2"
 	},
 	"devDependencies": {
@@ -70,6 +72,7 @@
 		"chai": "^4.3.4",
 		"chai-as-promised": "^7.1.1",
 		"commitizen": "^4.2.4",
+		"eslint": "8.11.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
 		"fixpack": "^4.0.0",
 		"husky": "^7.0.1",
@@ -80,7 +83,6 @@
 		"rewiremock": "^3.14.3",
 		"source-map-support": "^0.5.20",
 		"tsc-watch": "^4.5.0",
-		"typescript": "^4.2.4",
 		"universalify": "^2.0.0",
 		"xo": "^0.48.0"
 	},

package/lib/config/index.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeConfig = exports.readConfig = void 0;
-var read_config_1 = require("./read-config");
-Object.defineProperty(exports, "readConfig", { enumerable: true, get: function () { return read_config_1.readConfig; } });
-var write_config_1 = require("./write-config");
-Object.defineProperty(exports, "writeConfig", { enumerable: true, get: function () { return write_config_1.writeConfig; } });