@expo/steps 18.2.0 → 18.5.0

package/dist/BuildConfigParser.js

@@ -59,16 +59,21 @@ class BuildConfigParser extends AbstractConfigParser_1.AbstractConfigParser {
     createBuildStepFromBuildStepCommandRun({ run }) {
         const { id: maybeId, inputs: inputsConfig, outputs: outputsConfig, name, workingDirectory, shell, command, env, if: ifCondition, timeout_minutes, __metrics_id, } = run;
         const id = BuildStep_1.BuildStep.getNewId(maybeId);
-        const displayName = BuildStep_1.BuildStep.getDisplayName({ id, name, command });
+        const displayName = name ??
+            maybeId ??
+            command
+                .split('\n')
+                .find(line => line.trim())
+                ?.trim() ??
+            command;
         const inputs = inputsConfig && this.createBuildStepInputsFromDefinition(inputsConfig, displayName);
         const outputs = outputsConfig && this.createBuildStepOutputsFromDefinition(outputsConfig, displayName);
         const timeoutMs = timeout_minutes !== undefined ? timeout_minutes * 60 * 1000 : undefined;
         return new BuildStep_1.BuildStep(this.ctx, {
             id,
+            displayName,
             inputs,
             outputs,
-            name,
-            displayName,
             workingDirectory,
             shell,
             command,
@@ -80,7 +85,10 @@ class BuildConfigParser extends AbstractConfigParser_1.AbstractConfigParser {
     }
     createBuildStepFromBuildStepBareCommandRun({ run: command, }) {
         const id = BuildStep_1.BuildStep.getNewId();
-        const displayName = BuildStep_1.BuildStep.getDisplayName({ id, command });
+        const displayName = command
+            .split('\n')
+            .find(line => line.trim())
+            ?.trim() ?? command;
         return new BuildStep_1.BuildStep(this.ctx, {
             id,
             displayName,

package/dist/BuildFunction.js

@@ -42,11 +42,7 @@ class BuildFunction {
     createBuildStepFromFunctionCall(ctx, { id, name, callInputs = {}, workingDirectory, shell, env, ifCondition, timeoutMs, } = {}) {
         const buildStepId = BuildStep_1.BuildStep.getNewId(id);
         const buildStepName = name ?? this.name;
-        const buildStepDisplayName = BuildStep_1.BuildStep.getDisplayName({
-            id: buildStepId,
-            command: this.command,
-            name: buildStepName,
-        });
+        const buildStepDisplayName = buildStepName ?? id ?? this.getFullId();
         const inputs = this.inputProviders?.map(inputProvider => {
             const input = inputProvider(ctx, buildStepId);
             if (input.id in callInputs) {
@@ -57,7 +53,6 @@ class BuildFunction {
         const outputs = this.outputProviders?.map(outputProvider => outputProvider(ctx, buildStepId));
         return new BuildStep_1.BuildStep(ctx, {
             id: buildStepId,
-            name: buildStepName,
             displayName: buildStepDisplayName,
             command: this.command,
             fn: this.fn ??

package/dist/BuildStep.d.ts

@@ -44,8 +44,8 @@ export declare class BuildStepOutputAccessor {
     static deserialize(serialized: SerializedBuildStepOutputAccessor): BuildStepOutputAccessor;
 }
 export declare class BuildStep extends BuildStepOutputAccessor {
+    private static nextGeneratedId;
     readonly id: string;
-    readonly name?: string;
     readonly displayName: string;
     readonly supportedRuntimePlatforms?: BuildRuntimePlatform[];
     readonly inputs?: BuildStepInput[];
@@ -61,18 +61,11 @@ export declare class BuildStep extends BuildStepOutputAccessor {
     status: BuildStepStatus;
     private readonly outputsDir;
     private readonly envsDir;
-    private readonly internalId;
     private readonly inputById;
     protected executed: boolean;
     static getNewId(userDefinedId?: string): string;
-    static getDisplayName({ id, name, command, }: {
+    constructor(ctx: BuildStepGlobalContext, { id, displayName, inputs, outputs, command, fn, workingDirectory: maybeWorkingDirectory, shell, supportedRuntimePlatforms: maybeSupportedRuntimePlatforms, env, ifCondition, timeoutMs, __metricsId, }: {
         id: string;
-        name?: string;
-        command?: string;
-    }): string;
-    constructor(ctx: BuildStepGlobalContext, { id, name, displayName, inputs, outputs, command, fn, workingDirectory: maybeWorkingDirectory, shell, supportedRuntimePlatforms: maybeSupportedRuntimePlatforms, env, ifCondition, timeoutMs, __metricsId, }: {
-        id: string;
-        name?: string;
         displayName: string;
         inputs?: BuildStepInput[];
         outputs?: BuildStepOutput[];

package/dist/BuildStep.js

@@ -8,7 +8,6 @@ const assert_1 = __importDefault(require("assert"));
 const buffer_1 = require("buffer");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-const uuid_1 = require("uuid");
 const BuildStepInput_1 = require("./BuildStepInput");
 const BuildStepOutput_1 = require("./BuildStepOutput");
 const BuildTemporaryFiles_1 = require("./BuildTemporaryFiles");
@@ -33,8 +32,6 @@ var BuildStepLogMarker;
     BuildStepLogMarker["START_STEP"] = "start-step";
     BuildStepLogMarker["END_STEP"] = "end-step";
 })(BuildStepLogMarker || (exports.BuildStepLogMarker = BuildStepLogMarker = {}));
-// TODO: move to a place common with tests
-const UUID_REGEX = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
 class BuildStepOutputAccessor {
     id;
     displayName;
@@ -79,8 +76,8 @@ class BuildStepOutputAccessor {
 }
 exports.BuildStepOutputAccessor = BuildStepOutputAccessor;
 class BuildStep extends BuildStepOutputAccessor {
+    static nextGeneratedId = 1;
     id;
-    name;
     displayName;
     supportedRuntimePlatforms;
     inputs;
@@ -96,37 +93,17 @@ class BuildStep extends BuildStepOutputAccessor {
     status;
     outputsDir;
     envsDir;
-    internalId;
     inputById;
     executed = false;
     static getNewId(userDefinedId) {
-        return userDefinedId ?? (0, uuid_1.v4)();
+        return userDefinedId ?? `step-${String(BuildStep.nextGeneratedId++).padStart(3, '0')}`;
     }
-    static getDisplayName({ id, name, command, }) {
-        if (name) {
-            return name;
-        }
-        if (!id.match(UUID_REGEX)) {
-            return id;
-        }
-        if (command) {
-            const splits = command.trim().split('\n');
-            for (const split of splits) {
-                const trimmed = split.trim();
-                if (trimmed && !trimmed.startsWith('#')) {
-                    return trimmed;
-                }
-            }
-        }
-        return id;
-    }
-    constructor(ctx, { id, name, displayName, inputs, outputs, command, fn, workingDirectory: maybeWorkingDirectory, shell, supportedRuntimePlatforms: maybeSupportedRuntimePlatforms, env, ifCondition, timeoutMs, __metricsId, }) {
+    constructor(ctx, { id, displayName, inputs, outputs, command, fn, workingDirectory: maybeWorkingDirectory, shell, supportedRuntimePlatforms: maybeSupportedRuntimePlatforms, env, ifCondition, timeoutMs, __metricsId, }) {
         (0, assert_1.default)(command !== undefined || fn !== undefined, 'Either command or fn must be defined.');
         (0, assert_1.default)(!(command !== undefined && fn !== undefined), 'Command and fn cannot be both set.');
         const outputById = (0, BuildStepOutput_1.makeBuildStepOutputByIdMap)(outputs);
         super(id, displayName, false, outputById);
         this.id = id;
-        this.name = name;
         this.displayName = displayName;
         this.supportedRuntimePlatforms = maybeSupportedRuntimePlatforms;
         this.inputs = inputs;
@@ -139,9 +116,7 @@ class BuildStep extends BuildStepOutputAccessor {
         this.timeoutMs = timeoutMs;
         this.__metricsId = __metricsId;
         this.status = BuildStepStatus.NEW;
-        this.internalId = (0, uuid_1.v4)();
         const logger = ctx.baseLogger.child({
-            buildStepInternalId: this.internalId,
             buildStepId: this.id,
             buildStepDisplayName: this.displayName,
         });

package/dist/BuildStepContext.d.ts

@@ -3,7 +3,7 @@ import { bunyan } from '@expo/logger';
 import { BuildRuntimePlatform } from './BuildRuntimePlatform';
 import { BuildStep, SerializedBuildStepOutputAccessor } from './BuildStep';
 import { BuildStepEnv } from './BuildStepEnv';
-import { StepMetricInput, StepMetricsCollection } from './StepMetrics';
+import { StepMetric, StepMetricInput } from './StepMetrics';
 interface SerializedExternalBuildContextProvider {
     projectSourceDirectory: string;
     projectTargetDirectory: string;
@@ -23,6 +23,7 @@ export interface ExternalBuildContextProvider {
     readonly staticContext: () => Omit<StaticJobInterpolationContext, 'steps'>;
     readonly env: BuildStepEnv;
     updateEnv(env: BuildStepEnv): void;
+    reportStepMetric?(metric: StepMetric): void;
 }
 export interface SerializedBuildStepGlobalContext {
     stepsInternalBuildDirectory: string;
@@ -39,7 +40,6 @@ export declare class BuildStepGlobalContext {
     private didCheckOut;
     private _hasAnyPreviousStepFailed;
     private stepById;
-    private readonly _stepMetrics;
     constructor(provider: ExternalBuildContextProvider, skipCleanup: boolean);
     get projectSourceDirectory(): string;
     get projectTargetDirectory(): string;
@@ -59,7 +59,6 @@ export declare class BuildStepGlobalContext {
     markAsCheckedOut(logger: bunyan): void;
     get hasAnyPreviousStepFailed(): boolean;
     markAsFailed(): void;
-    get stepMetrics(): StepMetricsCollection;
     addStepMetric(metric: StepMetricInput): void;
     wasCheckedOut(): boolean;
     hashFiles(...patterns: string[]): string;

package/dist/BuildStepContext.js

@@ -21,7 +21,6 @@ class BuildStepGlobalContext {
     didCheckOut = false;
     _hasAnyPreviousStepFailed = false;
     stepById = {};
-    _stepMetrics = [];
     constructor(provider, skipCleanup) {
         this.provider = provider;
         this.skipCleanup = skipCleanup;
@@ -119,11 +118,9 @@ class BuildStepGlobalContext {
     markAsFailed() {
         this._hasAnyPreviousStepFailed = true;
     }
-    get stepMetrics() {
-        return this._stepMetrics;
-    }
     addStepMetric(metric) {
-        this._stepMetrics.push({ ...metric, platform: this.runtimePlatform });
+        const stepMetric = { ...metric, platform: this.runtimePlatform };
+        this.provider.reportStepMetric?.(stepMetric);
     }
     wasCheckedOut() {
         return this.didCheckOut;

package/dist/StepMetrics.d.ts

@@ -7,4 +7,3 @@ export type StepMetricInput = {
 export type StepMetric = StepMetricInput & {
     platform: 'darwin' | 'linux';
 };
-export type StepMetricsCollection = StepMetric[];

package/dist/StepsConfigParser.js

@@ -67,13 +67,18 @@ class StepsConfigParser extends AbstractConfigParser_1.AbstractConfigParser {
     }
     createBuildStepFromShellStepConfig(step) {
         const id = BuildStep_1.BuildStep.getNewId(step.id);
-        const displayName = BuildStep_1.BuildStep.getDisplayName({ id, name: step.name, command: step.run });
+        const displayName = step.name ??
+            step.id ??
+            step.run
+                .split('\n')
+                .find(line => line.trim())
+                ?.trim() ??
+            step.run;
         const outputs = step.outputs && this.createBuildStepOutputsFromDefinition(step.outputs, displayName);
         return new BuildStep_1.BuildStep(this.ctx, {
             id,
-            outputs,
-            name: step.name,
             displayName,
+            outputs,
             workingDirectory: step.working_directory,
             shell: step.shell,
             command: step.run,

package/dist/index.d.ts

@@ -16,4 +16,4 @@ export * from './interpolation';
 export * from './utils/shell/spawn';
 export * from './utils/jsepEval';
 export * from './utils/hashFiles';
-export { StepMetric, StepMetricResult, StepMetricsCollection } from './StepMetrics';
+export { StepMetric, StepMetricResult } from './StepMetrics';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/steps",
-  "version": "18.2.0",
+  "version": "18.5.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -19,16 +19,16 @@
     "start": "yarn watch",
     "build": "tsc --project tsconfig.build.json",
     "typecheck": "tsc",
-    "prepack": "rm -rf dist *.tsbuildinfo && tsc --project tsconfig.build.json",
+    "prepack": "rimraf dist \"*.tsbuildinfo\" && tsc --project tsconfig.build.json",
     "watch": "tsc --watch --preserveWatchOutput",
     "test": "jest --config jest.config.ts",
     "test:coverage": "jest --config jest.config.ts --coverage",
     "test:watch": "yarn test --watch",
-    "clean": "rm -rf node_modules dist coverage *.tsbuildinfo"
+    "clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\""
   },
   "dependencies": {
-    "@expo/eas-build-job": "18.2.0",
-    "@expo/logger": "18.0.1",
+    "@expo/eas-build-job": "18.5.0",
+    "@expo/logger": "18.5.0",
     "@expo/spawn-async": "^1.7.2",
     "arg": "^5.0.2",
     "fs-extra": "^11.2.0",
@@ -47,6 +47,7 @@
     "@types/node": "20.14.2",
     "eslint-plugin-async-protect": "^3.1.0",
     "jest": "^29.7.0",
+    "rimraf": "3.0.2",
     "ts-jest": "^29.1.4",
     "ts-mockito": "^2.6.1",
     "ts-node": "^10.9.2",
@@ -55,5 +56,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "5f400d77660990422c6976a65dfb41f99374c5cc"
+  "gitHead": "2e2dddb59ae9df5ad2395c74f77701341103b62e"
 }