@skmtc/core 0.0.487 → 0.0.490

package/esm/run/enrichSettings.d.ts

@@ -1,7 +1,8 @@
 import type { ClientGeneratorSettings } from '../types/Settings.js';
+import type { EnrichmentItem } from './toEnrichments.js';
 type EnrichSettingsArgs = {
     generatorSettings: ClientGeneratorSettings[];
-    enrichments: Record<string, Record<string, unknown>>;
+    enrichments: Record<string, EnrichmentItem[]>;
 };
 export declare const enrichSettings: ({ generatorSettings, enrichments }: EnrichSettingsArgs) => ClientGeneratorSettings[];
 export {};

package/esm/run/enrichSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enrichSettings.d.ts","sourceRoot":"","sources":["../../src/run/enrichSettings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,KAAK,kBAAkB,GAAG;IACxB,iBAAiB,EAAE,uBAAuB,EAAE,CAAA;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;CACrD,CAAA;AAED,eAAO,MAAM,cAAc,uCAAwC,kBAAkB,8BASpF,CAAA"}
+{"version":3,"file":"enrichSettings.d.ts","sourceRoot":"","sources":["../../src/run/enrichSettings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,KAAK,kBAAkB,GAAG;IACxB,iBAAiB,EAAE,uBAAuB,EAAE,CAAA;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,cAAc,uCAAwC,kBAAkB,8BAQpF,CAAA"}

package/esm/run/enrichSettings.js

@@ -1,8 +1,7 @@
 import { set } from 'lodash-es';
 export const enrichSettings = ({ generatorSettings, enrichments }) => {
     Object.values(generatorSettings).forEach(setting => {
-        Object.entries(enrichments[setting.id] ?? {}).forEach(([key, value]) => {
-            console.log('KEY', key);
+        Object.values(enrichments[setting.id] ?? {}).forEach(({ key, value }) => {
             set(setting, key, value);
         });
     });

package/esm/run/handleEnrichment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleEnrichment.d.ts","sourceRoot":"","sources":["../../src/run/handleEnrichment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AActE,eAAO,MAAM,gBAAgB,wCAA+C,iBAAiB,oBAmC5F,CAAA"}
+{"version":3,"file":"handleEnrichment.d.ts","sourceRoot":"","sources":["../../src/run/handleEnrichment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AAetE,eAAO,MAAM,gBAAgB,wCAA+C,iBAAiB,oBAmC5F,CAAA"}

package/esm/run/handleEnrichment.js

@@ -1,5 +1,6 @@
 import * as dntShim from "../_dnt.shims.js";
 import { GoogleGenerativeAI } from '@google/generative-ai';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 const apiKey = dntShim.Deno.env.get('GEMINI_API_KEY');
 if (!apiKey) {
     throw new Error('GEMINI_API_KEY is not set');
@@ -16,7 +17,7 @@ export const handleEnrichment = async ({ prompt, content, responseSchema }) => {
             topK: 40,
             maxOutputTokens: 8192,
             responseMimeType: 'application/json',
-            responseSchema
+            responseSchema: zodToJsonSchema(responseSchema)
         },
         history: [
             {

package/esm/run/toEnrichments.d.ts

@@ -7,6 +7,10 @@ type ToEnrichmentsArgs = {
     generators: GeneratorsType[];
     oasDocument: OasDocument;
 };
-export declare const toEnrichments: ({ generators, oasDocument }: ToEnrichmentsArgs) => Promise<Record<string, Record<string, unknown>>>;
+export type EnrichmentItem = {
+    key: string[];
+    value: unknown;
+};
+export declare const toEnrichments: ({ generators, oasDocument }: ToEnrichmentsArgs) => Promise<Record<string, EnrichmentItem[]>>;
 export {};
 //# sourceMappingURL=toEnrichments.d.ts.map

package/esm/run/toEnrichments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toEnrichments.d.ts","sourceRoot":"","sources":["../../src/run/toEnrichments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAI9D,KAAK,cAAc,GACf,gBAAgB,GAChB,mBAAmB,CAAC,cAAc,CAAC,GACnC,eAAe,CAAC,cAAc,CAAC,CAAA;AAEnC,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,cAAc,EAAE,CAAA;IAC5B,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,aAAa,gCAAuC,iBAAiB,qDAkCjF,CAAA"}
+{"version":3,"file":"toEnrichments.d.ts","sourceRoot":"","sources":["../../src/run/toEnrichments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAI9D,KAAK,cAAc,GACf,gBAAgB,GAChB,mBAAmB,CAAC,cAAc,CAAC,GACnC,eAAe,CAAC,cAAc,CAAC,CAAA;AAEnC,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,cAAc,EAAE,CAAA;IAC5B,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,eAAO,MAAM,aAAa,gCAAuC,iBAAiB,8CA4CjF,CAAA"}

package/esm/run/toEnrichments.js

@@ -7,10 +7,13 @@ export const toEnrichments = async ({ generators, oasDocument }) => {
                 const enrichmentRequest = generator.toEnrichmentRequest?.(operation);
                 if (enrichmentRequest) {
                     const enrichmentResponse = await handleEnrichment(enrichmentRequest);
-                    const key = `operations.${operation.path}.${operation.method}.enrichments`;
-                    output[generator.id] = {
-                        [key]: JSON.parse(enrichmentResponse)
-                    };
+                    if (!output[generator.id]) {
+                        output[generator.id] = [];
+                    }
+                    output[generator.id].push({
+                        key: ['operations', operation.path, operation.method, 'enrichments'],
+                        value: JSON.parse(enrichmentResponse)
+                    });
                 }
             }
         }
@@ -19,13 +22,17 @@ export const toEnrichments = async ({ generators, oasDocument }) => {
                 const enrichmentRequest = generator.toEnrichmentRequest?.(refName);
                 if (enrichmentRequest) {
                     const enrichmentResponse = await handleEnrichment(enrichmentRequest);
-                    const key = `models.${refName}.enrichments`;
-                    output[generator.id] = {
-                        [key]: JSON.parse(enrichmentResponse)
-                    };
+                    if (!output[generator.id]) {
+                        output[generator.id] = [];
+                    }
+                    output[generator.id].push({
+                        key: ['models', refName, 'enrichments'],
+                        value: JSON.parse(enrichmentResponse)
+                    });
                 }
             }
         }
     }
+    console.log('OUTPUT', output);
     return output;
 };

package/esm/types/EnrichmentRequest.d.ts

@@ -1,8 +1,8 @@
 import "../_dnt.polyfills.js";
-import type { ResponseSchema } from '@google/generative-ai';
+import type { z } from 'zod';
 export type EnrichmentRequest = {
     prompt: string;
-    responseSchema: ResponseSchema;
+    responseSchema: z.ZodType<unknown>;
     content: string;
 };
 //# sourceMappingURL=EnrichmentRequest.d.ts.map

package/esm/types/EnrichmentRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnrichmentRequest.d.ts","sourceRoot":"","sources":["../../src/types/EnrichmentRequest.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAE3D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,cAAc,CAAA;IAC9B,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA"}
+{"version":3,"file":"EnrichmentRequest.d.ts","sourceRoot":"","sources":["../../src/types/EnrichmentRequest.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAE5B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAClC,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skmtc/core",
-  "version": "0.0.487",
+  "version": "0.0.490",
   "module": "./esm/mod.js",
   "exports": {
     ".": {
@@ -54,7 +54,8 @@
     "openapi-types": "12.1.3",
     "tiny-invariant": "1.3.3",
     "ts-pattern": "5.6.0",
-    "zod": "3.24.1"
+    "zod": "3.24.1",
+    "zod-to-json-schema": "3.24.1"
   },
   "devDependencies": {
     "@types/lodash-es": "4.17.12",