polyci 0.0.21 → 0.0.23

package/dist/main.js

@@ -5,15 +5,22 @@ import pino from "pino";
 import pretty from "pino-pretty";
 const log = pino(pretty());
 const DEFAULT_TAG_TEMPLATE = "{module}-v{version}";
-const DEFAULT_BRANCH_TAG_TEMPLATE = "{module}-v{version}-{branch}-{increment}";
-const ALLOWED_TAG_PLACEHOLDERS = new Set(["module", "branch", "version", "increment"]);
-function applyTagTemplate(template, moduleName) {
+const DEFAULT_VERSION_TEMPLATE = "{version}";
+const DEFAULT_BRANCH_VERSION_TEMPLATE = "{version}-{branch}-{increment}";
+const DEFAULT_TAG_PATTERN = "^$MODULE_NAME-v(?<version>\\d+(\\.\\d+)*)-$CI_COMMIT_BRANCH-(?<increment>\\d+(\\.\\d+)*)$";
+const ALLOWED_TAG_PLACEHOLDERS = new Set(["module", "version"]);
+const ALLOWED_VERSION_PLACEHOLDERS = new Set(["branch", "version", "increment"]);
+function applyVersionTemplate(template) {
     return template
-        .replaceAll("{module}", moduleName)
         .replaceAll("{branch}", "${CI_COMMIT_BRANCH}")
         .replaceAll("{version}", "${NEXT_VERSION}")
         .replaceAll("{increment}", "${NEXT_INCREMENT}");
 }
+function applyTagTemplate(template, moduleName, version) {
+    return template
+        .replaceAll("{module}", moduleName)
+        .replaceAll("{version}", version);
+}
 function getInvalidTagTemplatePlaceholders(template) {
     const matches = template.matchAll(/\{([^}]+)\}/g);
     const invalid = new Set();
@@ -25,6 +32,17 @@ function getInvalidTagTemplatePlaceholders(template) {
     }
     return [...invalid];
 }
