systemlink-cli 1.25.0__tar.gz → 1.26.0__tar.gz

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.25.0
+Version: 1.26.0
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.25.0"
+version = "1.26.0"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/_version.py

@@ -1,4 +1,4 @@
 """Version information for slcli."""
 
 # This file is auto-generated. Do not edit manually.
-__version__ = "1.25.0"
+__version__ = "1.26.0"

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/config_click.py

@@ -179,10 +179,7 @@ def _trust_certificate_if_requested(
 
     try:
         save_managed_certificate(certificate)
-        if auth_scheme == "bearer":
-            retry_status = check_web_server_auth(url, credential, auth_scheme=auth_scheme)
-        else:
-            retry_status = check_service_status(url, credential, auth_scheme=auth_scheme)
+        retry_status = check_service_status(url, credential, auth_scheme=auth_scheme)
     except (OSError, ValueError) as exc:
         _exit_with_validation_error(
             f"Could not save the trusted certificate: {exc}. Profile was not saved.",
@@ -306,10 +303,10 @@ def _add_profile_impl(
 
     assert isinstance(api_key, str)
 
-    # Validate PKCE against the Web Server identity route; API-key login retains API probes.
+    # PKCE uses the Web URL for bearer service probes; API-key login uses the API URL.
     click.echo("Checking server connectivity and services...")
     if auth_mode == "pkce":
-        status = check_web_server_auth(web_url, api_key, auth_scheme="bearer")
+        status = check_service_status(web_url, api_key, auth_scheme="bearer")
     else:
         status = check_service_status(url, api_key)
 

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/platform.py

@@ -422,7 +422,7 @@ def _get_service_status_snapshot(force_refresh: bool = False) -> Optional[Dict[s
 
     _, api_url, credential, auth_scheme = api_context
     if auth_scheme == "bearer":
-        status = check_web_server_auth(api_url, credential, auth_scheme)
+        status = check_service_status(api_url, credential, auth_scheme)
     else:
         status = check_service_status(api_url, credential)
     _save_service_status_snapshot(api_context, status)

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/skills/slcli/references/webapp/angular-ui-packages.md

@@ -154,7 +154,7 @@ Published Spright icon directives currently include:
 
 ### `@ni/ok-angular`
 
-Published Angular wrappers in `@ni/ok-angular@2.5.0` currently include:
+Published Angular wrappers in `@ni/ok-angular@2.5.4` currently include:
 
 | Tag                         | Angular symbol                | Import path                             | Use                                          |
 | --------------------------- | ----------------------------- | --------------------------------------- | -------------------------------------------- |

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/skills/slcli/references/webapp/overview.md

@@ -77,11 +77,11 @@ For the currently supported path, standardize on:
 
 - Angular 20.x
 - Node 24+
-- `@ni/nimble-angular` 33.4.x
+- `@ni/nimble-angular` 33.5.x
 - `@ni/nimble-components` 35.12.x
 - `@ni/unit-format` 1.0.5+
 - `@ni/spright-angular` 9.5.x
-- `@ni/ok-angular` 2.5.0+
+- `@ni/ok-angular` 2.5.4+
 - `@ni/systemlink-clients-ts` 3.0.2
 - `@angular/build` for the hosted application builder
 - `@angular/localize` installed and added to build polyfills

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/webapp_bootstrap.py

@@ -28,18 +28,19 @@ _WEBAPP_DEFAULT_FEATURE_PACKS = "nimble,clients,ok"
 _WEBAPP_SUPPORTED_ANGULAR_MAJOR = "20"
 _WEBAPP_VERSION_MANIFEST: Dict[str, Dict[str, str]] = {
     "20": {
-        "angular": "^20.3.26",
+        "angular": "^20.3.29",
         "typescript": "~5.9.3",
         "zoneJs": "~0.15.1",
         "rxjs": "~7.8.2",
         "tslib": "^2.8.1",
-        "angularBuild": "^20.3.32",
-        "nimbleAngular": "~33.4.4",
-        "nimbleComponents": "~35.12.3",
-        "okAngular": "2.5.0",
+        "angularBuild": "^20.3.34",
+        "cyclonedxNpm": "~6.0.1",
+        "nimbleAngular": "~33.5.0",
+        "nimbleComponents": "~35.12.7",
+        "okAngular": "2.5.4",
         "unitFormat": "^1.0.5",
         "systemlinkClients": "3.0.2",
-        "sprightAngular": "9.5.5",
+        "sprightAngular": "9.5.9",
         "nodeEngine": ">=24",
     }
 }
@@ -775,6 +776,7 @@ This app was generated by `slcli webapp new {app_name}` as a hosted Angular 20 s
 - `@angular/localize/init` configured for the build polyfill path
 - Nimble fonts imported in `src/styles.scss`
 - modern Angular application builders configured for the hosted scaffold
+- CycloneDX npm generator for a runtime dependency SBOM
 - initial bundle warning budget tuned for the included starter shell
 - shared loading, error, and empty states
 - SystemLink context and theme sync services under `src/app/core/systemlink/`
@@ -788,9 +790,16 @@ This app was generated by `slcli webapp new {app_name}` as a hosted Angular 20 s
 
 ```bash
 npm install
+npm run sbom
 npm run build
 ```
 
+`npm run sbom` writes a runtime-only CycloneDX document to the project-root
+`sbom.cdx.json`, outside `dist/`. Development-marked packages are removed after
+CycloneDX generation. The `webapp new` command runs it automatically after installing dependencies. Use
+`--skip-install` when you want to generate files without installing dependencies
+or creating the SBOM yet.
+
 The generated scaffold intentionally omits a default test runner setup so `npm install`
 does not pull in the deprecated Karma/Jasmine stack. Add your preferred test tooling when
 you start writing app-specific tests.
@@ -910,6 +919,7 @@ def _base_angular_dev_dependencies(angular_major: str) -> Dict[str, str]:
         "@angular/cli": angular_version,
         "@angular/compiler-cli": angular_version,
         "@angular/localize": angular_version,
+        "@cyclonedx/cyclonedx-npm": manifest["cyclonedxNpm"],
         "typescript": manifest["typescript"],
     }
 
@@ -959,6 +969,11 @@ def _customize_generated_package_json(
     package_json["scripts"] = {
         "start": "ng serve --host 0.0.0.0",
         "build": "ng build",
+        "sbom": (
+            "cyclonedx-npm --omit dev --output-format JSON "
+            "--output-file sbom.cdx.json --validate --output-reproducible "
+            "&& node scripts/filter-sbom.js sbom.cdx.json"
+        ),
         "publish:webapp": _publish_command_for_directory(
             project_name, publish_name, workspace_name
         ),
@@ -1098,6 +1113,7 @@ def _emit_webapp_new_dry_run(
     click.echo("    - Nimble fonts in src/styles.scss")
     click.echo("    - @angular/build application builder with inlineCritical disabled")
     click.echo("    - hash routing enabled unless --routing path is requested")
+    click.echo("    - runtime-only CycloneDX SBOM generated after npm install")
 
 
 def _generate_new_webapp(
@@ -1191,6 +1207,7 @@ def _generate_new_webapp(
 
     if not skip_install:
         _run_webapp_local_command(target_dir, ["npm", "install"], "npm install")
+        _run_webapp_local_command(target_dir, ["npm", "run", "sbom"], "npm run sbom")
         _run_webapp_local_command(target_dir, ["npm", "run", "build"], "npm run build")
 
     result_data: Dict[str, Any] = {
@@ -1202,9 +1219,9 @@ def _generate_new_webapp(
         ),
     }
     if skip_install:
-        result_data["Validation"] = "Skipped npm install and npm run build"
+        result_data["Validation"] = "Skipped npm install, npm run sbom, and npm run build"
     else:
-        result_data["Validation"] = "npm run build passed"
+        result_data["Validation"] = "npm run sbom and npm run build passed"
     if plugin_manager:
         result_data["Pack command"] = "npm run pack:webapp"
 

{systemlink_cli-1.25.0 → systemlink_cli-1.26.0}/slcli/webapp_templates/angular/blank/README.md

@@ -13,6 +13,7 @@ This app was generated by `slcli webapp new {{APP_NAME}}` as a hosted Angular 20
 - `@angular/localize/init` configured for the build polyfill path
 - Nimble fonts imported in `src/styles.scss`
 - modern Angular application builders configured for the hosted scaffold
+- CycloneDX npm generator for a runtime dependency SBOM
 - initial bundle warning budget tuned for the included six-route starter shell
 - shared loading, error, and empty states
 - SystemLink context and theme sync services under `src/app/core/systemlink/`
@@ -43,9 +44,16 @@ src/
 
 ```bash
 npm install
+npm run sbom
 npm run build
 ```
 
+`npm run sbom` writes a runtime-only CycloneDX document to the project-root
+`sbom.cdx.json`, outside `dist/`. Development-marked packages are removed after
+CycloneDX generation. The `webapp new` command runs it automatically after installing dependencies. Use
+`--skip-install` when you want to generate files without installing dependencies
+or creating the SBOM yet.
+
 The generated scaffold intentionally omits a default test runner setup so `npm install`
 does not pull in the deprecated Karma/Jasmine stack. Add your preferred test tooling when
 you start writing app-specific tests.

systemlink_cli-1.26.0/slcli/webapp_templates/angular/blank/scripts/filter-sbom.js

@@ -0,0 +1,54 @@
+const fs = require("fs");
+
+const inputPath = process.argv[2] || "sbom.cdx.json";
+const bom = JSON.parse(fs.readFileSync(inputPath, "utf8"));
+
+function collectComponentRefs(component, refs) {
+  if (component["bom-ref"]) {
+    refs.add(component["bom-ref"]);
+  }
+
+  for (const child of component.components || []) {
+    collectComponentRefs(child, refs);
+  }
+}
+
+function collectDevelopmentRefs(components, refs) {
+  for (const component of components || []) {
+    const isDevelopment =
+      (component.properties || []).some(
+        (property) =>
+          property.name === "cdx:npm:package:development" && property.value === "true",
+      );
+
+    if (isDevelopment) {
+      collectComponentRefs(component, refs);
+    } else {
+      collectDevelopmentRefs(component.components, refs);
+    }
+  }
+}
+
+function filterComponents(components, refs) {
+  return (components || [])
+    .filter((component) => !refs.has(component["bom-ref"]))
+    .map((component) => ({
+      ...component,
+      ...(component.components
+        ? { components: filterComponents(component.components, refs) }
+        : {}),
+    }));
+}
+
+const developmentRefs = new Set();
+collectDevelopmentRefs(bom.components, developmentRefs);
+
+bom.components = filterComponents(bom.components, developmentRefs);
+bom.dependencies = (bom.dependencies || [])
+  .filter((dependency) => !developmentRefs.has(dependency.ref))
+  .map((dependency) => ({
+    ...dependency,
+    dependsOn: (dependency.dependsOn || []).filter((ref) => !developmentRefs.has(ref)),
+  }));
+
+fs.writeFileSync(inputPath, `${JSON.stringify(bom, null, 2)}\n`);