@loomweaver/cli 0.9.0 → 0.9.1

package/dist/main.mjs

@@ -199,6 +199,7 @@ function asObject(value) {
 
 // ../devkit/src/lib/amend/compose.ts
 var APP_CONFIG = /export\s+const\s+appConfig\s*:[^=]*=\s*\{/;
+var NAMESPACES = /provideTranslationNamespaces\(([^)]*)\)/;
 var PROVIDERS_OPEN = /providers\s*:\s*\[/g;
 var SHELL_IMPORT = /import\s*\{([^}]*)\}\s*from\s*'@loomweaver\/shell';/;
 function closingLine(source, from) {
@@ -228,47 +229,96 @@ function providersBlock(source) {
 }
 function composePlugin(source, amendment, importPath) {
   if (source.includes(amendment.symbol)) {
-    return { source, composed: true };
+    return { source, composed: true, kept: [] };
   }
   const shellImport = SHELL_IMPORT.exec(source);
   if (!shellImport || !providersBlock(source)) {
-    return { source, composed: false };
+    return { source, composed: false, kept: [] };
   }
+  const wanted = providersToAdd(source, amendment);
+  const ownSymbols = [amendment.symbol, ...wanted.flatMap((provider) => provider.own ?? [])];
+  const foreign = wanted.flatMap((provider) => provider.from ?? []);
   const withImports = source.replace(
     SHELL_IMPORT,
-    () => `import {${withShellSymbols(shellImport[1])}} from '@loomweaver/shell';
-import { ${amendment.symbol} } from '${importPath}';`
+    () => [
+      `import {${withShellSymbols(shellImport[1], wanted)}} from '@loomweaver/shell';`,
+      ...foreign.map(
+        (entry) => `import { ${[...entry.symbols].toSorted((a, b) => a.localeCompare(b)).join(", ")} } from '${entry.path}';`
+      ),
+      `import { ${ownSymbols.toSorted((a, b) => a.localeCompare(b)).join(", ")} } from '${importPath}';`
+    ].join("\n")
   );
-  const block = providersBlock(withImports);
+  const joined = joinNamespaces(withImports, amendment.id);
+  const block = providersBlock(joined.source);
   if (!block) {
-    return { source, composed: false };
+    return { source, composed: false, kept: [] };
   }
   const indent = `${block.indent}  `;
   const lines = [
-    `${indent}provideTranslationNamespaces('${amendment.id}'),`,
+    ...wanted.map((provider) => `${indent}${provider.line}`),
+    ...joined.joined ? [] : [`${indent}provideTranslationNamespaces('${amendment.id}'),`],
     `${indent}provideCapabilityGrants({ ${amendment.id}: [${amendment.capabilities.map((capability) => `'${capability}'`).join(", ")}] }),`,
     `${indent}...providePlugins(${amendment.symbol}),`
   ].join("\n");
   return {
-    source: `${withImports.slice(0, block.insertAt)}
-${lines}${withImports.slice(block.insertAt)}`,
-    composed: true
+    source: `${joined.source.slice(0, block.insertAt)}
+${lines}${joined.source.slice(block.insertAt)}`,
+    composed: true,
+    kept: keptProviders(source, amendment).map((provider) => provider.line)
   };
 }
+function joinNamespaces(source, id) {
+  const existing = NAMESPACES.exec(source);
+  if (!existing) {
+    return { source, joined: false };
+  }
+  const names = existing[1].split(",").map((name) => name.trim()).filter(Boolean);
+  if (names.includes(`'${id}'`)) {
+    return { source, joined: true };
+  }
+  return {
+    source: source.replace(
+      NAMESPACES,
+      () => `provideTranslationNamespaces(${[...names, `'${id}'`].join(", ")})`
+    ),
+    joined: true
+  };
+}
+function providersToAdd(source, amendment) {
+  return (amendment.providers ?? []).filter(
+    (provider) => !(provider.unless && source.includes(provider.unless))
+  );
+}
+function keptProviders(source, amendment) {
+  return (amendment.providers ?? []).filter(
+    (provider) => provider.unless !== void 0 && source.includes(provider.unless)
+  );
+}
 function composeLines(amendment, importPath) {
+  const providers = amendment.providers ?? [];
+  const own = [amendment.symbol, ...providers.flatMap((provider) => provider.own ?? [])];
+  const shell = [
+    "providePlugins",
+    "provideCapabilityGrants",
+    "provideTranslationNamespaces",
+    ...providers.flatMap((provider) => provider.shell ?? [])
+  ];
   return [
-    `import { ${amendment.symbol} } from '${importPath}';`,
-    "import { providePlugins, provideCapabilityGrants, provideTranslationNamespaces } from '@loomweaver/shell';",
+    `import { ${own.join(", ")} } from '${importPath}';`,
+    `import { ${shell.join(", ")} } from '@loomweaver/shell';`,
+    ...providers.flatMap((provider) => provider.from ?? []).map((entry) => `import { ${entry.symbols.join(", ")} } from '${entry.path}';`),
+    ...providers.map((provider) => provider.line),
     `provideTranslationNamespaces('${amendment.id}'),`,
     `provideCapabilityGrants({ ${amendment.id}: [${amendment.capabilities.map((capability) => `'${capability}'`).join(", ")}] }),`,
     `...providePlugins(${amendment.symbol}),`
   ];
 }
-function withShellSymbols(existing) {
+function withShellSymbols(existing, providers) {
   const wanted = [
     "provideCapabilityGrants",
     "providePlugins",
-    "provideTranslationNamespaces"
+    "provideTranslationNamespaces",
+    ...providers.flatMap((provider) => provider.shell ?? [])
   ];
   const present = existing.split(",").map((symbol) => symbol.trim()).filter(Boolean);
   const missing = wanted.filter(
@@ -296,7 +346,8 @@ function describeAmendment(amendment) {
     return `Add an @source entry for '${amendment.sourceRoot}' to the application's entry stylesheet, resolved from that stylesheet. Without it none of that code's utilities are emitted.`;
   }
   if (amendment.kind === "compose-plugin") {
-    return `Register ${amendment.id} in the composition root: import { ${amendment.symbol} }, provideTranslationNamespaces('${amendment.id}'), provideCapabilityGrants({ ${amendment.id}: [${amendment.capabilities.map((capability) => `'${capability}'`).join(
+    const providers = (amendment.providers ?? []).map((provider) => provider.line.replace(/,$/, ""));
+    return `Register ${amendment.id} in the composition root: import { ${amendment.symbol} }, ${providers.map((line) => `${line}, `).join("")}provideTranslationNamespaces('${amendment.id}'), provideCapabilityGrants({ ${amendment.id}: [${amendment.capabilities.map((capability) => `'${capability}'`).join(
       ", "
     )}] }) and ...providePlugins(${amendment.symbol}). Without it none of its contributions appear.`;
   }
@@ -704,7 +755,7 @@ function pause(): Promise<void> {
 }
 
 // ../devkit/src/recipes/angular-weaver/agent-files.ts
-var AG_UI_ADAPTER_VERSION = "0.9.0";
+var AG_UI_ADAPTER_VERSION = "0.9.1";
 var AG_UI_PROTOCOL_VERSION = "0.0.x";
 function connectionFile(w) {
   return `import { signal } from '@angular/core';
@@ -1686,9 +1737,17 @@ var framePlugin = {
   }
 };
 
+// ../devkit/src/recipes/platform-version.ts
+var PLATFORM_VERSION = "0.9.1";
+
 // ../devkit/src/recipes/angular-distribution/amendments.ts
 function distributionAmendments(d) {
   return [
+    {
+      kind: "package",
+      name: "@loomweaver/frame-kit",
+      version: `^${PLATFORM_VERSION}`
+    },
     ...d.styles === "tailwind" ? [
       {
         kind: "postcss",
@@ -2226,6 +2285,7 @@ var angularDistribution = {
 };
 
 // ../devkit/src/recipes/auth-source/recipe.ts
+var SESSION_PLUGIN_ID = "session";
 function resolveAuthSourceInput(input) {
   if (!isKebabId(input.name)) {
     throw new Error(`Auth source name must be kebab-case (e.g. "dev"); got "${input.name}".`);
@@ -2233,9 +2293,13 @@ function resolveAuthSourceInput(input) {
   return {
     name: input.name,
     className: toPascalCase(input.name),
-    propertyName: toCamelCase(input.name)
+    propertyName: toCamelCase(input.name),
+    bare: input.bare ?? false
   };
 }
+function sessionPluginSymbol(a) {
+  return `${a.propertyName}SessionPlugin`;
+}
 function moduleFile(a) {
   return `// Provider-neutral AuthSource. LoomWeaver owns no authentication \u2014 it only reacts to
 // a session snapshot. Wire it with: provideAuthSource(() => ${a.propertyName}AuthSource()).
@@ -2274,11 +2338,177 @@ export function cycle${a.className}User(): void {
 }
 `;
 }
+function pluginFile2(a) {
+  return `// The verbs a user needs to operate the stand-in session: sign in, switch the account, sign
+// out, from a rail item whose menu carries them. This is presentation for a product that has no
+// backend yet; nothing here protects anything. Delete it once your own session arrives.
+import type { Disposable, Plugin, PluginContext } from '@loomweaver/plugin-sdk';
+import { cycle${a.className}User, ${a.propertyName}AuthSource } from './${a.name}-auth-source';
+
+const MENU = 'session.account/menu';
+const snapshot = ${a.propertyName}AuthSource();
+
+let drawn: Disposable[] = [];
+
+function signIn(): void {
+  if (!snapshot().authenticated) {
+    cycle${a.className}User();
+  }
+}
+
+function switchAccount(): void {
+  cycle${a.className}User();
+  if (!snapshot().authenticated) {
+    cycle${a.className}User();
+  }
+}
+
+function signOut(): void {
+  while (snapshot().authenticated) {
+    cycle${a.className}User();
+  }
+}
+
+function initialsOf(name: string): string {
+  return name
+    .split(' ')
+    .map((word) => word[0] ?? '')
+    .join('')
+    .slice(0, 2)
+    .toUpperCase();
+}
+
+function draw(ctx: PluginContext): void {
+  for (const part of drawn) {
+    part.dispose();
+  }
+  const current = snapshot();
+  const name = current.displayName ?? '';
+  drawn = [
+    ctx.registerRailItem({
+      id: 'session.account',
+      rail: 'primary',
+      icon: 'account',
+      title: current.authenticated ? name : 'session.signIn',
+      anchor: 'bottom',
+      order: 20,
+      menu: MENU,
+      menuTrigger: 'primary',
+      ...(current.authenticated ? { initials: initialsOf(name) } : {}),
+      menuHeader: current.authenticated
+        ? {
+            title: name,
+            detail: \`session.role.\${current.roles.includes('admin') ? 'admin' : 'user'}\`,
+            initials: initialsOf(name),
+          }
+        : { title: 'session.signedOut', icon: 'account' },
+    }),
+    ...(current.authenticated
+      ? [
+          ctx.registerMenuItem({
+            id: 'session.menu.switch',
+            menu: MENU,
+            command: 'session.switchAccount',
+            group: 'account',
+            order: 10,
+          }),
+          ctx.registerMenuItem({
+            id: 'session.menu.signOut',
+            menu: MENU,
+            command: 'session.signOut',
+            group: 'account',
+            order: 20,
+          }),
+        ]
+      : [
+          ctx.registerMenuItem({
+            id: 'session.menu.signIn',
+            menu: MENU,
+            command: 'session.signIn',
+            group: 'account',
+            order: 10,
+          }),
+        ]),
+  ];
+}
+
+export const ${sessionPluginSymbol(a)}: Plugin = {
+  manifest: { id: 'session', name: 'Account', capabilities: ['contributions'] },
+  activate(ctx) {
+    const then = (step: () => void) => () => {
+      step();
+      draw(ctx);
+    };
+    ctx.registerCommand({
+      id: 'session.signIn',
+      title: 'session.signIn',
+      icon: 'account',
+      access: { authenticated: false },
+      run: then(signIn),
+    });
+    ctx.registerCommand({
+      id: 'session.switchAccount',
+      title: 'session.switchAccount',
+      icon: 'account',
+      access: { authenticated: true },
+      run: then(switchAccount),
+    });
+    ctx.registerCommand({
+      id: 'session.signOut',
+      title: 'session.signOut',
+      icon: 'signOut',
+      access: { authenticated: true },
+      run: then(signOut),
+    });
+    draw(ctx);
+  },
+  deactivate() {
+    for (const part of drawn) {
+      part.dispose();
+    }
+    drawn = [];
+  },
+};
+`;
+}
+function indexFile2(a) {
+  return `export { cycle${a.className}User, ${a.propertyName}AuthSource } from './${a.name}-auth-source';
+export { ${sessionPluginSymbol(a)} } from './${a.name}-session.plugin';
+`;
+}
+var I18N = {
+  en: {
+    signIn: "Sign in",
+    switchAccount: "Switch account",
+    signOut: "Sign out",
+    signedOut: "Not signed in",
+    role: { user: "User", admin: "Administrator" }
+  },
+  de: {
+    signIn: "Anmelden",
+    switchAccount: "Konto wechseln",
+    signOut: "Abmelden",
+    signedOut: "Nicht angemeldet",
+    role: { user: "Benutzer", admin: "Administrator" }
+  }
+};
 var authSource = {
   id: "auth-source",
   build(input) {
     const a = resolveAuthSourceInput(input);
-    return { [`${a.name}-auth-source.ts`]: moduleFile(a) };
+    const source = { [`${a.name}-auth-source.ts`]: moduleFile(a) };
+    if (a.bare) {
+      return source;
+    }
+    return {
+      ...source,
+      [`${a.name}-session.plugin.ts`]: pluginFile2(a),
+      "index.ts": indexFile2(a),
+      "i18n/en.json": `${JSON.stringify(I18N.en, null, 2)}
+`,
+      "i18n/de.json": `${JSON.stringify(I18N.de, null, 2)}
+`
+    };
   }
 };
 
@@ -2543,6 +2773,54 @@ function weaverAmendments(input, where) {
   ];
 }
 
+// ../devkit/src/recipes/auth-source/recipe-amendments.ts
+function authSourceAmendments(input, where) {
+  const a = resolveAuthSourceInput(input);
+  const directory = normalizeProjectRoot(where ?? "");
+  if (a.bare || !directory) {
+    return [];
+  }
+  return [
+    {
+      kind: "build-target",
+      styles: [],
+      assets: [
+        {
+          glob: "**/*.json",
+          input: `${directory}/i18n`,
+          from: "workspace",
+          output: `i18n/${SESSION_PLUGIN_ID}`
+        }
+      ]
+    },
+    {
+      kind: "compose-plugin",
+      id: SESSION_PLUGIN_ID,
+      symbol: sessionPluginSymbol(a),
+      capabilities: ["contributions"],
+      sourceRoot: directory,
+      providers: [
+        {
+          line: `provideAuthSource(() => ${a.propertyName}AuthSource()),`,
+          shell: ["provideAuthSource"],
+          own: [`${a.propertyName}AuthSource`],
+          unless: "provideAuthSource("
+        },
+        {
+          line: "provideIcons({ account: heroUserCircle, signOut: heroArrowRightStartOnRectangle }),",
+          shell: ["provideIcons"],
+          from: [
+            {
+              path: "@ng-icons/heroicons/outline",
+              symbols: ["heroArrowRightStartOnRectangle", "heroUserCircle"]
+            }
+          ]
+        }
+      ]
+    }
+  ];
+}
+
 // ../devkit/src/lib/scaffolds/inputs.ts
 function weaverInput(values) {
   return {
@@ -2623,6 +2901,9 @@ var APP_OPTION = {
   description: "Application to drop into. Inferred when the workspace has exactly one.",
   workspaceOnly: true
 };
+function authSourceInput(values) {
+  return { name: str(values, "name") ?? "", bare: bool(values, "bare") };
+}
 var SCAFFOLDS = [
   {
     name: "weaver",
@@ -2780,7 +3061,7 @@ var SCAFFOLDS = [
   },
   {
     name: "auth-source",
-    summary: "a provider-neutral AuthSource that feeds the session",
+    summary: "a stand-in session a user can operate: the AuthSource, the sign-in, switch and sign-out verbs in the rail, composed in",
     options: [
       {
         name: "name",
@@ -2789,9 +3070,22 @@ var SCAFFOLDS = [
         required: true,
         pattern: ID_PATTERN
       },
-      APP_OPTION
+      {
+        name: "bare",
+        type: "boolean",
+        description: "Write the AuthSource alone, without the verbs, for a product that maps a session of its own onto it.",
+        default: false
+      },
+      APP_OPTION,
+      {
+        name: "directory",
+        type: "string",
+        description: "Where the files land, relative to the workspace root.",
+        workspaceOnly: true
+      }
     ],
-    build: (values) => generate(authSource, { name: str(values, "name") ?? "" })
+    build: (values) => generate(authSource, authSourceInput(values)),
+    amend: (values) => authSourceAmendments(authSourceInput(values), str(values, "directory"))
   },
   {
     name: "settings-store",
@@ -2850,6 +3144,8 @@ var SCAFFOLDS = [
 function findScaffold(name) {
   return SCAFFOLDS.find((scaffold2) => scaffold2.name === name);
 }
+
+// ../devkit/src/lib/scaffolds/surface.ts
 function portableOptions(scaffold2) {
   return scaffold2.options.filter((option) => !option.workspaceOnly);
 }
@@ -3709,7 +4005,11 @@ var Amender = class {
       file: root,
       display: this.displayName(root),
       added: [
-        `${amendment.symbol}, its translations and its capability grants`
+        `${amendment.symbol}, its translations and its capability grants`,
+        ...(amendment.providers ?? []).filter((provider) => !result.kept.includes(provider.line)).map((provider) => provider.line.replace(/,$/, "")),
+        ...result.kept.map(
+          (line) => `kept the ${line.split("(", 1)[0]} already there instead of ${line.replace(/,$/, "")}`
+        )
       ],
       content: result.source
     });
@@ -3929,7 +4229,7 @@ function replaceSymlinkEntry(absolute) {
 }
 
 // src/lib/run.ts
-var VERSION = "0.9.0";
+var VERSION = "0.9.1";
 function help() {
   const commands = SCAFFOLDS.map((s) => `  ${s.name.padEnd(16)}${s.summary}`);
   return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomweaver/cli",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "LoomWeaver: open-source plugin platform for Angular workbenches. The scaffolding CLI: generates weavers, distributions and integrations into any project, with no Nx workspace and no checkout required.",
   "keywords": [
     "loomweaver",