@ethlete/cli 3.0.0-next.26 → 3.0.0-next.28

package/design/web/frame-surfaces.ts

@@ -0,0 +1,294 @@
+export type FrameSurfaceTheme = {
+  name: string;
+  type: string;
+  elevation: number;
+  isDefault: boolean;
+  colorThemeVariants: Partial<Record<string, string>>;
+};
+export type FrameColorTheme = { name: string; type: string | null; isDefault: boolean };
+export type FrameThemes = { surfaces: FrameSurfaceTheme[]; colors: FrameColorTheme[] };
+
+export const AUTO_SURFACE_ATTRIBUTE = 'data-et-auto-surface';
+export const SURFACE_INTERACTIVE_ATTRIBUTE = 'data-et-surface-interactive';
+export const SEMANTIC_COLOR_ATTRIBUTE = 'data-et-semantic-color';
+
+const SURFACE_CLASS_PREFIX = 'et-surface--';
+const COLOR_CLASS_PREFIX = 'et-color--';
+const SURFACE_INTERACTIVE_CLASS = 'et-surface-interactive';
+const SURFACE_CLASS_SELECTOR = /^\.et-surface--([\w-]+)$/u;
+const COLOR_CLASS_SELECTOR = /^\.et-color--([\w-]+)$/u;
+const RESERVED_COLORS = new Set(['default', 'surface']);
+
+const surfaceVarsOf = (style: CSSStyleDeclaration) => {
+  const type = style.getPropertyValue('--et-surface-type').trim();
+  const elevation = Number.parseInt(style.getPropertyValue('--et-surface-elevation'), 10);
+
+  return type && Number.isFinite(elevation) ? { type, elevation } : null;
+};
+
+const colorThemeVariantsOf = (style: CSSStyleDeclaration) =>
+  Object.fromEntries(
+    style
+      .getPropertyValue('--et-surface-color-theme-variants')
+      .split(',')
+      .map((entry) => entry.trim().split(/\s+/u))
+      .filter((pair): pair is [string, string] => pair.length === 2),
+  );
+
+const scopeNamesOf = (rule: CSSStyleRule, selector: RegExp) =>
+  rule.selectorText
+    .split(',')
+    .map((part) => selector.exec(part.trim())?.[1])
+    .filter((name): name is string => name !== undefined);
+
+const themesOfRules = (rules: CSSRuleList, themes: FrameThemes) => {
+  for (const rule of Array.from(rules)) {
+    if (rule instanceof CSSStyleRule) {
+      const surface = surfaceVarsOf(rule.style);
+
+      if (surface) {
+        const names = scopeNamesOf(rule, SURFACE_CLASS_SELECTOR);
+        const isDefault = names.includes(`default-${surface.type}`);
+        const registered = names.length > 1 ? names.filter((name) => name !== `default-${surface.type}`) : names;
+        const colorThemeVariants = colorThemeVariantsOf(rule.style);
+
+        registered.forEach((name) => themes.surfaces.push({ name, ...surface, isDefault, colorThemeVariants }));
+      }
+
+      if (rule.style.getPropertyValue('--et-color-primary')) {
+        const names = scopeNamesOf(rule, COLOR_CLASS_SELECTOR);
+        const type = rule.style.getPropertyValue('--et-color-theme-type').trim() || null;
+        const isDefault = names.includes('default');
+
+        names
+          .filter((name) => !RESERVED_COLORS.has(name))
+          .forEach((name) => themes.colors.push({ name, type, isDefault }));
+      }
+    }
+
+    if ('cssRules' in rule) themesOfRules((rule as CSSGroupingRule).cssRules, themes);
+  }
+
+  return themes;
+};
+
+const sheetThemes = new WeakMap<CSSStyleSheet, FrameThemes>();
+
+/**
+ * The surface and colour themes the frame's stylesheets register, as the SDK's generated theme CSS writes them: every
+ * `.et-surface--<name>` rule that sets `--et-surface-type` and `--et-surface-elevation` (with its
+ * `--et-surface-color-theme-variants`), and every `.et-color--<name>` rule that sets `--et-color-primary` (with its
+ * `--et-color-theme-type`).
+ */
+export const registeredThemesOf = (document: Document): FrameThemes => {
+  const all: FrameThemes = { surfaces: [], colors: [] };
+
+  for (const sheet of Array.from(document.styleSheets)) {
+    let themes = sheetThemes.get(sheet);
+
+    if (!themes) {
+      try {
+        themes = themesOfRules(sheet.cssRules, { surfaces: [], colors: [] });
+      } catch {
+        // A cross-origin sheet hides its rules.
+        continue;
+      }
+
+      sheetThemes.set(sheet, themes);
+    }
+
+    all.surfaces.push(...themes.surfaces);
+    all.colors.push(...themes.colors);
+  }
+
+  return all;
+};
+
+const surfaceThemeOf = (element: Element, themes: FrameSurfaceTheme[]): FrameSurfaceTheme | null => {
+  for (let current: Element | null = element; current; current = current.parentElement) {
+    for (const className of Array.from(current.classList)) {
+      if (!className.startsWith(SURFACE_CLASS_PREFIX)) continue;
+
+      const name = className.slice(SURFACE_CLASS_PREFIX.length);
+      const theme = themes.find((candidate) =>
+        name.startsWith('default-')
+          ? candidate.isDefault && `default-${candidate.type}` === name
+          : candidate.name === name,
+      );
+
+      if (theme) return theme;
+    }
+  }
+
+  const vars = surfaceVarsOf(getComputedStyle(element));
+  const matches = vars ? themes.filter((theme) => theme.type === vars.type && theme.elevation === vars.elevation) : [];
+
+  return matches.find((theme) => theme.isDefault) ?? matches[0] ?? null;
+};
+
+const colorVariantOf = (
+  surface: FrameSurfaceTheme | null,
+  { chosen, colors }: { chosen: string; colors: FrameColorTheme[] },
+) => {
+  const variant = surface?.colorThemeVariants[chosen];
+
+  return variant && colors.some((theme) => theme.name === variant) ? variant : chosen;
+};
+
+const appliedSurface = new WeakMap<Element, string>();
+const appliedColor = new WeakMap<Element, { chosen: string; variant: string }>();
+
+const defaultColorOf = (colors: FrameColorTheme[]) => colors.find((theme) => theme.isDefault)?.name ?? null;
+
+const chosenColorOf = (element: Element | null, colors: FrameColorTheme[]) => {
+  for (let current = element; current; current = current.parentElement) {
+    const applied = appliedColor.get(current);
+
+    if (applied) return applied.chosen;
+
+    for (const className of Array.from(current.classList)) {
+      if (!className.startsWith(COLOR_CLASS_PREFIX)) continue;
+
+      const name = className.slice(COLOR_CLASS_PREFIX.length);
+
+      if (name === 'default') return defaultColorOf(colors);
+      if (colors.some((theme) => theme.name === name)) return name;
+    }
+  }
+
+  return defaultColorOf(colors);
+};
+
+const applyColor = (element: Element, color: { chosen: string; variant: string } | null) => {
+  const previous = appliedColor.get(element);
+
+  if (previous && previous.variant !== color?.variant)
+    element.classList.remove(`${COLOR_CLASS_PREFIX}${previous.variant}`);
+
+  if (!color) {
+    appliedColor.delete(element);
+
+    return;
+  }
+
+  appliedColor.set(element, color);
+  if (!element.classList.contains(`${COLOR_CLASS_PREFIX}${color.variant}`))
+    element.classList.add(`${COLOR_CLASS_PREFIX}${color.variant}`);
+};
+
+const resolveAutoSurface = (element: Element, themes: FrameSurfaceTheme[]) => {
+  const parent = element.parentElement ? surfaceVarsOf(getComputedStyle(element.parentElement)) : null;
+  const name = parent
+    ? (themes.find((theme) => theme.type === parent.type && theme.elevation === parent.elevation + 1)?.name ?? null)
+    : null;
+  const previous = appliedSurface.get(element);
+
+  if (previous !== undefined && previous !== name) element.classList.remove(`${SURFACE_CLASS_PREFIX}${previous}`);
+
+  if (name === null) {
+    appliedSurface.delete(element);
+
+    return;
+  }
+
+  appliedSurface.set(element, name);
+  if (!element.classList.contains(`${SURFACE_CLASS_PREFIX}${name}`))
+    element.classList.add(`${SURFACE_CLASS_PREFIX}${name}`);
+};
+
+const resolveColor = (element: Element, themes: FrameThemes) => {
+  const type = element.getAttribute(SEMANTIC_COLOR_ATTRIBUTE);
+
+  if (type) {
+    const chosen = themes.colors.find((theme) => theme.type === type)?.name;
+
+    applyColor(
+      element,
+      chosen
+        ? {
+            chosen,
+            variant: colorVariantOf(surfaceThemeOf(element, themes.surfaces), { chosen, colors: themes.colors }),
+          }
+        : null,
+    );
+
+    return;
+  }
+
+  const chosen = element.hasAttribute(AUTO_SURFACE_ATTRIBUTE)
+    ? chosenColorOf(element.parentElement, themes.colors)
+    : null;
+
+  if (!chosen || !element.parentElement) {
+    applyColor(element, null);
+
+    return;
+  }
+
+  const variant = colorVariantOf(surfaceThemeOf(element, themes.surfaces), { chosen, colors: themes.colors });
+  const inherited = colorVariantOf(surfaceThemeOf(element.parentElement, themes.surfaces), {
+    chosen,
+    colors: themes.colors,
+  });
+
+  applyColor(element, variant === inherited ? null : { chosen, variant });
+};
+
+/**
+ * Resolves the theming attributes under `root` in document order, outer first: `[data-et-auto-surface]` gets the
+ * `et-surface--<name>` class of the theme one elevation above the surface it sits on, with the same type, like
+ * `etAutoSurface` (without such a theme it keeps the parent surface), plus the class of that surface's
+ * `colorThemeVariants` swap of the inherited accent, like `etProvideSurface`. `[data-et-semantic-color="<type>"]`
+ * gets the `et-color--<name>` class of the first colour theme of that type, swapped for its surface, like
+ * `injectSemanticColorTheme`; without a theme of that type it gets none.
+ */
+export const resolveTheming = (root: ParentNode, themes: FrameThemes) => {
+  for (const element of Array.from(
+    root.querySelectorAll(`[${AUTO_SURFACE_ATTRIBUTE}], [${SEMANTIC_COLOR_ATTRIBUTE}]`),
+  )) {
+    if (element.hasAttribute(AUTO_SURFACE_ATTRIBUTE)) resolveAutoSurface(element, themes.surfaces);
+
+    resolveColor(element, themes);
+  }
+};
+
+/**
+ * Resolves the theming attributes under `root` now and again after every change of its markup or of the page's
+ * stylesheets: auto surfaces and semantic colours as `resolveTheming`, and `[data-et-surface-interactive]` as `etSurfaceInteractive`, whose CSS
+ * (`interactiveCss`) goes into the page once. Returns the resolve function.
+ */
+export const watchSurfaces = (root: HTMLElement, interactiveCss: string) => {
+  const document = root.ownerDocument;
+  let styled = false;
+
+  const resolve = () => {
+    const interactive = Array.from(root.querySelectorAll(`[${SURFACE_INTERACTIVE_ATTRIBUTE}]`));
+
+    interactive.forEach((element) => {
+      if (!element.classList.contains(SURFACE_INTERACTIVE_CLASS)) element.classList.add(SURFACE_INTERACTIVE_CLASS);
+    });
+
+    if (interactive.length > 0 && !styled) {
+      const style = document.createElement('style');
+
+      styled = true;
+      style.textContent = interactiveCss;
+      document.head.append(style);
+    }
+
+    if (root.querySelector(`[${AUTO_SURFACE_ATTRIBUTE}], [${SEMANTIC_COLOR_ATTRIBUTE}]`))
+      resolveTheming(root, registeredThemesOf(document));
+  };
+
+  resolve();
+
+  new MutationObserver(resolve).observe(root, {
+    childList: true,
+    subtree: true,
+    attributes: true,
+    attributeFilter: ['class', AUTO_SURFACE_ATTRIBUTE, SURFACE_INTERACTIVE_ATTRIBUTE, SEMANTIC_COLOR_ATTRIBUTE],
+  });
+  new MutationObserver(resolve).observe(document.head, { childList: true, subtree: true, characterData: true });
+
+  return resolve;
+};

