@nx/docker 0.0.0-pr-32892-1cb8488 → 0.0.0-pr-32947-7d6ca22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/docker",
   "description": "The Nx Plugin for Docker to aid in containerizing projects.",
-  "version": "0.0.0-pr-32892-1cb8488",
+  "version": "0.0.0-pr-32947-7d6ca22",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -47,12 +47,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-32892-1cb8488",
+    "@nx/devkit": "0.0.0-pr-32947-7d6ca22",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "0.0.0-pr-32892-1cb8488"
+    "nx": "0.0.0-pr-32947-7d6ca22"
   },
   "types": "./src/index.d.ts"
 }

package/src/plugins/plugin.d.ts

@@ -1,14 +1,7 @@
 import { type CreateNodesV2 } from '@nx/devkit';
-export interface DockerTargetOptions {
-    name: string;
-    args?: string[];
-    env?: Record<string, string>;
-    envFile?: string;
-    cwd?: string;
-}
 export interface DockerPluginOptions {
-    buildTarget?: string | DockerTargetOptions;
-    runTarget?: string | DockerTargetOptions;
+    buildTarget?: string;
+    runTarget?: string;
 }
 export declare const createNodesV2: CreateNodesV2<DockerPluginOptions>;
 //# sourceMappingURL=plugin.d.ts.map

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAOnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC1C;AAsBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAmC5D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAOnB,MAAM,YAAY,CAAC;AAQpB,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAsBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAmC5D,CAAC"}

package/src/plugins/plugin.js

@@ -8,8 +8,6 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
-const git_utils_1 = require("nx/src/utils/git-utils");
-const interpolate_pattern_1 = require("../utils/interpolate-pattern");
 function readTargetsCache(cachePath) {
     return (0, fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
 }
@@ -49,63 +47,26 @@ async function createNodesInternal(configFilePath, hash, normalizedOptions, cont
         },
     };
 }
