@devkong/cli-nx 0.0.67-alpha.19 → 0.0.67-alpha.20

package/package.json

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

package/src/generators/preset/files/python-advanced/src/frontend.py

@@ -0,0 +1,9 @@
+from input_data import MySecret
+from kong.sdk.kong_frontend import KongFrontend, KongFrontendBuilder
+
+frontend: KongFrontend = (
+    KongFrontendBuilder()
+    .with_secret_types("primary", {"my-secret": MySecret})
+    .with_form()
+    .build()
+)

package/src/generators/preset/files/python-advanced/src/input_data.py

@@ -0,0 +1,47 @@
+from typing import Optional
+
+from kong.sdk.kong_function_request import KongFunctionRequest
+from pydantic import BaseModel, Field
+
+
+class MySecret(BaseModel):
+    my_key: str = Field(
+        examples=["example-0123456789"],
+        description="An example of secret field",
+    )
+
+
+class OperationData(BaseModel):
+    a: int = Field(
+        examples=[1],
+        description="An integer number",
+    )
+
+    b: int = Field(
+        examples=[2],
+        description="An integer number",
+    )
+
+
+class InputData(BaseModel):
+    request: KongFunctionRequest
+
+    sum: Optional[OperationData] = Field(
+        default=None,
+        description="Operands for the 'sum' operation",
+    )
+
+    sub: Optional[OperationData] = Field(
+        default=None,
+        description="Operands for the 'sub' operation",
+    )
+
+    multiply: Optional[OperationData] = Field(
+        default=None,
+        description="Operands for the 'multiply' operation",
+    )
+
+    divide: Optional[OperationData] = Field(
+        default=None,
+        description="Operands for the 'divide' operation",
+    )

package/src/generators/preset/files/python-advanced/src/main.py

@@ -0,0 +1,51 @@
+import sys
+
+from frontend import frontend
+from input_data import InputData, OperationData
+from kong.sdk.app import App
+from kong.sdk.kong_function import KongFunction
+from kong.sdk.kong_function_context import KongFunctionContext
+from output_data import OutputData
+
+
+class Main(KongFunction):
+    async def handle(self, data: InputData, context: KongFunctionContext) -> OutputData:
+        operation = data.request.operation
+        operands = getattr(data, operation, None)
+        if not isinstance(operands, OperationData):
+            raise ValueError(f"Missing or unsupported operation '{operation}'")
+
+        if operation == "sum":
+            result = operands.a + operands.b
+        elif operation == "sub":
+            result = operands.a - operands.b
+        elif operation == "multiply":
+            result = operands.a * operands.b
+        elif operation == "divide":
+            if operands.b == 0:
+                raise ValueError("Cannot divide by zero")
+            result = operands.a // operands.b
+        else:
+            raise ValueError(f"Unsupported operation '{operation}'")
+
+        comment = f"{operation} result is {result}"
+
+        secret = context.secret.find("primary")
+        if secret is not None:
+            comment += " (authenticated)"
+
+        return OutputData(
+            result=result,
+            comment=comment,
+        )
+
+
+app = App(
+    InputData,
+    OutputData,
+    Main,
+    frontend,
+)
+
+if __name__ == "__main__":
+    app.run(sys.argv)

package/src/generators/preset/files/python-advanced/src/main_test.py

@@ -0,0 +1,46 @@
+import json
+
+from frontend import frontend
+from input_data import InputData, OperationData
+from kong.sdk.conftest import ExtensionFixture, extension_test_context
+from kong.sdk.kong_function_request import KongFunctionRequest
+from main import Main
+
+
+async def test_should_add_operands_when_operation_is_sum(
+    create_extension: ExtensionFixture,
+):
+    extension = create_extension(Main, InputData)
+
+    input_data = InputData(
+        request=KongFunctionRequest(operation="sum"),
+        sum=OperationData(a=1, b=2),
+    )
+
+    output = await extension.handle(input_data, extension_test_context(frontend))
+    assert output.result == 3
+
+
+async def test_should_note_authentication_when_secret_is_provided(
+    create_extension: ExtensionFixture,
+):
+    extension = create_extension(Main, InputData)
+
+    input_data = InputData(
+        request=KongFunctionRequest(operation="sum"),
+        sum=OperationData(a=1, b=2),
+    )
+
+    # Secrets arrive as a `{"type", "data"}` JSON envelope keyed by purpose, exactly
+    # as the executor materializes them at runtime.
+    secrets = {
+        "primary": json.dumps(
+            {"type": "my-secret", "data": {"my_key": "example-0123456789"}}
+        )
+    }
+
+    context = extension_test_context(frontend, secrets)
+    output = await extension.handle(input_data, context)
+
+    assert output.result == 3
+    assert output.comment == "sum result is 3 (authenticated)"