package/design/web/frame.ts

@@ -1,8 +1,11 @@
-import { CallVariant, Drawing, fitOutOfFlow, mountDrawing, placeOverlays } from '../define-call';
-import { Motion, Part } from '../define-part';
+import { CallVariant, Drawing, fitOutOfFlow, mountDrawing, placeOverlays, withNgStyles } from '../define-call';
+import { drawState, Motion, Part } from '../define-part';
 import { applyEmbed, fitEmbed } from '../embed-page';
 import { paintFill } from './frame-fill';
+import { fitRoot } from './frame-fit';
 import { pinScheme } from './frame-scheme';
+import { watchSurfaces } from './frame-surfaces';
+import surfaceInteractiveCss from './surface-interactive.css?inline';
 import { createMotionDriver, emulateReducedMotion, motionDriveMessageOf } from '../motion-drive';
 import { runRules, stepMotion, SteppedMotion } from '../motion-runtime';
 import { rootTokensOf, withTokenNames } from '../motion-tokens';
@@ -49,18 +52,42 @@ if (fill) paintFill(document.body, fill);
 const scheme = params.get('scheme');
 
 if (scheme === 'light' || scheme === 'dark') pinScheme(document, scheme);
-if (fit) {
-  document.documentElement.style.overflow = 'hidden';
-  root.style.width = 'max-content';
-  root.style.padding = '16px';
-}
+if (fit) fitRoot(root, { padded: !params.has('bare') });
 
 const markFailed = (message: string) => {
   errored = true;
   document.documentElement.setAttribute('data-et-error', message);
 };
 
