@memberjunction/cli 6.1.0-edge.5 → 6.1.0-edge.7

package/dist/hooks/prerun.d.ts

@@ -1,4 +1,10 @@
 import { Hook } from '@oclif/core';
+/**
+ * Mirror of `DYNAMIC_PACKAGES_MODE_ENV_VAR` from @memberjunction/dynamic-packages, inlined so
+ * LIGHT commands (version, help, migrate, …) do not pay for that package — and its cosmiconfig
+ * import — at startup. `dynamic-packages.test.ts` asserts the two stay equal.
+ */
+export declare const DYNAMIC_PACKAGES_MODE_ENV_VAR = "MJ_DYNAMIC_PACKAGES";
 declare const hook: Hook<'prerun'>;
 export default hook;
 //# sourceMappingURL=prerun.d.ts.map

package/dist/hooks/prerun.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prerun.d.ts","sourceRoot":"","sources":["../../src/hooks/prerun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAgCnC,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,QAAQ,CA2ExB,CAAC;AAcF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"prerun.d.ts","sourceRoot":"","sources":["../../src/hooks/prerun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAKnC;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,wBAAwB,CAAC;AA6BnE,QAAA,MAAM,IAAI,EAAE,IAAI,CAAC,QAAQ,CAqFxB,CAAC;AA0BF,eAAe,IAAI,CAAC"}

package/dist/hooks/prerun.js

@@ -1,6 +1,12 @@
 import figlet from 'figlet';
 import { INTERACTIVE_ENV, ResolveOutputFormat, ShouldSuppressChrome } from '@memberjunction/cli-core';
 import { LIGHT_COMMANDS } from '../light-commands.js';
+/**
+ * Mirror of `DYNAMIC_PACKAGES_MODE_ENV_VAR` from @memberjunction/dynamic-packages, inlined so
+ * LIGHT commands (version, help, migrate, …) do not pay for that package — and its cosmiconfig
+ * import — at startup. `dynamic-packages.test.ts` asserts the two stay equal.
+ */
+export const DYNAMIC_PACKAGES_MODE_ENV_VAR = 'MJ_DYNAMIC_PACKAGES';
 /**
  * Strips a global boolean flag from argv in place and reports whether it was there.
  *
@@ -47,6 +53,13 @@ const hook = async function (options) {
     if (noBanner) {
         process.env.MJ_CLI_NO_BANNER = '1';
     }
+    // `--no-app-packages` skips loading the installed Open Apps' server packages (and the host's
+    // generated packages) for this one invocation, so e.g. `mj sync push` writes with the generic
+    // BaseEntity — no custom Save() logic, no lifecycle hooks. It rides the same env var the
+    // loader honours everywhere (`MJ_DYNAMIC_PACKAGES=none`), so scripts can set either.
+    if (takeGlobalFlag(argv, '--no-app-packages')) {
+        process.env[DYNAMIC_PACKAGES_MODE_ENV_VAR] = 'none';
+    }
     // Decide chrome with the SAME resolver the commands themselves use, rather than
     // re-deriving the format from argv here. The two views drifting is not hypothetical:
     // while this hook only looked for `--format` in argv, `MJ_CLI_FORMAT=json mj codegen`
@@ -64,11 +77,12 @@ const hook = async function (options) {
     // ShouldSuppressChrome covers both machine formats and a redirected stdout: a caller
     // that piped us has already said it is a machine, and a banner in its capture buffer
     // is pure noise.
+    const verbose = argv.includes('--verbose') || argv.includes('-v');
     if (noBanner || quiet || ShouldSuppressChrome(format)) {
         // Still conditionally load bootstrap — just no decorative output. (The old `--json`
         // branch returned *without* loading it, which would have silently skipped class
         // registration for any heavy command that later grew a `--json` flag.)
-        return await maybeLoadBootstrap(options);
+        return await maybeLoadBootstrap(options, verbose);
     }
     // Suppress the large figlet banner for hot-path, frequently-run commands (e.g. `mj sync *`)
     // and the agent-facing usage commands, where it's pure scrollback cost. The
@@ -92,17 +106,29 @@ const hook = async function (options) {
     if (options.Command.id !== 'version' && !isUsageCommand) {
         options.context.log(options.config.userAgent + '\n');
     }
-    await maybeLoadBootstrap(options);
+    await maybeLoadBootstrap(options, verbose);
 };
 /**
  * Conditionally load MJ bootstrap for heavy commands. Light commands (version,
  * help, bump, migrate, clean, install, dbdoc/*, usage/*) skip the ~1,400 class
  * registrations for instant startup.
+ *
+ * Heavy commands then load the installed Open Apps' server packages (and the host's generated
+ * packages) through @memberjunction/dynamic-packages — AFTER the manifest, so an app's
+ * @RegisterClass wins via load-order priority, and BEFORE the command opens a database
+ * provider, the same ordering MJAPI uses. This is what makes `mj sync push`, `mj app …`,
+ * `mj test` and every other command construct an app's real entity subclasses instead of
+ * falling back to BaseEntity (issue #4199). The process ID is `cli:<command id>`, so entries
+ * can be scoped to `cli`, `cli:sync`, or one command.
  */
