@devkong/cli 0.0.67-alpha.24 → 0.0.67-alpha.25

package/index.js

@@ -61104,8 +61104,12 @@ var GenerateCommand = class {
       choices: [
         { name: "basic - a single operation", value: "basic" },
         {
-          name: "advanced - multiple operations with a secret example",
-          value: "advanced"
+          name: "with-secret - multiple operations with a secret example",
+          value: "with-secret"
+        },
+        {
+          name: "with-s3 - download a file from S3 using an s3 secret",
+          value: "with-s3"
         }
       ]
     });
@@ -63758,7 +63762,8 @@ async function main() {
   ).addOption(
     new Option("--template <name>", "Starter template to scaffold (python only)").choices([
       "basic",
-      "advanced"
+      "with-secret",
+      "with-s3"
     ])
   ).addOption(new Option("--verbose", "Show full logs during command execution")).action(async (name, options) => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli",
-  "version": "0.0.67-alpha.24",
+  "version": "0.0.67-alpha.25",
   "type": "commonjs",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/packages/kong-cli/src/commands/generateCommand.d.ts

@@ -1,5 +1,5 @@
 import { AppExtension } from "@kong/contract";
-export type ExtensionTemplate = "basic" | "advanced";
+export type ExtensionTemplate = "basic" | "with-secret" | "with-s3";
 export declare class GenerateCommand {
     execute(extensionName: AppExtension["name"], sdk: "kotlin" | "python", presetVersion: string, template?: ExtensionTemplate): Promise<void>;
     private promptTemplate;

package/packages/kong-spec/src/index.d.ts

@@ -1,11 +1,13 @@
 export { makeServerlessJavaAppProps, serverlessFlowBuilder, stringifyServerlessFlow, } from "./lib/kongServerless";
 export type { FloweyServerlessBuilder } from "./lib/kongServerless";
 export type { KongSpecJobSession } from "./lib/kongSession";
-export type { KongSpecAction, KongSpecActionCallFunction, KongSpecActionCallProcess, KongSpecActionDelay, KongSpecActionInject, KongSpecActionSendEvent, KongSpecAnnotation, KongSpecBranch, KongSpecCache, KongSpecCallModel, KongSpecCircuitBreaker, KongSpecCondition, KongSpecEffect, KongSpecEffectStatus, KongSpecError, KongSpecEventBroker, KongSpecEventConnection, KongSpecFeatureCompensation, KongSpecFlow, KongSpecFunctionRef, KongSpecHowToInvoke, KongSpecHowToOutput, KongSpecHowToStore, KongSpecOutputAppend, KongSpecProcessRef, KongSpecRecord, KongSpecRecordHeader, KongSpecRetry, KongSpecRule, KongSpecSecretRef, KongSpecSecretType, KongSpecState, KongSpecStateCallFunction, KongSpecStateCallProcess, KongSpecStateCompensate, KongSpecStateDelay, KongSpecStateExit, KongSpecStateFail, KongSpecStateForeach, KongSpecStateInject, KongSpecStateParallel, KongSpecStateResult, KongSpecStateRule, KongSpecStateSendEvent, KongSpecStateStart, KongSpecStateSucceed, KongSpecStateSwitch, KongSpecStateWaitEvent, KongSpecStoreRetryControl, KongSpecSupportsActions, KongSpecSupportsErrors, KongSpecSupportsInvoke, KongSpecSupportsOutputSample, KongSpecSupportsOutputStore, KongSpecSupportsTaskMode, KongSpecSupportsTransition, } from "./lib/kongSpec";
+export type { KongSpecAction, KongSpecActionCallFunction, KongSpecActionCallProcess, KongSpecActionDelay, KongSpecActionInject, KongSpecActionSendEvent, KongSpecAnnotation, KongSpecBranch, KongSpecCache, KongSpecCallModel, KongSpecCircuitBreaker, KongSpecCondition, KongSpecEffect, KongSpecEffectStatus, KongSpecError, KongSpecEventBroker, KongSpecEventConnection, KongSpecFeatureCompensation, KongSpecFlow, KongSpecFunctionRef, KongSpecHowToInvoke, KongSpecHowToOutput, KongSpecHowToStore, KongSpecOutputAppend, KongSpecProcessRef, KongSpecRecord, KongSpecRecordHeader, KongSpecRetry, KongSpecRule, KongSpecSecretType, KongSpecState, KongSpecStateCallFunction, KongSpecStateCallProcess, KongSpecStateCompensate, KongSpecStateDelay, KongSpecStateExit, KongSpecStateFail, KongSpecStateForeach, KongSpecStateInject, KongSpecStateParallel, KongSpecStateResult, KongSpecStateRule, KongSpecStateSendEvent, KongSpecStateStart, KongSpecStateSucceed, KongSpecStateSwitch, KongSpecStateWaitEvent, KongSpecStoreRetryControl, KongSpecSupportsActions, KongSpecSupportsErrors, KongSpecSupportsInvoke, KongSpecSupportsOutputSample, KongSpecSupportsOutputStore, KongSpecSupportsTaskMode, KongSpecSupportsTransition, } from "./lib/kongSpec";
 export { KongSpecBuild } from "./lib/kongSpecBuild";
 export { KongSpecDoc } from "./lib/kongSpecDoc";
 export { KongSpecEnv } from "./lib/kongSpecEnv";
 export type { KongSpecFile } from "./lib/kongSpecFile";
+export { getKongFunctionOperations, getKongFunctionOperationSchema, getKongSpecXUI, getKongSpecXUIComponentConfig, isKongFunctionContractSchema, } from "./lib/kongSpecFunctionContract";
+export type { KongSpecXUIComponentConfig, KongSpecXUIConfig, KongSpecXUIFormConfig, KongSpecXUISecretConfig, } from "./lib/kongSpecFunctionContract";
 export type { KongSpecLayout, KongSpecLayoutPosition, KongSpecLayoutPositionKey, } from "./lib/kongSpecLayout";
 export { migrate } from "./lib/kongSpecMigrate";
 export { nameGenerator } from "./lib/kongSpecName";
@@ -13,8 +15,6 @@ export { normalizeName } from "./lib/kongSpecNormalize";
 export { KongSpecRef } from "./lib/kongSpecRef";
 export type { KongSpecActionPath, KongSpecStatePath } from "./lib/kongSpecRef";
 export { convertSpecToServerless } from "./lib/kongSpecToServerless";
-export { findSourceState, getActions, getConnectedExitStates, getDependencies, outputAggregator, outputAggregatorUnsafe, parallelStateOutputAggregator, parallelStateOutputAggregatorUnsafe, quoteSecretReferences, traverseFlowUp, } from "./lib/kongSpecUtils";
-export { getKongFunctionOperations, getKongFunctionOperationSchema, getKongSpecXUI, getKongSpecXUIComponentConfig, isKongFunctionContractSchema, } from "./lib/kongSpecFunctionContract";
-export type { KongSpecXUIComponentConfig, KongSpecXUIConfig, KongSpecXUIFormConfig, KongSpecXUISecretConfig, } from "./lib/kongSpecFunctionContract";
+export { findSourceState, getActions, getConnectedExitStates, outputAggregator, outputAggregatorUnsafe, parallelStateOutputAggregator, parallelStateOutputAggregatorUnsafe, quoteSecretReferences, traverseFlowUp, } from "./lib/kongSpecUtils";
 export { validate } from "./lib/kongSpecValidate";
 export type { KongSpecValidationIssue, KongSpecValidators } from "./lib/kongSpecValidate";

package/packages/kong-spec/src/lib/kongSpec.d.ts

@@ -10,7 +10,6 @@ export interface KongSpecProcessRef {
     basedOn: KongSpecFlow["id"];
     aliasName: Distinct<string, "KongSpecProcessRefAliasName">;
 }
-export type KongSpecSecretRef = Distinct<string, "KongSpecSecretRef">;
 export type KongSpecSecretType = Distinct<string, "KongSpecSecretType">;
 interface KongSpecStateBase {
     id: Distinct<string, "KongSpecStateId">;
@@ -46,7 +45,7 @@ export interface KongSpecCircuitBreaker {
 }
 export interface KongSpecHowToInvoke {
     prefix: string;
-    secretRefs: Record<string, KongSpecSecretRef | null>;
+    secretRefs: Record<string, JqFilter | null>;
     retry: KongSpecRetry;
     cache: KongSpecCache;
     circuitBreaker: KongSpecCircuitBreaker;
@@ -79,7 +78,7 @@ export interface KongSpecHowToStore {
     type: "CONTEXT" | "EXTERNAL" | "CONTEXT_AND_EXTERNAL";
     onFailure: "RETRY" | "SKIP";
     retry: KongSpecStoreRetryControl;
-    secretRef: KongSpecSecretRef | null;
+    secretRef: JqFilter | null;
 }
 export interface KongSpecHowToOutput {
     filter: JqFilter;

package/packages/kong-spec/src/lib/kongSpecUtils.d.ts

@@ -1,17 +1,10 @@
-import { JqFilter, JsonObject, JsonText, Optional, SessionTenant } from "@kong/ts";
-import { KongSpecAction, KongSpecFlow, KongSpecFunctionRef, KongSpecProcessRef, KongSpecState, KongSpecStateExit, KongSpecStateParallel, KongSpecSupportsTransition } from "./kongSpec";
+import { JqFilter, JsonObject, JsonText, Optional } from "@kong/ts";
+import { KongSpecAction, KongSpecFlow, KongSpecState, KongSpecStateExit, KongSpecStateParallel, KongSpecSupportsTransition } from "./kongSpec";
 import { KongSpecActionPath, KongSpecStatePath } from "./kongSpecRef";
 interface TestItem {
     id: KongSpecState["id"] | KongSpecAction["id"];
     source: "initial" | "errors" | "transition" | "noMatchedRule" | "conditions" | "compensateBy" | "actions" | "branches";
 }
-interface Dependency {
-    type: "function" | "process";
-    tenant: SessionTenant;
-    basedOn: KongSpecFunctionRef["basedOn"] | KongSpecProcessRef["basedOn"];
-    aliasName: KongSpecFunctionRef["aliasName"] | KongSpecProcessRef["aliasName"];
-    usage: Array<KongSpecAction["name"] | KongSpecState["name"]>;
-}
 export declare function quoteSecretReferences(filter: JqFilter): JqFilter;
 export declare function traverseFlowUp(id: KongSpecState["id"] | KongSpecAction["id"], states: KongSpecFlow["states"], test: (current: TestItem) => boolean): boolean;
 export declare function getConnectedExitStates(states: KongSpecFlow["states"], stateRef: KongSpecState["id"]): KongSpecStateExit[];
@@ -22,5 +15,4 @@ export declare function findSourceState(states: KongSpecState[], targetRef: Kong
 export declare function convertActionToState(action: KongSpecAction): KongSpecState & KongSpecSupportsTransition;
 export declare function parallelStateOutputAggregatorUnsafe(jq: (sample: string, filter: JqFilter) => Promise<string>): (state: KongSpecStateParallel, flow: KongSpecFlow) => Promise<JsonObject>;
 export declare function parallelStateOutputAggregator(jq: (sample: string, filter: JqFilter) => Promise<string>): (state: KongSpecStateParallel, flow: KongSpecFlow) => Promise<JsonObject>;
-export declare function getDependencies(flow: KongSpecFlow): Dependency[];
 export {};

package/packages/kong-ts/src/index.d.ts

@@ -16,11 +16,11 @@ export { ensureIsDuration, ensureIsDurationOrCron, ensureMinLength, nonNegative,
 export { guid, stableUUID, uuidc16, uuidc32, uuidStableSequence } from "./lib/id";
 export type { CompactUUID16, CompactUUID32, GUID, ShortUUID } from "./lib/id";
 export { intervalToString, millisToShortString } from "./lib/interval";
-export { applyJqFilterReplacements, applyJqObjectReplacements, applyJqTextReplacements, convertToJqFilter, extractJqTextContent, jqFilter, JqObjectSerializer, jqText, sanitizeJqFilter, wrapWithJqTextMarkers, } from "./lib/jq";
+export { applyJqFilterReplacements, applyJqObjectReplacements, applyJqTextReplacements, containsJqExpression, convertToJqFilter, extractJqTextContent, jqFilter, JqObjectSerializer, jqText, sanitizeJqFilter, wrapWithJqTextMarkers, } from "./lib/jq";
 export type { JqArray, JqFilter, JqObject, JqSerializer, JqText, RefactorReplacement, } from "./lib/jq";
 export { generateFakeJsonObject, jsonToHumanReadable, prettyJsonObject, prettyJsonText, safeJsonParse, } from "./lib/json";
 export type { JsonArray, JsonObject, JsonSchemaUrl, JsonText } from "./lib/json";
-export { buildExampleObject, buildJSONSchemaType, createEmptyJsonSchema, getNestedValue, getPropertyType, hasJSONSchemaType, isRequired, normalizeNullableUnions, updateNestedValue, } from "./lib/jsonSchema";
+export { buildExampleObject, buildJSONSchemaType, createEmptyJsonSchema, getNestedValue, getPropertyType, hasJSONSchemaType, inferJsonSchema, isLikelyJsonSchema, isRequired, normalizeNullableUnions, updateNestedValue, } from "./lib/jsonSchema";
 export { KeyGenerator } from "./lib/keyGenerator";
 export { findLastIndex, insertItem, moveItem, unique } from "./lib/list";
 export { deepMerge, deepMergeAll } from "./lib/merge";

package/packages/kong-ts/src/lib/jq.d.ts

@@ -11,6 +11,7 @@ export interface JqSerializer<T = JqObject | JqArray | JqText> {
 }
 export declare function jqFilter(value: Primitive): JqFilter;
 export declare function jqText(value: string): JqText;
+export declare function containsJqExpression(value: unknown): value is JqText;
 export declare function sanitizeJqFilter(value: JqFilter): JqFilter;
 export declare function convertToJqFilter(value: JqText): JqFilter;
 export declare function applyJqFilterReplacements(value: JqFilter, replacements: RefactorReplacement[]): JqFilter;

package/packages/kong-ts/src/lib/jsonSchema.d.ts

@@ -19,4 +19,17 @@ export declare function getNestedValue(obj: any, path: string[]): any;
 export declare function updateNestedValue(obj: any, path: string[], value: any): any;
 export declare function buildJSONSchemaType(type: JSONSchema7["type"], nullable: boolean): JSONSchema7["type"];
 export declare function buildExampleObject(schema: JSONSchema7): Optional<JsonObject>;
+/**
+ * Heuristically decides whether a parsed JSON object is itself a JSON Schema rather than a plain
+ * data sample. A `properties` key alone is ambiguous (data can have one too), so it only counts
+ * when every property value is an object — i.e. could be a subschema.
+ */
+export declare function isLikelyJsonSchema(value: unknown): boolean;
+/**
+ * Derives a draft-07 schema from a plain JSON sample. Primitives keep the sampled value as
+ * `examples`, nulls become nullable strings (the sample carries no type information), array
+ * item schemas are inferred from the first element, and object properties with a non-null
+ * sampled value are marked required.
+ */
+export declare function inferJsonSchema(value: unknown): JSONSchema7;
 export declare function createEmptyJsonSchema(): JSONSchema7;

package/packages/kong-ts-contract/src/index.d.ts

@@ -8,6 +8,7 @@ export type { AppAuditLog } from "./lib/appAuditLog";
 export type { AppBroadcastData } from "./lib/appBroadcastData";
 export type { AppCheckpoint } from "./lib/appCheckpoint";
 export type { AppComponentStartRequest } from "./lib/appComponentStartRequest";
+export type { AppDependency } from "./lib/appDependency";
 export type { AppDocument } from "./lib/appDocument";
 export type { AppDocumentPublish } from "./lib/appDocumentPublish";
 export type { AppDocumentSnapshot } from "./lib/appDocumentSnapshot";
@@ -20,7 +21,7 @@ export type { AppProcessData } from "./lib/appProcessData";
 export type { AppProcessInstanceId } from "./lib/appProcessInstanceId";
 export type { AppProcessStats, AppProcessStatsBucket, AppProcessStatsSeries, } from "./lib/appProcessStats";
 export type { AppProject } from "./lib/appProject";
-export type { AppSecret } from "./lib/appSecret";
+export type { AppSecret, AppSecretKey } from "./lib/appSecret";
 export type { AppSecretDetails } from "./lib/appSecretDetails";
 export type { AppSecretType } from "./lib/appSecretType";
 export type { AppSnapshot } from "./lib/appSnapshot";

package/packages/kong-ts-contract/src/lib/appAuditLog.d.ts

@@ -5,7 +5,8 @@ export declare enum AuditObjectType {
     EXTENSION_ALIAS = "extension_alias",
     EXTENSION_SNAPSHOT = "extension_snapshot",
     DOCUMENT_SNAPSHOT = "document_snapshot",
-    EXTENSION = "extension"
+    EXTENSION = "extension",
+    SECRET = "secret"
 }
 export interface AppAuditLog {
     objectType: AuditObjectType;

package/packages/kong-ts-contract/src/lib/appDependency.d.ts

@@ -0,0 +1,10 @@
+import { KongSpecAction, KongSpecFunctionRef, KongSpecProcessRef, KongSpecState } from "@kong/spec";
+import { SessionTenant } from "@kong/ts";
+import { AppSecretKey } from "./appSecret";
+export interface AppDependency {
+    type: "function" | "process" | "secret";
+    tenant: SessionTenant;
+    basedOn: KongSpecFunctionRef["basedOn"] | KongSpecProcessRef["basedOn"] | undefined;
+    name: KongSpecFunctionRef["aliasName"] | KongSpecProcessRef["aliasName"] | AppSecretKey;
+    usage: Array<KongSpecAction["name"] | KongSpecState["name"]>;
+}

package/packages/kong-ts-contract/src/lib/appSecret.d.ts

@@ -1,7 +1,8 @@
-import { KongSpecSecretRef, KongSpecSecretType } from "@kong/spec";
-import { Entity, Loading, Optional, ShortUUID, User, UtcDateTime } from "@kong/ts";
+import { KongSpecSecretType } from "@kong/spec";
+import { Distinct, Entity, Loading, Optional, ShortUUID, User, UtcDateTime } from "@kong/ts";
+export type AppSecretKey = Distinct<string, "AppSecretKey">;
 export interface AppSecret extends Entity {
-    key: KongSpecSecretRef;
+    key: AppSecretKey;
     typeId: ShortUUID;
     type: KongSpecSecretType;
     typeCategory: string;