package/src/generators/preset/files/python-advanced/src/output_data.py

@@ -0,0 +1,16 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+
+class OutputData(BaseModel):
+    result: int = Field(
+        examples=[3],
+        description="Result of applying the operation to a and b",
+    )
+
+    comment: Optional[str] = Field(
+        default=None,
+        examples=["sum result is 3"],
+        description="A string field",
+    )

package/src/generators/preset/generator.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const path = tslib_1.__importStar(require("path"));
 function presetGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
         const projectRoot = ".";
         const projectName = "";
         (0, devkit_1.addProjectConfiguration)(tree, projectName, {
@@ -13,7 +14,14 @@ function presetGenerator(tree, options) {
             projectType: "application",
         });
         options.os = process.platform;
+        options.variant = (_a = options.variant) !== null && _a !== void 0 ? _a : "basic";
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, `files/${options.platform}`), "", options);
+        // The python preset ships a "basic" (single sum) and an "advanced" (multi-operation
+        // + secret example) template. The advanced sources are layered on top of the shared
+        // base, overwriting the basic src/*.py files.
+        if (options.platform === "python" && options.variant === "advanced") {
+            (0, devkit_1.generateFiles)(tree, path.join(__dirname, "files/python-advanced"), "", options);
+        }
         yield (0, devkit_1.formatFiles)(tree);
         try {
             const gradlewPath = (0, devkit_1.joinPathFragments)(projectRoot, "gradlew");

package/src/generators/preset/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;AAUA,0CAoBC;;AA9BD,uCAMoB;AACpB,mDAA6B;AAG7B,SAAsB,eAAe,CAAC,IAAU,EAAE,OAA8B;;QAC9E,MAAM,WAAW,GAAG,GAAG,CAAC;QACxB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,IAAA,gCAAuB,EAAC,IAAI,EAAE,WAAW,EAAE;YACzC,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,aAAa;SAC3B,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QACpF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,YAAY;YAC1D,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;CAAA;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;AAUA,0CA6BC;;AAvCD,uCAMoB;AACpB,mDAA6B;AAG7B,SAAsB,eAAe,CAAC,IAAU,EAAE,OAA8B;;;QAC9E,MAAM,WAAW,GAAG,GAAG,CAAC;QACxB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,IAAA,gCAAuB,EAAC,IAAI,EAAE,WAAW,EAAE;YACzC,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,aAAa;SAC3B,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,CAAC;QAC7C,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAEpF,oFAAoF;QACpF,oFAAoF;QACpF,8CAA8C;QAC9C,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YACpE,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAClF,CAAC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,YAAY;YAC1D,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;CAAA;AAED,kBAAe,eAAe,CAAC"}

package/src/generators/preset/schema.d.ts

@@ -1,5 +1,11 @@
 export interface PresetGeneratorSchema {
   name: string;
-  os: string;
+  // Extension id, forwarded by the CLI and rendered into kong.json.
+  id?: string;
+  // Set by the generator at runtime from `process.platform`.
+  os?: string;
   platform: "python" | "kotlin";
+  // Which starter template to scaffold. Only the python preset currently ships more
+  // than "basic"; "advanced" adds the multi-operation + secret example variant.
+  variant?: "basic" | "advanced";
 }

package/src/generators/preset/schema.json

@@ -21,7 +21,32 @@
         "index": 1
       },
       "x-prompt": "What platform would you like to use?"
+    },
+    "variant": {
+      "type": "string",
+      "description": "Which starter template to scaffold",
+      "enum": [
+        "basic",
+        "advanced"
+      ],
+      "default": "basic",
+      "x-prompt": {
+        "message": "Which template would you like to use?",
+        "type": "list",
+        "items": [
+          {
+            "value": "basic",
+            "label": "basic - a single operation"
+          },
+          {
+            "value": "advanced",
+            "label": "advanced - multiple operations with a secret example"
+          }
+        ]
+      }
     }
   },
-  "required": ["name"]
-}
+  "required": [
+    "name"
+  ]
+}