-async function maybeLoadBootstrap(options) {
+async function maybeLoadBootstrap(options, verbose = false) {
     const commandId = options.Command.id ?? '';
     if (!LIGHT_COMMANDS.has(commandId)) {
+        // Both modules are dynamic-imported so light commands keep their instant startup (the
+        // config module's cosmiconfig search runs at import time).
         await import('@memberjunction/server-bootstrap-lite/mj-class-registrations');
+        const { loadDynamicPackagesForCommand } = await import('../lib/dynamic-packages.js');
+        await loadDynamicPackagesForCommand(commandId, { verbose });
     }
 }
 export default hook;

package/dist/hooks/prerun.js.map

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

package/dist/lib/dev-workspace/build.d.ts

@@ -1,8 +1,25 @@
-import type { CandidateRepo, DevDepConflict, DuplicateFamilyPackage, PackageExtension, RootPackageJsonResult, TurboJsonResult } from './types.js';
+import type { CandidateRepo, DevDepConflict, DuplicateClientPackage, DuplicateFamilyPackage, DuplicateProviderLink, MemberPackageJson, OpenAppClientPackage, PackageExtension, RootPackageJsonResult, ShellPeerGap, TurboJsonResult, WorkspaceShell } from './types.js';
 /** Build-scripts allowlist proven on the core-monorepo spike. */
 export declare const ONLY_BUILT_DEPENDENCIES: readonly string[];
-/** The three .npmrc settings lines — strict peers has been the standard since 2026-08-07. */
+/**
+ * The one .npmrc settings line. The peer settings that used to sit beside it
+ * (`strict-peer-dependencies`, `auto-install-peers`) now live in
+ * `pnpm-workspace.yaml` with the rest of the pnpm settings — see
+ * {@link PEER_INSTALL_SETTINGS}.
+ */
 export declare const NPMRC_BASE_LINES: readonly string[];
+/**
+ * Peer-resolution settings for the parent workspace, emitted into
+ * `pnpm-workspace.yaml`. Peers are auto-installed but NOT strict: a mixed
+ * workspace links MJ from source while a member may still resolve published
+ * packages (Skip-Brain's `@mj-biz-apps/*` 5.33) whose peer ranges name an older
+ * MJ major than the linked source — a strict install fails on peers no member
+ * can fix, while a non-strict one reports them and completes.
+ */
+export declare const PEER_INSTALL_SETTINGS: {
+    readonly strictPeerDependencies: false;
+    readonly autoInstallPeers: true;
+};
 /**
  * Packages an MJ library declares as a `peerDependency` because the choice belongs
  * to the app shell, not the library — the auth SDK family especially, where a shell
@@ -12,6 +29,11 @@ export declare const NPMRC_BASE_LINES: readonly string[];
  *
  * Kept here (rather than as prose) so the command's guidance text has one source of
  * truth. Grouped by the MJ package whose peer declaration creates the requirement.
+ *
+ * Scope: this list covers MJ's OWN libraries. Open App client packages declare shell-provided
+ * peers too, and they are NOT enumerated here — MJ's CLI does not hardcode knowledge of specific
+ * Open App repos. They are DERIVED instead, per shell, by {@link ResolveShellPeerGaps} from the
+ * members' committed `mj-app.json` files (#4364).
  */
 export declare const SHELL_PROVIDED_PEERS: ReadonlyArray<{
     Library: string;
@@ -43,12 +65,23 @@ export declare const PEER_DEPENDENCY_RULES: {
 export declare const FALLBACK_PNPM_PIN = "pnpm@10.33.0";
 /** The proven root-manifest devDependency baseline; fills gaps the union leaves. */
 export declare const BASELINE_DEV_DEPENDENCIES: Readonly<Record<string, string>>;
+/**
+ * The #3795 guard, made explicit for admitted app shells: every package an `--apps` glob
+ * enumerates must have a name no other workspace package uses, or pnpm would silently pick one.
+ * Throws naming both sides; returns the admitted app package names otherwise. Pure.
+ */
+export declare function AssertAppPackageNamesUnique(members: ReadonlyArray<Pick<CandidateRepo, 'Name' | 'Packages' | 'AppGlobs'>>): string[];
 /**
  * Builds `pnpm-workspace.yaml`: per member (sorted by name) the repo root plus the
  * member's own packages-rooted workspace globs re-prefixed with its directory name.
  * Producer packages only — never `apps/*` (app-shell names collide across repos).
+ *
+ * `settings` — the assembled pnpm settings from {@link BuildRootPackageJson}
+ * (`PnpmSettings`: overrides, patches, peer rules, the peer install switches) —
+ * are appended as block YAML. pnpm 10 honours them ONLY in this file; the same
+ * block in the root package.json is ignored with a per-field warning.
  */
-export declare function BuildWorkspaceYaml(members: ReadonlyArray<Pick<CandidateRepo, 'Name' | 'WorkspaceGlobs'>>): string;
+export declare function BuildWorkspaceYaml(members: ReadonlyArray<Pick<CandidateRepo, 'Name' | 'WorkspaceGlobs' | 'AppGlobs'>>, settings?: Readonly<Record<string, unknown>>): string;
 /**
  * Renders the shell-dependency guidance the command prints — the replacement for
  * the deleted hoist block. Derived from {@link SHELL_PROVIDED_PEERS} so the advice
@@ -56,7 +89,7 @@ export declare function BuildWorkspaceYaml(members: ReadonlyArray<Pick<Candidate
  */
 export declare function BuildShellPeerGuidance(): string[];
 /**
- * Builds `.npmrc`: exactly the three proven settings lines.
+ * Builds `.npmrc`: exactly the one settings line pnpm still needs there.
  *
  * No `public-hoist-pattern[]` block by design — see the "Why no hoist block" note
  * at the top of this module.
@@ -110,6 +143,82 @@ export declare function CollectFamilyPackages(members: readonly CandidateRepo[])
     Names: string[];
     Duplicates: DuplicateFamilyPackage[];
 };
+/** The consumer-scoped links for duplicated family names plus every consumer that could not get one. */
+export interface DuplicateProviderLinksResult {
+    /** `<consumer>><package>` -> `link:<member>/<relPath>` — ready to merge into the parent overrides. */
+    Overrides: Record<string, string>;
+    Links: DuplicateProviderLink[];
+    Unlinked: Array<{
+        Consumer: string;
+        Package: string;
+        Repo: string;
+        Reason: 'ambiguous-consumer' | 'no-own-copy';
+    }>;
+}
+/**
+ * Keeps each member's OWN copy of a duplicated package name in front of that
+ * member's own consumers. A plain `name: workspace:*` override can only pick
+ * one provider (pnpm takes the first by sort order), so every MJ-based app repo's
+ * `mj_generatedentities` / `mj_generatedactions` collided as soon as two such
+ * repos shared a workspace: Skip-Brain's packages type-checked against MJ's
+ * generated entities and could not find their own.
+ * pnpm's `parent>child` override selector with a root-relative `link:` value
+ * scopes the fix to the consumer: `@skip-brain/core>mj_generatedentities:
+ * link:Skip-Brain/packages/GeneratedEntities` (verified live).
+ *
+ * Two consumer shapes cannot be linked and are reported instead: a consumer whose
+ * own name is duplicated (the selector would hit every copy of it), and a consumer
+ * in a member that provides no copy (nothing of its own to link to — it gets the
+ * sort-order provider like before). Pure; deterministic over sorted names.
+ */
+export declare function ResolveDuplicateProviderLinks(members: readonly CandidateRepo[], duplicates: readonly DuplicateFamilyPackage[]): DuplicateProviderLinksResult;
+/**
+ * Indexes every package the workspace members provide, by package name. One lookup structure
+ * serves both "does the workspace provide this?" (what {@link CollectFamilyPackages} answers with
+ * a name list) and "what does this package declare?" — the peer resolution in
+ * {@link ResolveShellPeerGaps} needs the manifest, not just the name.
+ */
+export declare function IndexWorkspacePackages(members: readonly CandidateRepo[]): Map<string, MemberPackageJson>;
+export declare function CollectOpenAppClientPackages(members: readonly CandidateRepo[], workspacePackages: ReadonlyMap<string, MemberPackageJson>): {
+    Packages: OpenAppClientPackage[];
+    Duplicates: DuplicateClientPackage[];
+};
+/**
+ * The MJ Angular app shells the workspace enumerates — the shells that could actually host an Open
+ * App client package.
+ *
+ * Structural, with no configuration, and all three conditions earn their place:
+ *  - depends on `@angular/core` — a LIBRARY takes it as a peer, so this alone separates app from library;
+ *  - carries an Angular application builder (`@angular/cli` / `@angular/build`) in devDependencies;
+ *  - declares at least one `@memberjunction/ng-*` package — it has an MJ Angular surface.
+ *
+ * The third condition is not decoration. Without it the sole other Angular app in the MJ monorepo,
+ * `mj_angular_elements_demo`, is reported as missing five peers of packages it will never load —
+ * five warnings on every regenerate, which is how a report teaches people to stop reading it. It
+ * declares zero `@memberjunction/ng-*` packages while MJExplorer declares 22, and an Open App
+ * client package peer-depends on eleven of them, so a shell with none cannot be hosting one. It is
+ * a predicate, deliberately not a count threshold.
+ *
+ * Scope, stated rather than implied: only packages the workspace enumerates are candidates, and
+ * detection filters members' `apps/*` globs out because every Open App repo names its shells
+ * `mj_api`/`mj_explorer` and they collide (#3795). A shell under `apps/` is outside the workspace
+ * by design and is not checked here.
+ */
+export declare function CollectWorkspaceShells(members: readonly CandidateRepo[]): WorkspaceShell[];
+/**
+ * Peers of the registered client-side packages that a shell cannot resolve.
+ *
+ * A peer is a gap for a shell when the workspace does not PROVIDE it and the shell does not
+ * DECLARE it. Both halves are required: without the first, every `@memberjunction/*` peer is
+ * noise; without the second, `@angular/core` is a false positive in every shell.
+ *
+ * Why this must not be auto-added to the parent manifest: an Angular dev server externalizes
+ * `@angular/*` and resolves it from the VITE ROOT (the shell), so the copy `auto-install-peers`
+ * places in the consumer's own tree is never consulted — measured, with a control, on 2026-09-11.
+ * The fix belongs in the shell's own tracked package.json, which is what {@link SHELL_PROVIDED_PEERS}
+ * has always said and what MJExplorer already does for `@angular/service-worker`.
+ */
+export declare function ResolveShellPeerGaps(clientPackages: readonly OpenAppClientPackage[], shells: readonly WorkspaceShell[], workspacePackages: ReadonlyMap<string, MemberPackageJson>, overrides: Readonly<Record<string, string>>): ShellPeerGap[];
 /** The unioned member pnpm blocks, ready for the parent manifest. */
 export interface MemberPnpmBlocksResult {
     Overrides: Record<string, string>;
@@ -139,24 +248,52 @@ export interface MemberPnpmBlocksResult {
  *    ignoreMissing set-unioned.
  */
 export declare function ResolveMemberPnpmBlocks(members: readonly CandidateRepo[]): MemberPnpmBlocksResult;
-/**
- * Layers the three override sources into the parent `pnpm.overrides`, weakest
- * first: lockfile-derived pins < explicit member overrides < family
- * `workspace:*` (local source always wins). A member's or family's whole-name
- * entry displaces every per-major pin selector for that name (a plain key and
- * a `name@^N` selector must not fight). Displacements are returned so the
- * command reports them — nothing is overwritten silently.
- */
-export declare function AssembleParentOverrides(lockfilePins: Record<string, string>, memberOverrides: Record<string, string>, familyNames: readonly string[]): {
+/** The assembled parent overrides plus every decision the layering made. */
+export interface AssembledOverrides {
     Overrides: Record<string, string>;
+    /** Entries a stronger layer displaced (lockfile pins, member overrides, or both). */
     SupersededPins: string[];
-};
+    /** Override keys written from a member's `patchedDependencies` key — the patched exact version wins. */
+    PatchPins: string[];
+}
+/**
+ * Layers the override sources into the parent overrides, weakest first:
+ * lockfile-derived pins < explicit member overrides < patched-package pins <
+ * family `workspace:*` (local source always wins). A member's or family's
+ * whole-name entry displaces every per-major pin selector for that name (a plain
+ * key and a `name@^N` selector must not fight). Displacements are returned so
+ * the command reports them — nothing is overwritten silently.
+ *
+ * `patchedPackages` are the members' `patchedDependencies` keys (`name@version`);
+ * see {@link pinPatchedPackage} for why a patch outranks an override.
+ */
+export declare function AssembleParentOverrides(lockfilePins: Record<string, string>, memberOverrides: Record<string, string>, familyNames: readonly string[], patchedPackages?: readonly string[]): AssembledOverrides;
 /**
- * Builds the private parent `package.json`: pnpm pin, the cleaned member
- * devDependency union, and the full absorbed `pnpm` block — member overrides and
- * patches hoisted, lockfile-derived pins, and `workspace:*` overrides for every
- * member-provided package. Every decision lands in the returned Report.
+ * Builds the pnpm settings for `pnpm-workspace.yaml` from the assembled parts,
+ * omitting empty sections: the peer install switches, the peer bridge rules, the
+ * layered overrides, hoisted patches and package extensions. Key order is fixed
+ * so a regenerated workspace is byte-identical.
+ */
+export declare function BuildPnpmWorkspaceSettings(overrides: Record<string, string>, blocks: MemberPnpmBlocksResult): Record<string, unknown>;
+/**
+ * Builds the private parent `package.json` — pnpm pin and the cleaned member
+ * devDependency union — and, alongside it, the pnpm settings the workspace yaml
+ * carries: member overrides and patches hoisted, lockfile-derived pins,
+ * patched-package pins, and `workspace:*` overrides for every member-provided
+ * package. The settings are returned rather than written into the manifest
+ * because pnpm 10 ignores a `pnpm` block at a workspace root. Every decision
+ * lands in the returned Report.
+ */
+/**
+ * The parent manifest's `dependencies`: every member-PROVIDED client-side package at
+ * `workspace:*`.
+ *
+ * This key is what puts the package at the parent's `node_modules` root, which is the only place
+ * an app shell that never declared it can resolve it from. An unprovided package is skipped — a
+ * `workspace:*` specifier on a package nothing provides is unresolvable and fails the install, the
+ * same reasoning as the devDependency union's `DroppedWorkspace` branch.
  */
+export declare function BuildClientDependencies(clientPackages: readonly OpenAppClientPackage[]): Record<string, string>;
 export declare function BuildRootPackageJson(parentDirName: string, members: readonly CandidateRepo[]): RootPackageJsonResult;
 /**
  * Marker value the sentinel carries. `mj dev workspace clean` refuses to delete a

package/dist/lib/dev-workspace/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/lib/dev-workspace/build.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAEhB,qBAAqB,EACrB,eAAe,EAEhB,MAAM,YAAY,CAAC;AAEpB,iEAAiE;AACjE,eAAO,MAAM,uBAAuB,EAAE,SAAS,MAAM,EAiBpD,CAAC;AAEF,6FAA6F;AAC7F,eAAO,MAAM,gBAAgB,EAAE,SAAS,MAAM,EAI7C,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,EAAE,aAAa,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAiB7F,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;CASxB,CAAC;AAEX,4FAA4F;AAC5F,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAGtE,CAAC;AA4CF;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAgBjH;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,EAAE,CAOjD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AASD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAQlE;AAED,6FAA6F;AAC7F,MAAM,WAAW,wBAAwB;IACvC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,gHAAgH;IAChH,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oGAAoG;IACpG,gBAAgB,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5D;AA4BD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,WAAW,GAAE,WAAW,CAAC,MAAM,CAAa,GAC3C,wBAAwB,CAkB1B;AA2BD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAUjG;AAQD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG;IACxE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,EAAE,sBAAsB,EAAE,CAAC;CACtC,CAgBA;AAuBD,qEAAqE;AACrE,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,kEAAkE;IAClE,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACpD,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACjE;AASD;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,sBAAsB,CAoCjG;AAiBD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,WAAW,EAAE,SAAS,MAAM,EAAE,GAC7B;IAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,cAAc,EAAE,MAAM,EAAE,CAAA;CAAE,CAiBjE;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,qBAAqB,CA2BpH;AAiCD;;;;GAIG;AACH,eAAO,MAAM,eAAe,qBAAqB,CAAC;AAElD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAalG;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,GAAG,eAAe,CAOhF"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/lib/dev-workspace/build.ts"],"names":[],"mappings":"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"}