@kapeta/local-cluster-service 0.70.7 → 0.70.8

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.70.8](https://github.com/kapetacom/local-cluster-service/compare/v0.70.7...v0.70.8) (2024-09-12)
+
+
+### Bug Fixes
+
+* use language-target-html if pre-existing systemId is specified ([0a38e0c](https://github.com/kapetacom/local-cluster-service/commit/0a38e0cb384a0954269c1b00ee1ef6660f979e42))
+
 ## [0.70.7](https://github.com/kapetacom/local-cluster-service/compare/v0.70.6...v0.70.7) (2024-09-12)
 
 

package/dist/cjs/src/storm/codegen.d.ts

@@ -12,7 +12,8 @@ export declare class StormCodegen {
     private readonly events;
     private tmpDir;
     private readonly conversationId;
-    constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
+    private readonly uiSystemId?;
+    constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[], uiSystemId?: string);
     setTmpDir(tmpDir: string): void;
     process(): Promise<void>;
     isAborted(): boolean;

package/dist/cjs/src/storm/codegen.js

@@ -47,6 +47,7 @@ const yaml_1 = __importDefault(require("yaml"));
 const predefined_1 = require("./predefined");
 const archetype_1 = require("./archetype");
 const lodash_1 = __importDefault(require("lodash"));
+const page_utils_1 = require("./page-utils");
 const SIMULATED_DELAY = 1000;
 const ENABLE_SIMULATED_DELAY = false;
 class SimulatedFileDelay {
@@ -100,12 +101,14 @@ class StormCodegen {
     events;
     tmpDir;
     conversationId;
-    constructor(conversationId, userPrompt, blocks, events) {
+    uiSystemId;
+    constructor(conversationId, userPrompt, blocks, events, uiSystemId) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
         this.tmpDir = path_2.default.join(node_os_1.default.tmpdir(), conversationId);
         this.conversationId = conversationId;
+        this.uiSystemId = uiSystemId;
     }
     setTmpDir(tmpDir) {
         this.tmpDir = tmpDir;
@@ -794,6 +797,9 @@ class StormCodegen {
         const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
+        if (this.uiSystemId) {
+            codeGenerator.withOption('AIStaticFiles', (0, page_utils_1.getSystemBaseDir)(this.uiSystemId));
+        }
         const generatedResult = await codeGenerator.generate();
         new codegen_1.CodeWriter(basePath).write(generatedResult);
         return generatedResult;

package/dist/cjs/src/storm/event-parser.d.ts

@@ -26,6 +26,7 @@ export interface StormOptions {
     serviceLanguage: string;
     frontendKind: string;
     frontendLanguage: string;
+    htmlLanguage: string;
     exchangeKind: string;
     queueKind: string;
     publisherKind: string;
@@ -39,7 +40,8 @@ export interface StormOptions {
     desktopKind: string;
     desktopLanguage: string;
     gatewayKind: string;
-    [key: string]: string;
+    systemId?: string;
+    [key: string]: string | undefined;
 }
 export declare function createPhaseStartEvent(type: StormEventPhaseType): StormEventPhases;
 export declare function createPhaseEndEvent(type: StormEventPhaseType): StormEventPhases;

package/dist/cjs/src/storm/event-parser.js

@@ -67,6 +67,7 @@ async function resolveOptions() {
     const javaLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-java-spring-boot');
     const reactLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-react-ts');
     const nodejsLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-nodejs');
+    const htmlLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-html');
     const blockTypePubsub = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/block-type-pubsub');
     const resourceTypePubsubSubscriber = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/resource-type-pubsub-subscriber');
     const resourceTypePubsubSubscription = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/resource-type-pubsub-subscription');
@@ -83,6 +84,7 @@ async function resolveOptions() {
         !postgresResource ||
         !javaLanguage ||
         !reactLanguage ||
+        !htmlLanguage ||
         !webPageResource ||
         !restApiResource ||
         !restClientResource ||
@@ -105,6 +107,7 @@ async function resolveOptions() {
         serviceLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${javaLanguage.definition.metadata.name}:${javaLanguage.version}`),
         frontendKind: (0, nodejs_utils_1.normalizeKapetaUri)(`${blockTypeFrontend.definition.metadata.name}:${blockTypeFrontend.version}`),
         frontendLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${reactLanguage.definition.metadata.name}:${reactLanguage.version}`),
+        htmlLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${htmlLanguage.definition.metadata.name}:${htmlLanguage.version}`),
         cliKind: (0, nodejs_utils_1.normalizeKapetaUri)(`${blockTypeCli.definition.metadata.name}:${blockTypeCli.version}`),
         cliLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${nodejsLanguage.definition.metadata.name}:${nodejsLanguage.version}`),
         desktopKind: (0, nodejs_utils_1.normalizeKapetaUri)(`${blockTypeDesktop.definition.metadata.name}:${blockTypeDesktop.version}`),
@@ -770,7 +773,7 @@ class StormEventParser {
             case 'CLI':
                 return this.options.cliLanguage;
             case 'FRONTEND':
-                return this.options.frontendLanguage;
+                return this.options.systemId ? this.options.htmlLanguage : this.options.frontendLanguage;
             case 'DESKTOP':
                 return this.options.desktopLanguage;
         }
@@ -791,7 +794,7 @@ class StormEventParser {
             for (const prop in options) {
                 if (options.hasOwnProperty(prop)) {
                     const value = options[prop];
-                    if (value.indexOf(kind) > 0) {
+                    if (typeof value === 'string' && value.indexOf(kind) > 0) {
                         return value;
                     }
                 }

package/dist/cjs/src/storm/routes.js

@@ -501,8 +501,9 @@ router.post('/ui/get-vote', async (req, res) => {
 });
 router.post('/:handle/all', async (req, res) => {
     const handle = req.params.handle;
+    const systemId = req.query.systemId ?? undefined;
     try {
-        const stormOptions = await (0, event_parser_1.resolveOptions)();
+        const stormOptions = { ...(await (0, event_parser_1.resolveOptions)()), systemId: systemId };
         const eventParser = new event_parser_1.StormEventParser(stormOptions);
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
@@ -571,7 +572,7 @@ router.post('/:handle/all', async (req, res) => {
         if (!req.query.skipCodegen) {
             try {
                 sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENTATION));
-                const stormCodegen = new codegen_1.StormCodegen(metaStream.getConversationId(), aiRequest.prompt, result.blocks, eventParser.getEvents());
+                const stormCodegen = new codegen_1.StormCodegen(metaStream.getConversationId(), aiRequest.prompt, result.blocks, eventParser.getEvents(), systemId);
                 onRequestAborted(req, res, () => {
                     stormCodegen.abort();
                 });

package/dist/cjs/test/storm/event-parser.test.d.ts

@@ -7,6 +7,7 @@ export declare const parserOptions: {
     serviceLanguage: string;
     frontendKind: string;
     frontendLanguage: string;
+    htmlLanguage: string;
     cliKind: string;
     cliLanguage: string;
     desktopKind: string;

package/dist/cjs/test/storm/event-parser.test.js

@@ -19,6 +19,7 @@ exports.parserOptions = {
     serviceLanguage: 'kapeta/language-target-java-spring-boot:local',
     frontendKind: 'kapeta/block-type-frontend:local',
     frontendLanguage: 'kapeta/language-target-react-ts:local',
+    htmlLanguage: 'kapeta/language-target-html:local',
     cliKind: 'kapeta/block-type-cli:local',
     cliLanguage: 'kapeta/language-target-nodejs-ts:local',
     desktopKind: 'kapeta/block-type-desktop:local',

package/dist/esm/src/storm/codegen.d.ts

@@ -12,7 +12,8 @@ export declare class StormCodegen {
     private readonly events;
     private tmpDir;
     private readonly conversationId;
-    constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
+    private readonly uiSystemId?;
+    constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[], uiSystemId?: string);
     setTmpDir(tmpDir: string): void;
     process(): Promise<void>;
     isAborted(): boolean;

package/dist/esm/src/storm/codegen.js

@@ -47,6 +47,7 @@ const yaml_1 = __importDefault(require("yaml"));
 const predefined_1 = require("./predefined");
 const archetype_1 = require("./archetype");
 const lodash_1 = __importDefault(require("lodash"));
+const page_utils_1 = require("./page-utils");
 const SIMULATED_DELAY = 1000;
 const ENABLE_SIMULATED_DELAY = false;
 class SimulatedFileDelay {
@@ -100,12 +101,14 @@ class StormCodegen {
     events;
     tmpDir;
     conversationId;
-    constructor(conversationId, userPrompt, blocks, events) {
+    uiSystemId;
+    constructor(conversationId, userPrompt, blocks, events, uiSystemId) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
         this.tmpDir = path_2.default.join(node_os_1.default.tmpdir(), conversationId);
         this.conversationId = conversationId;
+        this.uiSystemId = uiSystemId;
     }
     setTmpDir(tmpDir) {
         this.tmpDir = tmpDir;
@@ -794,6 +797,9 @@ class StormCodegen {
         const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
+        if (this.uiSystemId) {
+            codeGenerator.withOption('AIStaticFiles', (0, page_utils_1.getSystemBaseDir)(this.uiSystemId));
+        }
         const generatedResult = await codeGenerator.generate();
         new codegen_1.CodeWriter(basePath).write(generatedResult);
         return generatedResult;

package/dist/esm/src/storm/event-parser.d.ts

@@ -26,6 +26,7 @@ export interface StormOptions {
     serviceLanguage: string;
     frontendKind: string;
     frontendLanguage: string;
+    htmlLanguage: string;
     exchangeKind: string;
     queueKind: string;
     publisherKind: string;
@@ -39,7 +40,8 @@ export interface StormOptions {
     desktopKind: string;
     desktopLanguage: string;
     gatewayKind: string;
-    [key: string]: string;
+    systemId?: string;
+    [key: string]: string | undefined;
 }
 export declare function createPhaseStartEvent(type: StormEventPhaseType): StormEventPhases;
 export declare function createPhaseEndEvent(type: StormEventPhaseType): StormEventPhases;

package/dist/esm/src/storm/event-parser.js

@@ -67,6 +67,7 @@ async function resolveOptions() {
     const javaLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-java-spring-boot');
     const reactLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-react-ts');
     const nodejsLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-nodejs');
+    const htmlLanguage = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/language-target-html');
     const blockTypePubsub = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/block-type-pubsub');
     const resourceTypePubsubSubscriber = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/resource-type-pubsub-subscriber');
     const resourceTypePubsubSubscription = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/resource-type-pubsub-subscription');
@@ -83,6 +84,7 @@ async function resolveOptions() {
         !postgresResource ||
         !javaLanguage ||
         !reactLanguage ||
+        !htmlLanguage ||
         !webPageResource ||
         !restApiResource ||
         !restClientResource ||
@@ -105,6 +107,7 @@ async function resolveOptions() {
         serviceLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${javaLanguage.definition.metadata.name}:${javaLanguage.version}`),
         frontendKind: (0, nodejs_utils_1.normalizeKapetaUri)(`${blockTypeFrontend.definition.metadata.name}:${blockTypeFrontend.version}`),
         frontendLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${reactLanguage.definition.metadata.name}:${reactLanguage.version}`),
+        htmlLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${htmlLanguage.definition.metadata.name}:${htmlLanguage.version}`),
         cliKind: (0, nodejs_utils_1.normalizeKapetaUri)(`${blockTypeCli.definition.metadata.name}:${blockTypeCli.version}`),
         cliLanguage: (0, nodejs_utils_1.normalizeKapetaUri)(`${nodejsLanguage.definition.metadata.name}:${nodejsLanguage.version}`),
         desktopKind: (0, nodejs_utils_1.normalizeKapetaUri)(`${blockTypeDesktop.definition.metadata.name}:${blockTypeDesktop.version}`),
@@ -770,7 +773,7 @@ class StormEventParser {
             case 'CLI':
                 return this.options.cliLanguage;
             case 'FRONTEND':
-                return this.options.frontendLanguage;
+                return this.options.systemId ? this.options.htmlLanguage : this.options.frontendLanguage;
             case 'DESKTOP':
                 return this.options.desktopLanguage;
         }
@@ -791,7 +794,7 @@ class StormEventParser {
             for (const prop in options) {
                 if (options.hasOwnProperty(prop)) {
                     const value = options[prop];
-                    if (value.indexOf(kind) > 0) {
+                    if (typeof value === 'string' && value.indexOf(kind) > 0) {
                         return value;
                     }
                 }

package/dist/esm/src/storm/routes.js

@@ -501,8 +501,9 @@ router.post('/ui/get-vote', async (req, res) => {
 });
 router.post('/:handle/all', async (req, res) => {
     const handle = req.params.handle;
+    const systemId = req.query.systemId ?? undefined;
     try {
-        const stormOptions = await (0, event_parser_1.resolveOptions)();
+        const stormOptions = { ...(await (0, event_parser_1.resolveOptions)()), systemId: systemId };
         const eventParser = new event_parser_1.StormEventParser(stormOptions);
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
@@ -571,7 +572,7 @@ router.post('/:handle/all', async (req, res) => {
         if (!req.query.skipCodegen) {
             try {
                 sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENTATION));
-                const stormCodegen = new codegen_1.StormCodegen(metaStream.getConversationId(), aiRequest.prompt, result.blocks, eventParser.getEvents());
+                const stormCodegen = new codegen_1.StormCodegen(metaStream.getConversationId(), aiRequest.prompt, result.blocks, eventParser.getEvents(), systemId);
                 onRequestAborted(req, res, () => {
                     stormCodegen.abort();
                 });

package/dist/esm/test/storm/event-parser.test.d.ts

@@ -7,6 +7,7 @@ export declare const parserOptions: {
     serviceLanguage: string;
     frontendKind: string;
     frontendLanguage: string;
+    htmlLanguage: string;
     cliKind: string;
     cliLanguage: string;
     desktopKind: string;

package/dist/esm/test/storm/event-parser.test.js

@@ -19,6 +19,7 @@ exports.parserOptions = {
     serviceLanguage: 'kapeta/language-target-java-spring-boot:local',
     frontendKind: 'kapeta/block-type-frontend:local',
     frontendLanguage: 'kapeta/language-target-react-ts:local',
+    htmlLanguage: 'kapeta/language-target-html:local',
     cliKind: 'kapeta/block-type-cli:local',
     cliLanguage: 'kapeta/language-target-nodejs-ts:local',
     desktopKind: 'kapeta/block-type-desktop:local',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.70.7",
+    "version": "0.70.8",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/storm/codegen.ts

@@ -39,6 +39,7 @@ import YAML from 'yaml';
 import { PREDEFINED_BLOCKS } from './predefined';
 import { Archetype } from './archetype';
 import _ from 'lodash';
+import { getSystemBaseDir } from './page-utils';
 
 type ImplementationGenerator<T = StormFileImplementationPrompt> = (
     prompt: T,
@@ -108,13 +109,21 @@ export class StormCodegen {
     private readonly events: StormEvent[];
     private tmpDir: string;
     private readonly conversationId: string;
-
-    constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]) {
+    private readonly uiSystemId?: string;
+
+    constructor(
+        conversationId: string,
+        userPrompt: string,
+        blocks: BlockDefinitionInfo[],
+        events: StormEvent[],
+        uiSystemId?: string
+    ) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
         this.tmpDir = Path.join(os.tmpdir(), conversationId);
         this.conversationId = conversationId;
+        this.uiSystemId = uiSystemId;
     }
 
     public setTmpDir(tmpDir: string) {
@@ -488,7 +497,6 @@ export class StormCodegen {
             await writeFile(filePath, webRouterFile.content);
         }
 
-
         const blockRef = block.uri;
 
         this.emitBlockStatus(blockUri, block.aiName, StormEventBlockStatusType.QA);
@@ -1009,6 +1017,11 @@ export class StormCodegen {
 
         const codeGenerator = new BlockCodeGenerator(yamlContent as BlockDefinition);
         codeGenerator.withOption('AIContext', STORM_ID);
+
+        if (this.uiSystemId) {
+            codeGenerator.withOption('AIStaticFiles', getSystemBaseDir(this.uiSystemId));
+        }
+
         const generatedResult = await codeGenerator.generate();
         new CodeWriter(basePath).write(generatedResult);
         return generatedResult;

package/src/storm/event-parser.ts

@@ -67,6 +67,7 @@ export interface StormOptions {
     serviceLanguage: string;
     frontendKind: string;
     frontendLanguage: string;
+    htmlLanguage: string;
     exchangeKind: string;
     queueKind: string;
     publisherKind: string;
@@ -80,7 +81,10 @@ export interface StormOptions {
     desktopKind: string;
     desktopLanguage: string;
     gatewayKind: string;
-    [key: string]: string;
+
+    systemId?: string;
+
+    [key: string]: string | undefined;
 }
 
 function prettifyKaplang(source: string) {
@@ -143,6 +147,7 @@ export async function resolveOptions(): Promise<StormOptions> {
     const javaLanguage = await definitionsManager.getLatestDefinition('kapeta/language-target-java-spring-boot');
     const reactLanguage = await definitionsManager.getLatestDefinition('kapeta/language-target-react-ts');
     const nodejsLanguage = await definitionsManager.getLatestDefinition('kapeta/language-target-nodejs');
+    const htmlLanguage = await definitionsManager.getLatestDefinition('kapeta/language-target-html');
 
     const blockTypePubsub = await definitionsManager.getLatestDefinition('kapeta/block-type-pubsub');
     const resourceTypePubsubSubscriber = await definitionsManager.getLatestDefinition(
@@ -170,6 +175,7 @@ export async function resolveOptions(): Promise<StormOptions> {
         !postgresResource ||
         !javaLanguage ||
         !reactLanguage ||
+        !htmlLanguage ||
         !webPageResource ||
         !restApiResource ||
         !restClientResource ||
@@ -195,6 +201,7 @@ export async function resolveOptions(): Promise<StormOptions> {
 
         frontendKind: normalizeKapetaUri(`${blockTypeFrontend.definition.metadata.name}:${blockTypeFrontend.version}`),
         frontendLanguage: normalizeKapetaUri(`${reactLanguage.definition.metadata.name}:${reactLanguage.version}`),
+        htmlLanguage: normalizeKapetaUri(`${htmlLanguage.definition.metadata.name}:${htmlLanguage.version}`),
 
         cliKind: normalizeKapetaUri(`${blockTypeCli.definition.metadata.name}:${blockTypeCli.version}`),
         cliLanguage: normalizeKapetaUri(`${nodejsLanguage.definition.metadata.name}:${nodejsLanguage.version}`),
@@ -997,7 +1004,7 @@ export class StormEventParser {
             case 'CLI':
                 return this.options.cliLanguage;
             case 'FRONTEND':
-                return this.options.frontendLanguage;
+                return this.options.systemId ? this.options.htmlLanguage : this.options.frontendLanguage;
             case 'DESKTOP':
                 return this.options.desktopLanguage;
         }
@@ -1027,7 +1034,7 @@ export class StormEventParser {
             for (const prop in options) {
                 if (options.hasOwnProperty(prop)) {
                     const value = options[prop];
-                    if (value.indexOf(kind) > 0) {
+                    if (typeof value === 'string' && value.indexOf(kind) > 0) {
                         return value;
                     }
                 }

package/src/storm/routes.ts

@@ -614,9 +614,10 @@ router.post('/ui/get-vote', async (req: KapetaBodyRequest, res: Response) => {
 
 router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
     const handle = req.params.handle as string;
+    const systemId = (req.query.systemId as string) ?? undefined;
 
     try {
-        const stormOptions = await resolveOptions();
+        const stormOptions = { ...(await resolveOptions()), systemId: systemId };
 
         const eventParser = new StormEventParser(stormOptions);
 
@@ -703,7 +704,8 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
                     metaStream.getConversationId(),
                     aiRequest.prompt,
                     result.blocks,
-                    eventParser.getEvents()
+                    eventParser.getEvents(),
+                    systemId
                 );
 
                 onRequestAborted(req, res, () => {

package/test/storm/event-parser.test.ts

@@ -17,6 +17,7 @@ export const parserOptions = {
 
     frontendKind: 'kapeta/block-type-frontend:local',
     frontendLanguage: 'kapeta/language-target-react-ts:local',
+    htmlLanguage: 'kapeta/language-target-html:local',
 
     cliKind: 'kapeta/block-type-cli:local',
     cliLanguage: 'kapeta/language-target-nodejs-ts:local',