+function getInvalidVersionTemplatePlaceholders(template) {
+    const matches = template.matchAll(/\{([^}]+)\}/g);
+    const invalid = new Set();
+    for (const match of matches) {
+        const placeholder = match[1];
+        if (!ALLOWED_VERSION_PLACEHOLDERS.has(placeholder)) {
+            invalid.add(placeholder);
+        }
+    }
+    return [...invalid];
+}
 function parseArgs() {
     const program = new Command();
     program
@@ -32,8 +50,10 @@ function parseArgs() {
         .option("-o, --output <path>", "Output pipeline file path")
         .option("--modules-root <path>", "Modules root directory", "./modules")
         .option("--main-branch <name>", "Primary branch name for release tagging logic", "main")
-        .option("--tag-template <template>", "Template for non-primary branch tags; use placeholders {module}, {branch}, {version}, {increment}", DEFAULT_TAG_TEMPLATE)
-        .option("--branch-tag-template <template>", "Template for non-primary branch tags; use placeholders {module}, {branch}, {version}, {increment}", DEFAULT_BRANCH_TAG_TEMPLATE)
+        .option("--version-template <template>", "Template for primary branch module version; placeholders {version}, {branch}, {increment}", DEFAULT_VERSION_TEMPLATE)
+        .option("--branch-version-template <template>", "Template for non-primary branch module version; placeholders {version}, {branch}, {increment}", DEFAULT_BRANCH_VERSION_TEMPLATE)
+        .option("--tag-template <template>", "Template for non-primary branch tags; use placeholders {module}, {version}", DEFAULT_TAG_TEMPLATE)
+        .option("--tag-pattern <pattern>", "Tag pattern passed to semalease to find the latest tag and calculate the next version/increment", DEFAULT_TAG_PATTERN)
         .option("--cwd <path>", "Working directory", process.cwd())
         .parse();
     const options = program.opts();
@@ -41,17 +61,25 @@ function parseArgs() {
     const cwd = path.resolve(options.cwd);
     const modulesRoot = path.resolve(cwd, options.modulesRoot);
     const mainBranch = options.mainBranch;
+    const versionTemplate = options.versionTemplate;
+    const branchVersionTemplate = options.branchVersionTemplate;
     const tagTemplate = options.tagTemplate;
-    const branchTagTemplate = options.branchTagTemplate;
-    const invalidPrimary = getInvalidTagTemplatePlaceholders(tagTemplate);
-    if (invalidPrimary.length > 0) {
-        program.error(`Invalid --tag-template placeholders: ${invalidPrimary
+    const tagPattern = options.tagPattern;
+    const invalidVersionTemplate = getInvalidVersionTemplatePlaceholders(versionTemplate);
+    if (invalidVersionTemplate.length > 0) {
+        program.error(`Invalid --version-template placeholders: ${invalidVersionTemplate
             .map((x) => `{${x}}`)
-            .join(", ")}. Allowed: {module}, {branch}, {version}, {increment}.`);
+            .join(", ")}. Allowed: {version}, {branch}, {increment}.`);
     }
-    const invalidSecondary = getInvalidTagTemplatePlaceholders(branchTagTemplate);
-    if (invalidSecondary.length > 0) {
-        program.error(`Invalid --branch-tag-template placeholders: ${invalidSecondary
+    const invalidBranchVersionTemplate = getInvalidVersionTemplatePlaceholders(branchVersionTemplate);
+    if (invalidBranchVersionTemplate.length > 0) {
+        program.error(`Invalid --branch-version-template placeholders: ${invalidBranchVersionTemplate
+            .map((x) => `{${x}}`)
+            .join(", ")}. Allowed: {version}, {branch}, {increment}.`);
+    }
+    const invalidTagTemplate = getInvalidTagTemplatePlaceholders(tagTemplate);
+    if (invalidTagTemplate.length > 0) {
+        program.error(`Invalid --tag-template placeholders: ${invalidTagTemplate
             .map((x) => `{${x}}`)
             .join(", ")}. Allowed: {module}, {branch}, {version}, {increment}.`);
     }
@@ -60,20 +88,15 @@ function parseArgs() {
         output,
         modulesRoot,
         mainBranch,
+        versionTemplate,
+        branchVersionTemplate,
         tagTemplate,
-        branchTagTemplate,
+        tagPattern,
     };
 }
 function toPosixPath(p) {
     return p.split(path.sep).join("/");
 }
-function toJobId(value) {
-    return value
-        .replace(/[^a-zA-Z0-9_]/g, "_")
-        .replace(/_+/g, "_")
-        .replace(/^_+|_+$/g, "")
-        .toLowerCase();
-}
 function detectModuleType(directory) {
     const baseName = path.basename(directory);
     if (baseName === "node_modules" || baseName === ".git" || baseName === "dist") {
@@ -112,7 +135,6 @@ function discoverModulesRecursively(repoRoot, modulesRoot, scanDir, modules) {
             moduleName,
             modulePath: relativeModulePath,
             moduleType,
-            jobId: toJobId(relativeModulePath),
         });
         return;
     }
@@ -152,7 +174,7 @@ function appendGlobalVariables(lines) {
     lines.push(``);
 }
 function appendModuleBuildJob(lines, module) {
-    lines.push(`${module.jobId}_build:`);
+    lines.push(`${module.moduleName}-build:`);
     lines.push(`  stage: build`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
@@ -173,13 +195,13 @@ function appendModuleBuildJob(lines, module) {
     lines.push(``);
 }
 function appendModuleTestJob(lines, module) {
-    lines.push(`${module.jobId}_test:`);
+    lines.push(`${module.moduleName}-test:`);
     lines.push(`  stage: test`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_build`);
+    lines.push(`    - job: ${module.moduleName}-build`);
     lines.push(`  image: $IMAGE_LINUX`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -190,15 +212,15 @@ function appendModuleTestJob(lines, module) {
     lines.push(`    - echo "test is tasty"`);
     lines.push(``);
 }
-function appendModuleReleaseJob(lines, module) {
-    lines.push(`${module.jobId}_release:`);
+function appendModuleReleaseJob(lines, module, tagPattern) {
+    lines.push(`${module.moduleName}-release:`);
     lines.push(`  stage: release`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_build`);
-    lines.push(`    - job: ${module.jobId}_test`);
+    lines.push(`    - job: ${module.moduleName}-build`);
+    lines.push(`    - job: ${module.moduleName}-test`);
     lines.push(`  image: $IMAGE_NODE`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -207,46 +229,21 @@ function appendModuleReleaseJob(lines, module) {
     lines.push(`  script:`);
     lines.push(`    - apk update`);
     lines.push(`    - apk add $GIT_PACKAGE`);
-    lines.push(`    - cp -r ci $MODULE_PATH/ci`);
-    lines.push(`    - cd $MODULE_PATH`);
-    lines.push(`    - npm ci`);
-    lines.push(`    - git tag -l "^${module.moduleName}-v(?<version>\\d+(\\.\\d+)*)-$CI_COMMIT_BRANCH-(?<increment>\\d+(\\.\\d+)*)$"`);
-    lines.push(`    - npx semalease --tag-pattern "^${module.moduleName}-v(?<version>\\d+(\\.\\d+)*)-$CI_COMMIT_BRANCH-(?<increment>\\d+(\\.\\d+)*)$" semalease.env`);
-    lines.push(`    - source semalease.env`);
-    lines.push(`    - |`);
-    lines.push(`      if [ "$CI_COMMIT_BRANCH" = "main" ]; then`);
-    lines.push(`        PACKAGE_VERSION="$NEXT_VERSION"`);
-    lines.push(`      else`);
-    lines.push(`        PACKAGE_VERSION="$NEXT_VERSION-$CI_COMMIT_BRANCH-$NEXT_INCREMENT"`);
-    lines.push(`      fi`);
-    lines.push(`    - |`);
-    lines.push(`      if [ "$MODULE_TYPE" = "node-express" ]; then`);
-    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.argv[1]; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');" "$PACKAGE_VERSION"`);
-    lines.push(`        node ci/prepare-deploy-variables.js --instance-branch $CI_COMMIT_BRANCH`);
-    lines.push(`      elif [ "$MODULE_TYPE" = "node-vite" ]; then`);
-    lines.push(`        node ci/set-release-data.js -i $CI_COMMIT_BRANCH --version=$PACKAGE_VERSION -t`);
-    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.argv[1]; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');" "$PACKAGE_VERSION"`);
-    lines.push(`        node ci/prepare-deploy-variables.js --instance-branch $CI_COMMIT_BRANCH`);
-    lines.push(`      else`);
-    lines.push(`        echo "Invalid module type: $MODULE_TYPE"`);
-    lines.push(`        exit 1`);
-    lines.push(`      fi`);
+    lines.push(`    - cd ${module.modulePath}`);
+    lines.push(`    - npx semalease --tag-pattern "${tagPattern}" semalease.env`);
     lines.push(`  artifacts:`);
     lines.push(`    paths:`);
     lines.push(`      - $MODULE_PATH/dist`);
-    lines.push(`      - $MODULE_PATH/package.json`);
-    lines.push(`      - $MODULE_PATH/public/release.json`);
     lines.push(`      - $MODULE_PATH/semalease.env`);
-    lines.push(`      - $MODULE_PATH/deploy.env`);
     lines.push(`    expire_in: 1 day`);
     lines.push(``);
 }
-function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchTagTemplate) {
-    lines.push(`release_and_tag:`);
+function appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate) {
+    lines.push(`release:`);
     lines.push(`  stage: release`);
     lines.push(`  needs:`);
     for (const module of modules) {
-        lines.push(`    - job: ${module.jobId}_release`);
+        lines.push(`    - job: ${module.moduleName}-release`);
         lines.push(`      optional: true`);
     }
     lines.push(`  image: $IMAGE_NODE`);
@@ -262,35 +259,34 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchT
     lines.push(`    - TAG_NAMES=""`);
     lines.push(``);
     for (const module of modules) {
-        lines.push(`    - echo "Tagging release for ${module.moduleName} (${module.modulePath})"`);
         lines.push(`    - |`);
         lines.push(`      if [ -f "${module.modulePath}/semalease.env" ]; then`);
         lines.push(`        . "${module.modulePath}/semalease.env"`);
-        lines.push(`        TAG_NAME=""`);
+        lines.push(`        MODULE_TAG=""`);
         lines.push(`        if [ "$CI_COMMIT_BRANCH" = "${mainBranch}" ]; then`);
         lines.push(`          if [ "\${NEXT_VERSION:-}" != "\${LATEST_VERSION:-}" ]; then`);
-        lines.push(`            TAG_NAME="${applyTagTemplate(tagTemplate, module.moduleName)}"`);
+        lines.push(`            MODULE_VERSION="${applyVersionTemplate(versionTemplate)}"`);
+        lines.push(`            MODULE_TAG="${applyTagTemplate(tagTemplate, module.moduleName, applyVersionTemplate(versionTemplate))}"`);
         lines.push(`          else`);
-        lines.push(`            echo "Version did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping tag"`);
+        lines.push(`            echo "Version did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping release."`);
         lines.push(`          fi`);
         lines.push(`        else`);
         lines.push(`          if [ "\${NEXT_VERSION:-}" != "\${LATEST_VERSION:-}" ] || [ "\${NEXT_INCREMENT:-}" != "\${LATEST_INCREMENT:-}" ]; then`);
-        lines.push(`            TAG_NAME="${applyTagTemplate(branchTagTemplate, module.moduleName)}"`);
+        lines.push(`            MODULE_VERSION="${applyVersionTemplate(branchVersionTemplate)}"`);
+        lines.push(`            MODULE_TAG="${applyTagTemplate(tagTemplate, module.moduleName, applyVersionTemplate(branchVersionTemplate))}"`);
         lines.push(`          else`);
-        lines.push(`            echo "Version/increment did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping tag"`);
+        lines.push(`            echo "Version/increment did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping release."`);
         lines.push(`          fi`);
         lines.push(`        fi`);
-        lines.push(`        if [ "$TAG_NAME" != "" ]; then`);
-        if (module.moduleType === "node-express") {
-            lines.push(`          git add "${module.modulePath}/package.json"`);
-        }
-        else if (module.moduleType === "node-vite") {
-            lines.push(`          git add "${module.modulePath}/package.json" "${module.modulePath}/public/release.json"`);
-        }
-        lines.push(`          TAG_NAMES="\${TAG_NAMES} \${TAG_NAME}"`);
+        lines.push(`        if [ "$MODULE_TAG" != "" ]; then`);
+        lines.push(`          cp -r ci "${module.modulePath}/ci"`);
+        lines.push(`          cd "${module.modulePath}"`);
+        lines.push(`          source "ci/${module.moduleType}/release.sh"`);
+        lines.push(`          cd -`);
+        lines.push(`          TAG_NAMES="\${TAG_NAMES} \${MODULE_TAG}"`);
         lines.push(`        fi`);
         lines.push(`      else`);
-        lines.push(`        echo "Missing ${module.modulePath}/semalease.env, skipping ${module.moduleName}"`);
+        lines.push(`        echo "Missing ${module.modulePath}/semalease.env, skipping ${module.moduleName} release."`);
         lines.push(`      fi`);
     }
     lines.push(``);
@@ -315,14 +311,14 @@ function appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchT
     lines.push(``);
 }
 function appendModulePublishJob(lines, module) {
-    lines.push(`${module.jobId}_publish:`);
+    lines.push(`${module.moduleName}-publish:`);
     lines.push(`  stage: publish`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_test`);
-    lines.push(`    - job: release_and_tag`);
+    lines.push(`    - job: ${module.moduleName}-test`);
+    lines.push(`    - job: release`);
     lines.push(`  image: $IMAGE_DOCKER`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -342,13 +338,13 @@ function appendModulePublishJob(lines, module) {
     lines.push(``);
 }
 function appendModuleDeployJob(lines, module) {
-    lines.push(`${module.jobId}_deploy:`);
+    lines.push(`${module.moduleName}-deploy:`);
     lines.push(`  stage: deploy`);
     lines.push(`  rules:`);
     lines.push(`    - changes:`);
     lines.push(`      - ${module.modulePath}/**/*`);
     lines.push(`  needs:`);
-    lines.push(`    - job: ${module.jobId}_publish`);
+    lines.push(`    - job: ${module.moduleName}-publish`);
     lines.push(`  image: $IMAGE_COMPOSE`);
     lines.push(`  variables:`);
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -376,15 +372,15 @@ function appendModuleDeployJob(lines, module) {
     lines.push(`    - rm -rf ~/.ssh`);
     lines.push(``);
 }
-function buildPipeline(modules, mainBranch, tagTemplate, branchTagTemplate) {
+function buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern) {
     const lines = [];
     appendGlobalVariables(lines);
     for (const module of modules) {
         appendModuleBuildJob(lines, module);
         appendModuleTestJob(lines, module);
-        appendModuleReleaseJob(lines, module);
+        appendModuleReleaseJob(lines, module, tagPattern);
     }
-    appendGlobalReleaseJob(lines, modules, mainBranch, tagTemplate, branchTagTemplate);
+    appendGlobalReleaseJob(lines, modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate);
     for (const module of modules) {
         appendModulePublishJob(lines, module);
         appendModuleDeployJob(lines, module);
@@ -392,7 +388,7 @@ function buildPipeline(modules, mainBranch, tagTemplate, branchTagTemplate) {
     return `${lines.join("\n").trimEnd()}\n`;
 }
 function main() {
-    const { cwd, output, modulesRoot, mainBranch, tagTemplate, branchTagTemplate, } = parseArgs();
+    const { cwd, output, modulesRoot, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern } = parseArgs();
     if (!output) {
         log.error("Output path is required. Use [output] or --output <path>.");
         process.exit(1);
@@ -402,7 +398,7 @@ function main() {
         log.error({ cwd, modulesRoot }, "No supported modules were discovered under modules root");
         process.exit(1);
     }
-    const pipeline = buildPipeline(modules, mainBranch, tagTemplate, branchTagTemplate);
+    const pipeline = buildPipeline(modules, mainBranch, versionTemplate, branchVersionTemplate, tagTemplate, tagPattern);
     const outputPath = path.resolve(cwd, output);
     fs.writeFileSync(outputPath, pipeline, "utf8");
     log.info({ modules: modules.map((m) => m.modulePath), outputPath }, "Generated GitLab pipeline");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "polyci",
   "description": "Monorepo CI/CD utilities.",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "type": "module",
   "private": false,
   "author": "Alexander Tsarev",