polyci 0.0.1 → 0.0.3

package/dist/main.js

@@ -1,29 +1,25 @@
 import { Command } from "commander";
-import { execSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import pino from "pino";
 import pretty from "pino-pretty";
 const log = pino(pretty());
-function exec(command, cwd) {
-    return execSync(command, {
-        encoding: "utf8",
-        cwd: cwd ?? process.cwd(),
-    }).trim();
-}
-const BRANCH_RULE = "/^(main)|(develop)|(release(-[a-z0-9]+)*)|(feature(-[a-z0-9]+)*)|(patch(-[a-z0-9]+)*)$/";
-const IGNORED_DIRS = new Set(["node_modules", ".git", "dist"]);
+const DEFAULT_BRANCH_RULE = "/^(main)|(develop)|(release(-[a-z0-9]+)*)|(feature(-[a-z0-9]+)*)|(patch(-[a-z0-9]+)*)$/";
 function parseArgs() {
     const program = new Command();
     program
         .argument("[output]", "Output pipeline file path (or use --output)")
         .option("-o, --output <path>", "Output pipeline file path")
+        .option("--modules-root <path>", "Modules root directory", "./modules")
+        .option("--branch-rule <regex>", "Branch rule regex for module jobs", DEFAULT_BRANCH_RULE)
         .option("--cwd <path>", "Working directory", process.cwd())
         .parse();
     const options = program.opts();
     const output = options.output ?? program.args[0] ?? "";
     const cwd = path.resolve(options.cwd);
-    return { cwd, output };
+    const modulesRoot = path.resolve(cwd, options.modulesRoot);
+    const branchRule = options.branchRule;
+    return { cwd, output, modulesRoot, branchRule };
 }
 function toPosixPath(p) {
     return p.split(path.sep).join("/");
@@ -36,6 +32,10 @@ function toJobId(value) {
         .toLowerCase();
 }
 function detectModuleType(directory) {
+    const baseName = path.basename(directory);
+    if (baseName === "node_modules" || baseName === ".git" || baseName === "dist") {
+        return "ignored";
+    }
     const packageJson = path.join(directory, "package.json");
     const viteConfig = path.join(directory, "vite.config.ts");
     if (fs.existsSync(packageJson) && fs.existsSync(viteConfig)) {
@@ -56,11 +56,15 @@ function detectModuleType(directory) {
     }
     return null;
 }
-function discoverModulesRecursively(scanDir, repoRoot, modules) {
+function discoverModulesRecursively(repoRoot, modulesRoot, scanDir, modules) {
     const moduleType = detectModuleType(scanDir);
     if (moduleType !== null) {
+        if (moduleType === "ignored") {
+            return;
+        }
         const relativeModulePath = toPosixPath(path.relative(repoRoot, scanDir));
-        const moduleName = path.basename(scanDir);
+        const relativeNamePath = toPosixPath(path.relative(modulesRoot, scanDir));
+        const moduleName = relativeNamePath.split("/").join("-");
         modules.push({
             moduleName,
             modulePath: relativeModulePath,
@@ -73,30 +77,27 @@ function discoverModulesRecursively(scanDir, repoRoot, modules) {
     for (const entry of entries) {
         if (!entry.isDirectory())
             continue;
-        if (IGNORED_DIRS.has(entry.name))
-            continue;
-        discoverModulesRecursively(path.join(scanDir, entry.name), repoRoot, modules);
+        discoverModulesRecursively(repoRoot, modulesRoot, path.join(scanDir, entry.name), modules);
     }
 }
-function discoverModules(repoRoot) {
-    const modulesRoot = path.join(repoRoot, "modules");
+function discoverModules(repoRoot, modulesRoot) {
     if (!fs.existsSync(modulesRoot) || !fs.statSync(modulesRoot).isDirectory()) {
         return [];
     }
     const modules = [];
-    discoverModulesRecursively(modulesRoot, repoRoot, modules);
-    modules.sort((a, b) => a.modulePath.localeCompare(b.modulePath));
+    discoverModulesRecursively(repoRoot, modulesRoot, modulesRoot, modules);
+    modules.sort((a, b) => a.modulePath.localeCompare(b.modulePath)); //TODO: Sort by dependency order or earliest modified module first
     return modules;
 }
 function appendGlobalVariables(lines) {
     lines.push("variables:");
-    lines.push("  IMAGE_LINUX: alpine:latest #alpine:3.23.3");
-    lines.push("  IMAGE_NODE: node:alpine #node:25.6.0-alpine3.23");
+    lines.push("  IMAGE_LINUX: alpine:latest");
+    lines.push("  IMAGE_NODE: node:alpine");
     lines.push("  IMAGE_GIT: alpine/git:latest");
-    lines.push("  IMAGE_NGINX: nginx:alpine-slim #nginx:1.29.5-alpine3.23-slim");
-    lines.push("  IMAGE_DOCKER: docker:latest #docker:29.2.1-dind-alpine3.23");
+    lines.push("  IMAGE_NGINX: nginx:alpine-slim");
+    lines.push("  IMAGE_DOCKER: docker:latest");
     lines.push("  IMAGE_COMPOSE: docker:cli");
-    lines.push("  GIT_PACKAGE: git #git=2.47.2-r0");
+    lines.push("  GIT_PACKAGE: git");
     lines.push("");
     lines.push("stages:");
     lines.push("  - build");
@@ -106,18 +107,12 @@ function appendGlobalVariables(lines) {
     lines.push("  - deploy");
     lines.push("");
 }
-function appendRulesForModule(lines, modulePath) {
-    lines.push("  rules:");
-    lines.push("    - if: $CI_COMMIT_MESSAGE =~ /^release:/");
-    lines.push("      when: never");
-    lines.push(`    - if: $CI_COMMIT_BRANCH =~ ${BRANCH_RULE}`);
-    lines.push("      changes:");
-    lines.push(`        - ${modulePath}/**/*`);
-}
-function appendModuleBuildJob(lines, module) {
+function appendModuleBuildJob(lines, module, branchRule) {
     lines.push(`${module.jobId}_build:`);
     lines.push("  stage: build");
-    appendRulesForModule(lines, module.modulePath);
+    lines.push("  rules:");
+    lines.push("      changes:");
+    lines.push(`        - ${module.modulePath}/**/*`);
     lines.push("  image: $IMAGE_NODE");
     lines.push("  variables:");
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -133,13 +128,14 @@ function appendModuleBuildJob(lines, module) {
     lines.push("    expire_in: 1 day");
     lines.push("");
 }
-function appendModuleTestJob(lines, module) {
+function appendModuleTestJob(lines, module, branchRule) {
     lines.push(`${module.jobId}_test:`);
     lines.push("  stage: test");
-    appendRulesForModule(lines, module.modulePath);
+    lines.push("  rules:");
+    lines.push("      changes:");
+    lines.push(`        - ${module.modulePath}/**/*`);
     lines.push("  needs:");
     lines.push(`    - job: ${module.jobId}_build`);
-    lines.push("      optional: true");
     lines.push("  image: $IMAGE_LINUX");
     lines.push("  variables:");
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -150,9 +146,63 @@ function appendModuleTestJob(lines, module) {
     lines.push('    - echo "test is tasty"');
     lines.push("");
 }
+function appendModuleReleaseJob(lines, module, branchRule) {
+    lines.push(`${module.jobId}_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("  image: $IMAGE_NODE");
+    lines.push("  variables:");
+    lines.push(`    MODULE_NAME: ${module.moduleName}`);
+    lines.push(`    MODULE_PATH: ${module.modulePath}`);
+    lines.push(`    MODULE_TYPE: ${module.moduleType}`);
+    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("    - npx semalease 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(`      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.env.PACKAGE_VERSION; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');"`);
+    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=$NEXT_VERSION -t`);
+    lines.push(`        node -e "const fs=require('fs'); const pkg=JSON.parse(fs.readFileSync('package.json','utf8')); pkg.version=process.env.PACKAGE_VERSION; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\\n');"`);
+    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(`  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) {
     lines.push("release_and_tag:");
     lines.push("  stage: release");
+    lines.push("  needs:");
+    for (const module of modules) {
+        lines.push(`    - job: ${module.jobId}_release`);
+        lines.push(`      optional: true`);
+    }
     lines.push("  image: $IMAGE_NODE");
     lines.push("  variables:");
     lines.push("    GITLAB_TOKEN: $SEMANTIC_RELEASE_TOKEN # Used to push release commits/tags.");
@@ -161,111 +211,87 @@ function appendGlobalReleaseJob(lines, modules) {
     lines.push("    - apk add $GIT_PACKAGE");
     lines.push("    - |");
     lines.push("      set -euo pipefail");
-    lines.push("      git config user.email \"ci-release@local\"");
-    lines.push("      git config user.name \"CI Release\"");
+    lines.push("      git config user.email \"polyci@anarun.net\"");
+    lines.push("      git config user.name \"polyci\"");
     lines.push("      git remote set-url origin \"https://oauth2:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git\"");
     lines.push("");
-    lines.push("      if [ -n \"${CI_COMMIT_BEFORE_SHA:-}\" ] && [ \"${CI_COMMIT_BEFORE_SHA}\" != \"0000000000000000000000000000000000000000\" ]; then");
-    lines.push("        CHANGED_FILES=$(git diff --name-only \"${CI_COMMIT_BEFORE_SHA}\" \"${CI_COMMIT_SHA}\")");
-    lines.push("      else");
-    lines.push("        CHANGED_FILES=$(git show --pretty='' --name-only \"${CI_COMMIT_SHA}\")");
-    lines.push("      fi");
-    lines.push("");
-    lines.push("      MODULE_MATRIX=$(cat <<'EOF'");
-    for (const module of modules) {
-        lines.push(`      ${module.moduleName}|${module.modulePath}`);
-    }
-    lines.push("      EOF");
-    lines.push("      )");
-    lines.push("");
-    lines.push("      AFFECTED_MODULES=\"\"");
-    lines.push("      while IFS='|' read -r MODULE_NAME MODULE_PATH; do");
-    lines.push("        [ -n \"${MODULE_NAME}\" ] || continue");
-    lines.push("        if printf '%s\\n' \"${CHANGED_FILES}\" | grep -q \"^${MODULE_PATH}/\"; then");
-    lines.push("          AFFECTED_MODULES=\"${AFFECTED_MODULES} ${MODULE_NAME}|${MODULE_PATH}\"");
-    lines.push("        fi");
-    lines.push("      done <<'EOF'");
     for (const module of modules) {
-        lines.push(`      ${module.moduleName}|${module.modulePath}`);
+        lines.push(`        echo "Tagging release for ${module.moduleName} (${module.modulePath})"`);
+        lines.push(`        if [ ! -f "${module.modulePath}/semalease.env" ]; then`);
+        lines.push(`          echo "Missing ${module.modulePath}/semalease.env, skipping ${module.moduleName}"`);
+        lines.push("          continue");
+        lines.push("        fi");
+        lines.push(`        source "${module.modulePath}/semalease.env"`);
+        lines.push("        if [ \"$CI_COMMIT_BRANCH\" = \"main\" ]; then");
+        lines.push("          if [ \"${NEXT_VERSION:-}\" = \"${LATEST_VERSION:-}\" ]; then");
+        lines.push(`            echo "Version did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping tag"`);
+        lines.push("            continue");
+        lines.push("          fi");
+        lines.push(`          TAG_NAME="${module.moduleName}-v\${NEXT_VERSION}"`);
+        lines.push("        else");
+        lines.push("          if [ \"${NEXT_VERSION:-}\" = \"${LATEST_VERSION:-}\" ] && [ \"${NEXT_INCREMENT:-}\" = \"${LATEST_INCREMENT:-}\" ]; then");
+        lines.push(`            echo "Version/increment did not change for ${module.moduleName} on branch $CI_COMMIT_BRANCH, skipping tag"`);
+        lines.push("            continue");
+        lines.push("          fi");
+        lines.push(`          TAG_NAME="${module.moduleName}-v\${NEXT_VERSION}-\${CI_COMMIT_BRANCH}-\${NEXT_INCREMENT}"`);
+        lines.push("        fi");
+        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("        git tag \"${TAG_NAME}\"");
     }
-    lines.push("      EOF");
-    lines.push("");
-    lines.push("      if [ -z \"${AFFECTED_MODULES}\" ]; then");
-    lines.push("        echo \"No affected modules in current commit range\" ");
-    lines.push("        exit 0");
-    lines.push("      fi");
-    lines.push("");
-    lines.push("      for entry in ${AFFECTED_MODULES}; do");
-    lines.push("        MODULE_NAME=${entry%%|*}");
-    lines.push("        MODULE_PATH=${entry#*|}");
-    lines.push("        echo \"Tagging release for ${MODULE_NAME} (${MODULE_PATH})\"");
-    lines.push("        cd \"${MODULE_PATH}\"");
-    lines.push("        npm ci");
-    lines.push("        npx semalease semalease.env");
-    lines.push("        source semalease.env");
-    lines.push("        cd - >/dev/null");
-    lines.push("");
-    lines.push("        if [ -z \"${NEXT_VERSION:-}\" ]; then");
-    lines.push("          echo \"No NEXT_VERSION for ${MODULE_NAME}, skipping tag\"");
-    lines.push("          continue");
-    lines.push("        fi");
-    lines.push("");
-    lines.push("        TAG_NAME=\"${MODULE_NAME}/v${NEXT_VERSION}\"");
-    lines.push("        if git rev-parse \"${TAG_NAME}\" >/dev/null 2>&1; then");
-    lines.push("          echo \"Tag ${TAG_NAME} already exists, skipping\"");
-    lines.push("          continue");
-    lines.push("        fi");
-    lines.push("        git tag \"${TAG_NAME}\"");
-    lines.push("      done");
-    lines.push("");
-    lines.push("      if [ -n \"$(git status --porcelain)\" ]; then");
-    lines.push("        git add -A");
-    lines.push("        git commit -m \"release: update affected modules\"");
-    lines.push("      fi");
     lines.push("");
+    lines.push("      git commit -m \"release: update affected modules\"");
     lines.push("      git push origin HEAD");
     lines.push("      git push origin --tags");
+    lines.push(`  artifacts:`);
+    lines.push(`    paths:`);
+    for (const module of modules) {
+        lines.push(`      - ${module.modulePath}/dist`);
+        lines.push(`      - ${module.modulePath}/deploy.env`);
+    }
+    lines.push(`    expire_in: 1 day`);
     lines.push("");
 }
-function appendModulePublishJob(lines, module) {
+function appendModulePublishJob(lines, module, branchRule) {
     lines.push(`${module.jobId}_publish:`);
     lines.push("  stage: publish");
-    appendRulesForModule(lines, module.modulePath);
+    lines.push("  rules:");
+    lines.push("      changes:");
+    lines.push(`        - ${module.modulePath}/**/*`);
     lines.push("  needs:");
     lines.push(`    - job: ${module.jobId}_test`);
-    lines.push("      optional: true");
     lines.push("    - job: release_and_tag");
-    lines.push("      optional: true");
     lines.push("  image: $IMAGE_DOCKER");
     lines.push("  variables:");
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
     lines.push(`    MODULE_PATH: ${module.modulePath}`);
     lines.push(`    MODULE_TYPE: ${module.moduleType}`);
     lines.push("  script:");
+    lines.push("    - cp -r ci $MODULE_PATH/ci");
     lines.push("    - cd $MODULE_PATH");
+    lines.push("    - source deploy.env");
     lines.push("    - npm ci");
-    lines.push("    - npx semalease semalease.env");
-    lines.push("    - source semalease.env");
-    lines.push("    - node ../ci/set-release-data.js -i $CI_COMMIT_BRANCH --version=${NEXT_VERSION} -t");
-    lines.push("    - npm run build");
-    lines.push("    - node ci/prepare-deploy-variables.js");
-    lines.push("    - echo -n $CI_JOB_TOKEN | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY");
-    lines.push("    - cp ../ci/$MODULE_TYPE/Dockerfile .");
+    lines.push("    - cp ci/$MODULE_TYPE/Dockerfile .");
     lines.push("    - docker build --tag $CI_REGISTRY_IMAGE/$MODULE_NAME:v$INSTANCE_VERSION .");
     lines.push("    - docker push $CI_REGISTRY_IMAGE/$MODULE_NAME:v$INSTANCE_VERSION");
     lines.push("  artifacts:");
     lines.push("    reports:");
-    lines.push("      dotenv: $MODULE_PATH/.env.deploy");
+    lines.push("      dotenv: $MODULE_PATH/deploy.env");
     lines.push("    expire_in: 1 day");
     lines.push("");
 }
-function appendModuleDeployJob(lines, module) {
+function appendModuleDeployJob(lines, module, branchRule) {
     lines.push(`${module.jobId}_deploy:`);
     lines.push("  stage: deploy");
-    appendRulesForModule(lines, module.modulePath);
+    lines.push("  rules:");
+    lines.push("      changes:");
+    lines.push(`        - ${module.modulePath}/**/*`);
     lines.push("  needs:");
     lines.push(`    - job: ${module.jobId}_publish`);
-    lines.push("      optional: true");
     lines.push("  image: $IMAGE_COMPOSE");
     lines.push("  variables:");
     lines.push(`    MODULE_NAME: ${module.moduleName}`);
@@ -289,34 +315,34 @@ function appendModuleDeployJob(lines, module) {
     lines.push("    - rm -rf ~/.ssh");
     lines.push("");
 }
-function buildPipeline(modules) {
+function buildPipeline(modules, branchRule) {
     const lines = [];
     appendGlobalVariables(lines);
     for (const module of modules) {
-        appendModuleBuildJob(lines, module);
-        appendModuleTestJob(lines, module);
+        appendModuleBuildJob(lines, module, branchRule);
+        appendModuleTestJob(lines, module, branchRule);
+        appendModuleReleaseJob(lines, module, branchRule);
     }
     appendGlobalReleaseJob(lines, modules);
     for (const module of modules) {
-        appendModulePublishJob(lines, module);
-        appendModuleDeployJob(lines, module);
+        appendModulePublishJob(lines, module, branchRule);
+        appendModuleDeployJob(lines, module, branchRule);
     }
     return `${lines.join("\n").trimEnd()}\n`;
 }
 function main() {
-    const { cwd, output } = parseArgs();
+    const { cwd, output, modulesRoot, branchRule } = parseArgs();
     if (!output) {
         log.error("Output path is required. Use [output] or --output <path>.");
         process.exit(1);
     }
-    const modules = discoverModules(cwd);
+    const modules = discoverModules(cwd, modulesRoot);
     if (modules.length === 0) {
-        log.error({ cwd }, "No supported modules were discovered under ./modules");
+        log.error({ cwd, modulesRoot }, "No supported modules were discovered under modules root");
         process.exit(1);
     }
-    const pipeline = buildPipeline(modules);
+    const pipeline = buildPipeline(modules, branchRule);
     const outputPath = path.resolve(cwd, output);
-    fs.mkdirSync(path.dirname(outputPath), { recursive: true });
     fs.writeFileSync(outputPath, pipeline, "utf8");
     log.info({ modules: modules.map((m) => m.modulePath), outputPath }, "Generated GitLab pipeline");
 }

package/package.json

@@ -1,14 +1,19 @@
 {
   "name": "polyci",
   "description": "Monorepo CI/CD utilities.",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "type": "module",
   "private": false,
   "author": "Alexander Tsarev",
   "license": "MIT",
   "main": "./dist/main.js",
-  "bin": "./dist/cli.js",
-  "files": ["dist", "readme.md"],
+  "bin": {
+    "polyci": "dist/cli.js"
+  },
+  "files": [
+    "dist",
+    "readme.md"
+  ],
   "publishConfig": {
     "access": "public"
   },