-function interpolateDockerTargetOptions(options, projectRoot, imageRef, context) {
-    const commitSha = (0, git_utils_1.getLatestCommitSha)();
-    const projectName = getProjectName(projectRoot, context.workspaceRoot);
-    const tokens = {
-        projectRoot,
-        projectName,
-        imageRef,
-        currentDate: new Date(),
-        commitSha,
-        shortCommitSha: commitSha.slice(0, 7),
-    };
-    return (0, interpolate_pattern_1.interpolateObject)(options, tokens);
-}
-function getProjectName(projectRoot, workspaceRoot) {
-    const projectJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'project.json');
-    if ((0, fs_1.existsSync)(projectJsonPath)) {
-        const projectJson = (0, devkit_1.readJsonFile)(projectJsonPath);
-        if (projectJson.name) {
-            return projectJson.name;
-        }
-    }
-    const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
-    if ((0, fs_1.existsSync)(packageJsonPath)) {
-        const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
-        if (packageJson.name) {
-            return packageJson.name;
-        }
-    }
-    return projectRoot.replace(/^[\\/]/, '').replace(/[\\/\s]+/g, '-');
-}
 async function createDockerTargets(projectRoot, options, context) {
     const imageRef = projectRoot.replace(/^[\\/]/, '').replace(/[\\/\s]+/g, '-');
-    const interpolatedBuildTarget = interpolateDockerTargetOptions(options.buildTarget, projectRoot, imageRef, context);
-    const interpolatedRunTarget = interpolateDockerTargetOptions(options.runTarget, projectRoot, imageRef, context);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
     const metadata = {
         targetGroups: {
             ['Docker']: [
-                interpolatedBuildTarget.name,
-                interpolatedRunTarget.name,
+                `${options.buildTarget}`,
+                `${options.runTarget}`,
                 'nx-release-publish',
             ],
         },
     };
-    const buildOptions = {
-        cwd: interpolatedBuildTarget.cwd ?? projectRoot,
-        args: [`--tag ${imageRef}`, ...(interpolatedBuildTarget.args ?? [])],
-        ...(interpolatedBuildTarget.env && { env: interpolatedBuildTarget.env }),
-        ...(interpolatedBuildTarget.envFile && {
-            envFile: interpolatedBuildTarget.envFile,
-        }),
-    };
-    targets[interpolatedBuildTarget.name] = {
+    targets[options.buildTarget] = {
         dependsOn: ['build', '^build'],
         command: `docker build .`,
-        options: buildOptions,
+        options: {
+            cwd: projectRoot,
+            args: [`--tag ${imageRef}`],
+        },
         inputs: [
             ...('production' in namedInputs
                 ? ['production', '^production']
@@ -125,18 +86,12 @@ async function createDockerTargets(projectRoot, options, context) {
             },
         },
     };
-    const runOptions = {
-        cwd: interpolatedRunTarget.cwd ?? projectRoot,
-        ...(interpolatedRunTarget.args && { args: interpolatedRunTarget.args }),
-        ...(interpolatedRunTarget.env && { env: interpolatedRunTarget.env }),
-        ...(interpolatedRunTarget.envFile && {
-            envFile: interpolatedRunTarget.envFile,
-        }),
-    };
-    targets[interpolatedRunTarget.name] = {
-        dependsOn: [interpolatedBuildTarget.name],
+    targets[options.runTarget] = {
+        dependsOn: [options.buildTarget],
         command: `docker run {args} ${imageRef}`,
-        options: runOptions,
+        options: {
+            cwd: projectRoot,
+        },
         inputs: [
             ...('production' in namedInputs
                 ? ['production', '^production']
@@ -161,17 +116,8 @@ async function createDockerTargets(projectRoot, options, context) {
     return { targets, metadata };
 }
 function normalizePluginOptions(options) {
-    const normalizeTarget = (target, defaultName) => {
-        if (typeof target === 'string') {
-            return { name: target };
-        }
-        if (target && typeof target === 'object') {
-            return { ...target, name: target.name ?? defaultName };
-        }
-        return { name: defaultName };
-    };
     return {
-        buildTarget: normalizeTarget(options.buildTarget, 'docker:build'),
-        runTarget: normalizeTarget(options.runTarget, 'docker:run'),
+        buildTarget: options.buildTarget ?? 'docker:build',
+        runTarget: options.runTarget ?? 'docker:run',
     };
 }

package/src/release/version-pattern-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-pattern-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-pattern-utils.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,UAW7B"}
+{"version":3,"file":"version-pattern-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-pattern-utils.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,IAAI,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;CACxB;AAsBD,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,UAsC7B"}

package/src/release/version-pattern-utils.js

@@ -2,7 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interpolateVersionPattern = interpolateVersionPattern;
 const git_utils_1 = require("nx/src/utils/git-utils");
-const interpolate_pattern_1 = require("../utils/interpolate-pattern");
+const tokenRegex = /\{(env\.([^}]+)|([^|{}]+)(?:\|([^{}]+))?)\}/g;
+function formatDate(date, format) {
+    const year = String(date.getUTCFullYear());
+    const month = String(date.getUTCMonth() + 1).padStart(2, '0');
+    const day = String(date.getUTCDate()).padStart(2, '0');
+    const hours = String(date.getUTCHours()).padStart(2, '0');
+    const minutes = String(date.getUTCMinutes()).padStart(2, '0');
+    const seconds = String(date.getUTCSeconds()).padStart(2, '0');
+    return format
+        .replace(/YYYY/g, year)
+        .replace(/YY/g, year.slice(-2))
+        .replace(/MM/g, month)
+        .replace(/DD/g, day)
+        .replace(/HH/g, hours)
+        .replace(/mm/g, minutes)
+        .replace(/ss/g, seconds);
+}
 function interpolateVersionPattern(versionPattern, data) {
     const commitSha = (0, git_utils_1.getLatestCommitSha)();
     const substitutions = {
@@ -11,5 +27,26 @@ function interpolateVersionPattern(versionPattern, data) {
         commitSha: data.commitSha ?? commitSha,
         shortCommitSha: data.shortCommitSha ?? commitSha.slice(0, 7),
     };
-    return (0, interpolate_pattern_1.interpolatePattern)(versionPattern, substitutions);
+    return versionPattern.replace(tokenRegex, (match, fullMatch, envVarName, identifier, format) => {
+        // Handle environment variables
+        if (envVarName) {
+            const envValue = process.env[envVarName];
+            return envValue !== undefined ? envValue : match;
+        }
+        // Handle other tokens
+        const value = substitutions[identifier];
+        if (value === undefined) {
+            return match; // Keep original token if no data
+        }
+        // Handle date formatting
+        if (identifier === 'currentDate') {
+            if (format) {
+                return formatDate(value, format);
+            }
+            else {
+                return value.toISOString();
+            }
+        }
+        return value;
+    });
 }

package/src/utils/interpolate-pattern.d.ts

@@ -1,23 +0,0 @@
-/**
- * Interpolates pattern tokens in a string.
- *
- * Supported tokens:
- * - {tokenName} - Simple token replacement
- * - {currentDate} - Current date in ISO format
- * - {currentDate|FORMAT} - Current date with custom format (YYYY, YY, MM, DD, HH, mm, ss)
- * - {env.VAR_NAME} - Environment variable value
- *
- * @param pattern - String containing tokens to interpolate
- * @param tokens - Record of token values
- * @returns Interpolated string
- */
-export declare function interpolatePattern(pattern: string, tokens: Record<string, any>): string;
-/**
- * Recursively interpolates pattern tokens in all string values within an object or array.
- *
- * @param obj - Object or array to process
- * @param tokens - Record of token values
- * @returns New object/array with interpolated values
- */
-export declare function interpolateObject<T>(obj: T, tokens: Record<string, any>): T;
-//# sourceMappingURL=interpolate-pattern.d.ts.map

package/src/utils/interpolate-pattern.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"interpolate-pattern.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/utils/interpolate-pattern.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,MAAM,CA6BR;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAkB3E"}

package/src/utils/interpolate-pattern.js

@@ -1,81 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpolatePattern = interpolatePattern;
-exports.interpolateObject = interpolateObject;
-const tokenRegex = /\{(env\.([^}]+)|([^|{}]+)(?:\|([^{}]+))?)\}/g;
-function formatDate(date, format) {
-    const year = String(date.getUTCFullYear());
-    const month = String(date.getUTCMonth() + 1).padStart(2, '0');
-    const day = String(date.getUTCDate()).padStart(2, '0');
-    const hours = String(date.getUTCHours()).padStart(2, '0');
-    const minutes = String(date.getUTCMinutes()).padStart(2, '0');
-    const seconds = String(date.getUTCSeconds()).padStart(2, '0');
-    return format
-        .replace(/YYYY/g, year)
-        .replace(/YY/g, year.slice(-2))
-        .replace(/MM/g, month)
-        .replace(/DD/g, day)
-        .replace(/HH/g, hours)
-        .replace(/mm/g, minutes)
-        .replace(/ss/g, seconds);
-}
-/**
- * Interpolates pattern tokens in a string.
- *
- * Supported tokens:
- * - {tokenName} - Simple token replacement
- * - {currentDate} - Current date in ISO format
- * - {currentDate|FORMAT} - Current date with custom format (YYYY, YY, MM, DD, HH, mm, ss)
- * - {env.VAR_NAME} - Environment variable value
- *
- * @param pattern - String containing tokens to interpolate
- * @param tokens - Record of token values
- * @returns Interpolated string
- */
-function interpolatePattern(pattern, tokens) {
-    return pattern.replace(tokenRegex, (match, fullMatch, envVarName, identifier, format) => {
-        // Handle environment variables
-        if (envVarName) {
-            const envValue = process.env[envVarName];
-            return envValue !== undefined ? envValue : match;
-        }
-        // Handle other tokens
-        const value = tokens[identifier];
-        if (value === undefined) {
-            return match; // Keep original token if no data
-        }
-        // Handle date formatting
-        if (identifier === 'currentDate') {
-            if (format) {
-                return formatDate(value, format);
-            }
-            else {
-                return value.toISOString();
-            }
-        }
-        return value;
-    });
-}
-/**
- * Recursively interpolates pattern tokens in all string values within an object or array.
- *
- * @param obj - Object or array to process
- * @param tokens - Record of token values
- * @returns New object/array with interpolated values
- */
-function interpolateObject(obj, tokens) {
-    if (typeof obj === 'string') {
-        return interpolatePattern(obj, tokens);
-    }
-    if (Array.isArray(obj)) {
-        return obj.map((item) => interpolateObject(item, tokens));
-    }
-    if (obj !== null && typeof obj === 'object') {
-        const result = {};
-        for (const [key, value] of Object.entries(obj)) {
-            result[key] = interpolateObject(value, tokens);
-        }
-        return result;
-    }
-    return obj;
-}