+const BUILDING = /design-explore: wird gebaut …[^\n]*/;
+
+const showBuilding = (line: string) => {
+  document.documentElement.setAttribute('data-et-building', '');
+
+  const text = document.createElement('pre');
+  const startedAt = Date.now();
+  const paint = () => {
+    text.textContent = `${line} ${Math.floor((Date.now() - startedAt) / 1000)} s`;
+  };
+
+  paint();
+  setInterval(paint, 1000);
+  text.style.margin = '0';
+  text.style.whiteSpace = 'pre-wrap';
+  root.replaceChildren(text);
+  root.setAttribute(
+    'style',
+    'padding:16px;font:14px monospace;color:var(--et-surface-color-muted-solid);background:var(--et-surface-background-solid)',
+  );
+
+  return null;
+};
+
 const fail = (message: string) => {
+  const building = BUILDING.exec(message)?.[0];
+
+  if (building) return showBuilding(building);
+
   markFailed(message);
 
   const text = document.createElement('pre');
@@ -115,9 +142,32 @@ const drawCall = async (): Promise<Drawing | null> => {
   const variant: CallVariant | undefined = (await call()).default.variants.find((o) => o.key === key);
   if (!variant) return failMissing(`design-explore: call "${slug}" has no variant "${key}"`);
 
-  return variant.load().then(
-    (module) => module.default,
-    (error: unknown) => fail(`design-explore: variant "${key}" failed\n${messageOf(error)}`),
+  return variant
+    .load()
+    .then((module) => module.default)
+    .then(
+      (drawn) => withNgStyles(drawn),
+      (error: unknown) => fail(`design-explore: variant "${key}" failed\n${messageOf(error)}`),
+    );
+};
+
+const composeParam = product ? params.get('compose') : null;
+
+/** Makes each part named in the `compose` param draw with its props merged over the props its user passes. */
+const composed = async (name: string) => {
+  const overrides = composeParam ? (JSON.parse(composeParam) as Record<string, Record<string, unknown>>) : {};
+
+  await Promise.all(
+    Object.entries(overrides).map(async ([used, props]) => {
+      const load = parts[name]?.[used];
+
+      if (!load) throw new Error(`design-explore: product "${name}" has no part "${used}" to compose`);
+
+      const { default: part } = await retried(load);
+      const render = part.render.bind(part);
+
+      part.render = (given: unknown) => render({ ...(given as Record<string, unknown>), ...props });
+    }),
   );
 };
 
@@ -137,13 +187,15 @@ const drawPart = async (name: string): Promise<Drawing | null> => {
     );
 
   try {
+    await composed(name);
+
     const [{ default: part }, { default: holder }] = await Promise.all([retried(load), retried(loadProps)]);
 
     if (!(key in holder.states)) return failMissing(`design-explore: part "${partKey}" has no state "${key}"`);
 
     drawnPart = { part: part as Part<unknown>, states: holder.states };
 
-    return await part.render(holder.states[key]);
+    return await drawState(part as Part<unknown>, holder.states[key]);
   } catch (error) {
     return fail(`design-explore: state "${key}" of "${partKey}" failed\n${messageOf(error)}`);
   }
@@ -162,7 +214,7 @@ const force = (element: Element, name: string) => {
   if (name === 'disabled') {
     element.setAttribute('disabled', '');
     element.setAttribute('aria-disabled', 'true');
-  } else {
+  } else if (!element.hasAttribute('disabled') && element.getAttribute('aria-disabled') !== 'true') {
     element.setAttribute('data-et-force', name);
   }
 };
@@ -204,7 +256,7 @@ const stateMarkupOf = ({ part, states }: NonNullable<typeof drawnPart>, styles:
   const sheets = new Set([styles]);
 
   return (state: string) =>
-    Promise.resolve(part.render(states[state])).then((drawn) =>
+    drawState(part, states[state]).then((drawn) =>
       sheets.has(drawn.styles)
         ? drawn.body
         : forced(drawn.styles).then((css) => {
@@ -370,7 +422,7 @@ const exposeFlowLine = (options: { product: string; to: string; styles: string }
 
         // The styles of the to page ride in the markup: in <head> they would restyle the from page before the View Transition captures it.
 
-        return Promise.resolve((part as Part<unknown>).render(states[toState]))
+        return drawState(part as Part<unknown>, states[toState])
           .then((drawn) =>
             drawn.styles === options.styles
               ? drawn.body
@@ -416,6 +468,8 @@ const drawFrame = async () => {
     style.textContent = await forced(loaded.styles ?? '');
     document.head.append(style);
     const error = mountDrawing(root, loaded);
+
+    watchSurfaces(root, surfaceInteractiveCss);
     const partRoot = partRootOf(root);
 
     if (interaction && partRoot) force(partRoot, interaction);
@@ -437,7 +491,7 @@ const drawFrame = async () => {
   };
 
   new MutationObserver(place).observe(root, { childList: true, subtree: true });
-  new ResizeObserver(place).observe(root);
+  new ResizeObserver(() => requestAnimationFrame(place)).observe(root);
   place();
 
   const reported = new ResizeObserver(report);

package/design/web/surface-interactive.css

@@ -0,0 +1,42 @@
+@layer components {
+  :where(.et-surface-interactive) {
+    --et-surface-interaction-rgb: var(--et-surface-interaction);
+    --et-surface-interaction-solid: rgb(var(--et-surface-interaction-rgb));
+  }
+
+  /* hover-capable pointers only — on touch, :hover sticks after a tap */
+  @media (hover: hover) {
+    :where(.et-surface-interactive:hover) {
+      --et-surface-interaction-rgb: var(--et-surface-interaction-hover, var(--et-surface-interaction));
+      --et-surface-interaction-solid: rgb(var(--et-surface-interaction-rgb));
+    }
+  }
+
+  :where(.et-surface-interactive:focus-visible) {
+    --et-surface-interaction-rgb: var(
+      --et-surface-interaction-focus,
+      var(--et-surface-interaction-hover, var(--et-surface-interaction))
+    );
+    --et-surface-interaction-solid: rgb(var(--et-surface-interaction-rgb));
+  }
+
+  :where(.et-surface-interactive:active) {
+    --et-surface-interaction-rgb: var(
+      --et-surface-interaction-active,
+      var(--et-surface-interaction-focus, var(--et-surface-interaction-hover, var(--et-surface-interaction)))
+    );
+    --et-surface-interaction-solid: rgb(var(--et-surface-interaction-rgb));
+  }
+
+  :where(.et-surface-interactive[disabled]),
+  :where(.et-surface-interactive[aria-disabled='true']) {
+    --et-surface-interaction-rgb: var(
+      --et-surface-interaction-disabled,
+      var(
+        --et-surface-interaction-active,
+        var(--et-surface-interaction-focus, var(--et-surface-interaction-hover, var(--et-surface-interaction)))
+      )
+    );
+    --et-surface-interaction-solid: rgb(var(--et-surface-interaction-rgb));
+  }
+}

package/design/with-action.ts

@@ -0,0 +1,29 @@
+const OPEN_TAG = /<([a-zA-Z][\w-]*)((?:\s+[^\s"'=<>/]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'=<>`]+))?)*)\s*\/?>/g;
+const CLASS_ATTRIBUTE = /\sclass\s*=\s*(?:"([^"]*)"|'([^']*)')/;
+const ACTION_ATTRIBUTE = /\sdata-et-action\s*=/;
+
+const matches = (target: string, [, name = '', attributes = '']: string[]) => {
+  if (!target.startsWith('.')) return name.toLowerCase() === target.toLowerCase();
+  const classes = CLASS_ATTRIBUTE.exec(attributes);
+  return (classes?.[1] ?? classes?.[2] ?? '').split(/\s+/).includes(target.slice(1));
+};
+
+/** Where `withAction` declares the action: `on` is a tag name or a `.class` (default `button`). */
+export type ActionTarget = { action: string; on: string };
+
+/**
+ * Declares `action` as the `data-et-action` of the first `<button>` of `markup`, or of the first element that matches
+ * `{ action, on }`. Throws when no element matches or the match already declares an action.
+ */
+export const withAction = (markup: string, declared: string | ActionTarget) => {
+  const { action, on: target } = typeof declared === 'string' ? { action: declared, on: 'button' } : declared;
+  for (const tag of markup.matchAll(OPEN_TAG)) {
+    const [whole, name = '', attributes = ''] = tag;
+    if (!matches(target, tag)) continue;
+    if (ACTION_ATTRIBUTE.test(attributes))
+      throw new Error(`withAction("${action}"): the first ${target} already declares a data-et-action: ${whole}`);
+    const at = tag.index + 1 + name.length;
+    return `${markup.slice(0, at)} data-et-action="${action}"${markup.slice(at)}`;
+  }
+  throw new Error(`withAction("${action}"): no ${target} in the markup: ${markup.slice(0, 120)}`);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethlete/cli",
-  "version": "3.0.0-next.26",
+  "version": "3.0.0-next.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/ethlete-io/ethdk",
@@ -16,8 +16,10 @@
   "dependencies": {
     "@tailwindcss/node": "4.3.3",
     "@tailwindcss/postcss": "4.3.3",
+    "jiti": "2.7.0",
     "postcss": "8.5.32",
     "postcss-selector-parser": "7.1.7",
+    "rxjs": "^7.8.0",
     "typescript": "6.0.3",
     "vite": "8.3.5"
   },

package/src/index.js

@@ -24,7 +24,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_path_1 = require("node:path");
 const lib_1 = require("./lib");
+const source_hash_1 = require("./lib/source-hash");
 const USAGE_ROWS = [
     { subcommand: 'release', args: '', lines: ['Turn pending changesets into a tagged, pushed release commit'] },
     {
@@ -97,12 +99,18 @@ const cli = (args) => __awaiter(void 0, void 0, void 0, function* () {
                 argv: args.slice(1),
                 invocation: (0, lib_1.repoInvocation)({ root: process.cwd(), subcommand: 'auth' }),
             });
-        case 'design':
+        case 'design': {
+            const stale = (0, source_hash_1.staleCliBuildMessage)({ root: process.cwd(), buildDir: (0, node_path_1.join)(__dirname, '..') });
+            if (stale) {
+                console.error(stale);
+                return 1;
+            }
             return (0, lib_1.designCommand)({
                 root: process.cwd(),
                 argv: args.slice(1),
                 invocation: (0, lib_1.repoInvocation)({ root: process.cwd(), subcommand: 'design' }),
             });
+        }
         case 'update':
             return (0, lib_1.updateCommand)({
                 root: process.cwd(),

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../libs/cli/src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../libs/cli/src/index.ts"],"names":[],"mappings":"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"}

package/src/lib/api/compose.js

@@ -5,6 +5,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
+const plain_output_1 = require("../plain-output");
 /**
  * SELinux denies a container read access to a bind mount that carries the host's own label, and API
  * repos mount their checkout without the `:z` that would relabel it. Disabling the label from here
@@ -64,7 +65,7 @@ const composeOutput = (options) => {
     var _a;
     const { tool, cwd, env, args } = options;
     const [binary, ...prefix] = tool.compose;
-    const result = (0, child_process_1.spawnSync)(binary, [...prefix, ...args], { cwd, env, encoding: 'utf8' });
+    const result = (0, plain_output_1.spawnPlain)([binary, ...prefix, ...args], { cwd, env });
     return result.error || result.status !== 0 ? undefined : ((_a = result.stdout) !== null && _a !== void 0 ? _a : '');
 };
 exports.composeOutput = composeOutput;
@@ -86,7 +87,7 @@ exports.isRunningStatus = isRunningStatus;
 /** Every container the engine knows, with its compose service and published ports. */
 const containerStates = (engine) => {
     var _a;
-    const result = (0, child_process_1.spawnSync)(engine, ['ps', '-a', '--format', PS_FORMAT], { encoding: 'utf8' });
+    const result = (0, plain_output_1.spawnPlain)([engine, 'ps', '-a', '--format', PS_FORMAT]);
     if (result.error || result.status !== 0)
         return [];
     return ((_a = result.stdout) !== null && _a !== void 0 ? _a : '')

package/src/lib/api/compose.js.map

@@ -1 +1 @@
-{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/api/compose.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../../../libs/cli/src/lib/api/compose.ts"],"names":[],"mappings":"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"}

package/src/lib/api/git.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pullApiBranch = exports.checkoutApiBranch = exports.stashEntries = exports.unpushedCommits = exports.hasUncommittedChanges = exports.ignoredByGit = exports.uncommittedChanges = exports.headCommit = exports.currentBranch = void 0;
 const child_process_1 = require("child_process");
+const plain_output_1 = require("../plain-output");
 const git = (cwd, args) => {
     var _a, _b, _c;
-    const result = (0, child_process_1.spawnSync)('git', args, { cwd, encoding: 'utf8' });
+    const result = (0, plain_output_1.spawnPlain)(['git', ...args], { cwd });
     return {
         status: (_a = result.status) !== null && _a !== void 0 ? _a : 1,
         stdout: ((_b = result.stdout) !== null && _b !== void 0 ? _b : '').trim(),