@uns-kit/cli 0.0.36 → 0.0.37

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Aljoša Vister
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Aljoša Vister
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,128 +1,128 @@
-# @uns-kit/cli
-
-Command line scaffolding tool for the UNS toolkit. It bootstraps a new project with `@uns-kit/core` preconfigured and ready to extend with additional plugins.
-
-## Prerequisites
-
-- Node.js 18 or newer (ES2022 runtime features)
-- A package manager such as `pnpm`, `npm`, or `yarn`
-- `git` available on PATH (required for `configure-devops`, used to initialize new projects automatically)
-
-## Usage
-
-```bash
-pnpm --package=@uns-kit/cli dlx uns-kit create my-uns-app
-# or with npx
-npx @uns-kit/cli create my-uns-app
-# or after installing globally
-npm install -g @uns-kit/cli
-uns-kit create my-uns-app
-```
-
-The command creates a new directory, copies the starter template, and pins `@uns-kit/core` to the currently published version. After the scaffold finishes:
-
-```bash
-cd my-uns-app
-pnpm install
-pnpm run dev
-```
-
-When `git` is available on your PATH the scaffold also initializes a fresh repository so you can commit immediately.
-
-## Commands
-
-- `uns-kit create <name>` – create a new UNS project in the specified directory.
-- `uns-kit configure [path] [features...]` – run multiple configure templates in sequence (`--all` applies every template).
-- `uns-kit configure-devops [path]` – add Azure DevOps tooling (dependencies, script, config) to an existing project.
-- `uns-kit configure-vscode [path]` – copy VS Code launch/workspace files into an existing project.
-- `uns-kit configure-codegen [path]` – scaffold GraphQL code generation and UNS refresh scripts.
-- `uns-kit configure-api [path]` – copy UNS API examples and add `@uns-kit/api`.
-- `uns-kit configure-cron [path]` – copy UNS cron examples and add `@uns-kit/cron`.
-- `uns-kit configure-temporal [path]` – copy UNS Temporal examples and add `@uns-kit/temporal`.
-- `uns-kit configure-python [path]` – copy Python gateway client scaffolding (no npm dependency required).
-- `uns-kit help` – display usage information.
-
-### Configure multiple features at once
-
-Chain several add-ons without running each subcommand manually:
-
-```bash
-uns-kit configure --all
-uns-kit configure ./apps/gateway devops vscode codegen
-```
-
-Mix and match feature names after an optional target directory. Use `--all` to apply every available template in one shot.
-
-### Configure Azure DevOps
-
-Run inside a scaffolded project to add the Azure DevOps pull-request tooling:
-
-```bash
-uns-kit configure-devops
-pnpm install
-pnpm run pull-request
-```
-
-The command prompts for your Azure DevOps organization/project, ensures the remote repository exists, and updates `config.json` along with the necessary dev dependencies.
-
-### Configure VS Code workspace
-
-```bash
-uns-kit configure-vscode
-```
-
-Copies `.vscode/launch.json` plus a baseline workspace file into the project. Existing files are never overwritten, making it safe to re-run after hand edits.
-
-### Configure GraphQL code generation
-
-```bash
-uns-kit configure-codegen
-pnpm install
-pnpm run codegen
-pnpm run refresh-uns
-```
-
-Adds `codegen.ts`, seeds `src/uns/` placeholder types, and wires the GraphQL Code Generator / `refresh-uns` script into `package.json`. After installing the new dev dependencies you can regenerate strongly-typed operations (`pnpm run codegen`) and rebuild UNS topics/tags from your environment (`pnpm run refresh-uns`).
-
-### Add UNS API scaffolding
-
-```bash
-uns-kit configure-api
-pnpm install
-```
-
-Copies API-oriented examples (under `src/examples/`) and adds `@uns-kit/api` to your project dependencies.
-
-### Add cron-based scaffolding
-
-```bash
-uns-kit configure-cron
-pnpm install
-```
-
-Adds cron-oriented example stubs and installs `@uns-kit/cron`.
-
-### Add Temporal scaffolding
-
-```bash
-uns-kit configure-temporal
-pnpm install
-```
-
-Copies Temporal example placeholders and installs `@uns-kit/temporal`.
-
-### Add Python gateway scaffolding
-
-```bash
-uns-kit configure-python
-```
-
-Copies the Python gateway client template (examples, scripts, requirements, proto) into your project so you can iterate on the gRPC gateway from Python alongside your TypeScript project.
-
-### Extend the Config Schema
-
-Edit `src/config/project.config.extension.ts` inside your generated project and run `pnpm run generate-config-schema`. This regenerates `config.schema.json` and `src/config/app-config.ts`, augmenting `@uns-kit/core`'s `AppConfig` so editors and runtime types stay in sync. If completions lag, reload the TypeScript server in your editor.
-
-## License
-
-MIT © Aljoša Vister
+# @uns-kit/cli
+
+Command line scaffolding tool for the UNS toolkit. It bootstraps a new project with `@uns-kit/core` preconfigured and ready to extend with additional plugins.
+
+## Prerequisites
+
+- Node.js 18 or newer (ES2022 runtime features)
+- A package manager such as `pnpm`, `npm`, or `yarn`
+- `git` available on PATH (required for `configure-devops`, used to initialize new projects automatically)
+
+## Usage
+
+```bash
+pnpm --package=@uns-kit/cli dlx uns-kit create my-uns-app
+# or with npx
+npx @uns-kit/cli create my-uns-app
+# or after installing globally
+npm install -g @uns-kit/cli
+uns-kit create my-uns-app
+```
+
+The command creates a new directory, copies the starter template, and pins `@uns-kit/core` to the currently published version. After the scaffold finishes:
+
+```bash
+cd my-uns-app
+pnpm install
+pnpm run dev
+```
+
+When `git` is available on your PATH the scaffold also initializes a fresh repository so you can commit immediately.
+
+## Commands
+
+- `uns-kit create <name>` – create a new UNS project in the specified directory.
+- `uns-kit configure [path] [features...]` – run multiple configure templates in sequence (`--all` applies every template).
+- `uns-kit configure-devops [path]` – add Azure DevOps tooling (dependencies, script, config) to an existing project.
+- `uns-kit configure-vscode [path]` – copy VS Code launch/workspace files into an existing project.
+- `uns-kit configure-codegen [path]` – scaffold GraphQL code generation and UNS refresh scripts.
+- `uns-kit configure-api [path]` – copy UNS API examples and add `@uns-kit/api`.
+- `uns-kit configure-cron [path]` – copy UNS cron examples and add `@uns-kit/cron`.
+- `uns-kit configure-temporal [path]` – copy UNS Temporal examples and add `@uns-kit/temporal`.
+- `uns-kit configure-python [path]` – copy Python gateway client scaffolding (no npm dependency required).
+- `uns-kit help` – display usage information.
+
+### Configure multiple features at once
+
+Chain several add-ons without running each subcommand manually:
+
+```bash
+uns-kit configure --all
+uns-kit configure ./apps/gateway devops vscode codegen
+```
+
+Mix and match feature names after an optional target directory. Use `--all` to apply every available template in one shot.
+
+### Configure Azure DevOps
+
+Run inside a scaffolded project to add the Azure DevOps pull-request tooling:
+
+```bash
+uns-kit configure-devops
+pnpm install
+pnpm run pull-request
+```
+
+The command prompts for your Azure DevOps organization/project, ensures the remote repository exists, and updates `config.json` along with the necessary dev dependencies.
+
+### Configure VS Code workspace
+
+```bash
+uns-kit configure-vscode
+```
+
+Copies `.vscode/launch.json` plus a baseline workspace file into the project. Existing files are never overwritten, making it safe to re-run after hand edits.
+
+### Configure GraphQL code generation
+
+```bash
+uns-kit configure-codegen
+pnpm install
+pnpm run codegen
+pnpm run refresh-uns
+```
+
+Adds `codegen.ts`, seeds `src/uns/` placeholder types, and wires the GraphQL Code Generator / `refresh-uns` script into `package.json`. After installing the new dev dependencies you can regenerate strongly-typed operations (`pnpm run codegen`) and rebuild UNS topics/tags from your environment (`pnpm run refresh-uns`).
+
+### Add UNS API scaffolding
+
+```bash
+uns-kit configure-api
+pnpm install
+```
+
+Copies API-oriented examples (under `src/examples/`) and adds `@uns-kit/api` to your project dependencies.
+
+### Add cron-based scaffolding
+
+```bash
+uns-kit configure-cron
+pnpm install
+```
+
+Adds cron-oriented example stubs and installs `@uns-kit/cron`.
+
+### Add Temporal scaffolding
+
+```bash
+uns-kit configure-temporal
+pnpm install
+```
+
+Copies Temporal example placeholders and installs `@uns-kit/temporal`.
+
+### Add Python gateway scaffolding
+
+```bash
+uns-kit configure-python
+```
+
+Copies the Python gateway client template (examples, scripts, requirements, proto) into your project so you can iterate on the gRPC gateway from Python alongside your TypeScript project.
+
+### Extend the Config Schema
+
+Edit `src/config/project.config.extension.ts` inside your generated project and run `pnpm run generate-config-schema`. This regenerates `config.schema.json` and `src/config/app-config.ts`, augmenting `@uns-kit/core`'s `AppConfig` so editors and runtime types stay in sync. If completions lag, reload the TypeScript server in your editor.
+
+## License
+
+MIT © Aljoša Vister

package/dist/index.js

@@ -1201,7 +1201,7 @@ function resolveUnsPackageSpecifier(packageName, relativeLocalPath) {
         return `workspace:^${version}`;
     }
     const version = resolveUnsPackageVersion(packageName, relativeLocalPath);
-    return `^${version}`;
+    return version === "latest" ? "latest" : `^${version}`;
 }
 function resolveUnsPackageVersion(packageName, relativeLocalPath) {
     const attempt = (factory) => {
@@ -1229,17 +1229,23 @@ function resolveUnsPackageVersion(packageName, relativeLocalPath) {
     }
     const cliDependencyVersion = attempt(() => {
         const cliPkg = require("../package.json");
-        const range = cliPkg.dependencies?.[packageName];
-        if (typeof range === "string") {
+        const pinned = cliPkg.unsKitPackages?.[packageName];
+        if (typeof pinned === "string" && pinned.trim()) {
+            return pinned.trim();
+        }
+        const ranges = [cliPkg.dependencies?.[packageName], cliPkg.devDependencies?.[packageName]].filter((range) => typeof range === "string");
+        for (const range of ranges) {
             const match = range.match(/\d+\.\d+\.\d+/);
-            return match?.[0];
+            if (match?.[0]) {
+                return match[0];
+            }
         }
         return undefined;
     });
     if (cliDependencyVersion) {
         return cliDependencyVersion;
     }
-    return "0.0.1";
+    return "latest";
 }
 function resolveCliVersion() {
     const attempt = (factory) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uns-kit/cli",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "description": "Command line scaffolding tool for UNS applications",
   "type": "module",
   "license": "MIT",
@@ -26,7 +26,13 @@
   ],
   "dependencies": {
     "azure-devops-node-api": "^15.1.1",
-    "@uns-kit/core": "0.0.36"
+    "@uns-kit/core": "0.0.37"
+  },
+  "unsKitPackages": {
+    "@uns-kit/core": "0.0.36",
+    "@uns-kit/api": "0.0.19",
+    "@uns-kit/cron": "0.0.18",
+    "@uns-kit/temporal": "0.0.18"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

package/templates/api/src/examples/api-example.ts

@@ -1,62 +1,62 @@
-/**
- * Change this file according to your specifications and rename it to index.ts
- */
-import { UnsProxyProcess, ConfigFile } from "@uns-kit/core.js";
-import { IApiProxyOptions } from "@uns-kit/core.js";
-import type { UnsEvents } from "@uns-kit/core.js";
-import "@uns-kit/api";
-import { type UnsProxyProcessWithApi } from "@uns-kit/api.js";
-
-/**
- * Load the configuration from a file.
- * On the server, this file is provided by the `uns-datahub-controller`.
- * In the development environment, you are responsible for creating and maintaining this file and its contents.
- */
-const config = await ConfigFile.loadConfig();
-
-/**
- * Connect to the API proxy process
- */
-const unsProxyProcess = new UnsProxyProcess(config.infra.host!, {processName: config.uns.processName}) as UnsProxyProcessWithApi;
-const apiOptions: IApiProxyOptions = config.uns?.jwksWellKnownUrl
-  ? {
-      jwks: {
-        wellKnownJwksUrl: config.uns.jwksWellKnownUrl,
-        activeKidUrl: config.uns.kidWellKnownUrl,
-      },
-    }
-  : {
-      jwtSecret: "CHANGEME",
-    };
-const apiInput = await unsProxyProcess.createApiProxy("templateUnsApiInput", apiOptions);
-
-/**
- * Register an API endpoint and event handler
- */
-apiInput.get("example/", "summary-1",{
-  tags: ["Tag1"],
-  apiDescription: "Test API endpoint 1",
-  queryParams: [
-    { name: "filter", type: "string", required: true, description: "Filter za podatke" },
-    { name: "limit", type: "number", required: false, description: "Koliko podatkov želiš" },
-  ]
-}); 
-
-apiInput.get("example/", "summary-2",{
-  tags: ["Tag2"],
-  apiDescription: "Test API endpoint 2",
-  queryParams: [
-    { name: "filter", type: "string", required: true, description: "Filter za podatke" },
-    { name: "limit", type: "number", required: false, description: "Koliko podatkov želiš" },
-  ]
-});
-
-apiInput.event.on("apiGetEvent", (event: UnsEvents["apiGetEvent"]) => {
-  try {
-    const appContext = event.req.appContext;
-    // Add SQL query or any other code here
-    event.res.send("OK");
-  } catch (error) {
-    event.res.status(400).send("Error");
-  }    
-});
+/**
+ * Change this file according to your specifications and rename it to index.ts
+ */
+import { UnsProxyProcess, ConfigFile } from "@uns-kit/core";
+import { IApiProxyOptions } from "@uns-kit/core";
+import type { UnsEvents } from "@uns-kit/core";
+import "@uns-kit/api";
+import { type UnsProxyProcessWithApi } from "@uns-kit/api.js";
+
+/**
+ * Load the configuration from a file.
+ * On the server, this file is provided by the `uns-datahub-controller`.
+ * In the development environment, you are responsible for creating and maintaining this file and its contents.
+ */
+const config = await ConfigFile.loadConfig();
+
+/**
+ * Connect to the API proxy process
+ */
+const unsProxyProcess = new UnsProxyProcess(config.infra.host!, {processName: config.uns.processName}) as UnsProxyProcessWithApi;
+const apiOptions: IApiProxyOptions = config.uns?.jwksWellKnownUrl
+  ? {
+      jwks: {
+        wellKnownJwksUrl: config.uns.jwksWellKnownUrl,
+        activeKidUrl: config.uns.kidWellKnownUrl,
+      },
+    }
+  : {
+      jwtSecret: "CHANGEME",
+    };
+const apiInput = await unsProxyProcess.createApiProxy("templateUnsApiInput", apiOptions);
+
+/**
+ * Register an API endpoint and event handler
+ */
+apiInput.get("example/", "summary-1",{
+  tags: ["Tag1"],
+  apiDescription: "Test API endpoint 1",
+  queryParams: [
+    { name: "filter", type: "string", required: true, description: "Filter za podatke" },
+    { name: "limit", type: "number", required: false, description: "Koliko podatkov želiš" },
+  ]
+}); 
+
+apiInput.get("example/", "summary-2",{
+  tags: ["Tag2"],
+  apiDescription: "Test API endpoint 2",
+  queryParams: [
+    { name: "filter", type: "string", required: true, description: "Filter za podatke" },
+    { name: "limit", type: "number", required: false, description: "Koliko podatkov želiš" },
+  ]
+});
+
+apiInput.event.on("apiGetEvent", (event: UnsEvents["apiGetEvent"]) => {
+  try {
+    const appContext = event.req.appContext;
+    // Add SQL query or any other code here
+    event.res.send("OK");
+  } catch (error) {
+    event.res.status(400).send("Error");
+  }    
+});

package/templates/azure-pipelines.yml

@@ -1,21 +1,21 @@
-variables:
-  privatePool: 'Azure private pool'
-
-trigger:
-- master
-
-stages:
-- stage: version_tag
-  displayName: Add Version Tag
-  pool: $(privatePool)
-  jobs:
-  - job: add_tags
-    steps:
-    - checkout: self
-      persistCredentials: true
-      clean: true
-    - script: |
-        tag=$(node -pe "require('./package.json').version")
-        git tag $tag
-        git push origin $tag
-      displayName: "Add version tag from package.json"
+variables:
+  privatePool: 'Azure private pool'
+
+trigger:
+- master
+
+stages:
+- stage: version_tag
+  displayName: Add Version Tag
+  pool: $(privatePool)
+  jobs:
+  - job: add_tags
+    steps:
+    - checkout: self
+      persistCredentials: true
+      clean: true
+    - script: |
+        tag=$(node -pe "require('./package.json').version")
+        git tag $tag
+        git push origin $tag
+      displayName: "Add version tag from package.json"

package/templates/codegen/codegen.ts

@@ -1,15 +1,15 @@
-import type { CodegenConfig } from '@graphql-codegen/cli';
-import { ConfigFile } from '@uns-kit/core.js';
-
-const appConfig = await ConfigFile.loadConfig();
-
-const config: CodegenConfig = {
-  schema: appConfig.uns.graphql,
-  generates: {
-    'src/graphql/schema.ts': {
-      plugins: ['typescript', 'typescript-operations', 'typescript-resolvers'],
-    },
-  },
-};
-
-export default config;
+import type { CodegenConfig } from '@graphql-codegen/cli';
+import { ConfigFile } from '@uns-kit/core';
+
+const appConfig = await ConfigFile.loadConfig();
+
+const config: CodegenConfig = {
+  schema: appConfig.uns.graphql,
+  generates: {
+    'src/graphql/schema.ts': {
+      plugins: ['typescript', 'typescript-operations', 'typescript-resolvers'],
+    },
+  },
+};
+
+export default config;

package/templates/codegen/src/uns/uns-tags.ts

@@ -1 +1 @@
-export type UnsTags = string & {};
+export type UnsTags = string & {};

package/templates/codegen/src/uns/uns-topics.ts

@@ -1 +1 @@
-export type UnsTopics = string & {};
+export type UnsTopics = string & {};

package/templates/config-files/config-docker.json

@@ -1,27 +1,27 @@
-{
-  "uns": {
-    "graphql": "http://uns-datahub-controller:3200/graphql",
-    "rest": "http://uns-datahub-controller:3200/api",
-    "processName": "__APP_NAME__",
-    "instanceMode": "wait",
-    "handover": true,
-    "jwksWellKnownUrl": "http://uns-datahub-controller:3200/api/.well-known/jwks.json",
-    "kidWellKnownUrl": "http://uns-datahub-controller:3200/api/.well-known/kid",
-    "email": "user@example-org.com",
-    "password": "secret"
-  },
-  "infra": {
-    "host": "mosquitto:1883"
-  },
-  "output": {
-    "host": "mosquitto:1883"
-  },
-  "input": {
-    "host": "mosquitto:1883"
-  },
-  "devops": {
-    "provider": "azure-devops",
-    "organization": "example-org",
-    "project": "example-project"
-  }
+{
+  "uns": {
+    "graphql": "http://uns-datahub-controller:3200/graphql",
+    "rest": "http://uns-datahub-controller:3200/api",
+    "processName": "__APP_NAME__",
+    "instanceMode": "wait",
+    "handover": true,
+    "jwksWellKnownUrl": "http://uns-datahub-controller:3200/api/.well-known/jwks.json",
+    "kidWellKnownUrl": "http://uns-datahub-controller:3200/api/.well-known/kid",
+    "email": "user@example-org.com",
+    "password": "secret"
+  },
+  "infra": {
+    "host": "mosquitto:1883"
+  },
+  "output": {
+    "host": "mosquitto:1883"
+  },
+  "input": {
+    "host": "mosquitto:1883"
+  },
+  "devops": {
+    "provider": "azure-devops",
+    "organization": "example-org",
+    "project": "example-project"
+  }
 }