@devkong/cli-nx 0.0.58 → 0.0.60

package/package.json

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

package/src/generators/preset/files/kotlin/README.md

@@ -43,31 +43,6 @@ To automatically tag your code with an incremented version number (e.g., 1, 2, 3
 kong publish-version --verbose
 ```
 
-**NOTE:** before publishing a new version, ensure that your extension JSON Schema includes the required `operation` field. This input field has `enum` type and defines the action to be performed by the extension.
-
-**Purpose:**
-
-- When an extension supports multiple usage variants or endpoints, this field identifies the specific operation to execute.
-- It enables routing and logic selection within the extension workflow.
-- If an extension has only one primary function, this `enum` contains a single value that uniquely identifies its operation.
-
-**Usage Example:**
-
-```
-  "$schema": "http://json-schema.org/draft-07/schema#",
-    "title": "Input",
-    "type": "object",
-    "properties": {
-      "operation": {
-        "enum": ["score digital profile", ...],
-        "examples": ["score digital profile"],
-        "description": "Operation type."
-      },
-      ...
-      "required": ["operation", ... ]
-    }
-```
-
 ### List Available Versions
 
 To see all available versions of your extension, run:

package/src/generators/preset/files/kotlin/build.gradle.kts.template

@@ -23,8 +23,9 @@ repositories {
 }
 
 dependencies {
-  implementation("io.kong:kong-common:$kongVersion")
   implementation("io.kong:kong-sdk-function-template:$kongSdkVersion")
+  implementation("io.kong:kong-sdk-kotlin:$kongSdkVersion")
+  implementation("io.kong:kong-common:$kongVersion")
 
   implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:$quarkusVersion"))
   implementation("io.quarkus:quarkus-arc")
@@ -38,7 +39,7 @@ dependencies {
   testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesTestVersion")
 }
 
-group = "io.kong"
+group = "io.kong.extension"
 version = "0.0.1-SNAPSHOT"
 
 java {

package/src/generators/preset/files/kotlin/src/main/kotlin/io/kong/extension/Main.kt

@@ -6,6 +6,7 @@ import io.kong.sdk.KongFunction
 import io.kong.sdk.KongFunctionContext
 import io.kong.sdk.function.template.Field
 import io.quarkus.runtime.annotations.RegisterForReflection
+import jakarta.inject.Inject
 import jakarta.inject.Singleton
 
 // This is the main entry point for developing an extension for Kong.
@@ -14,41 +15,47 @@ import jakarta.inject.Singleton
 // Define the structure of the input data that your extension will accept.
 // Be sure to include example values for each field. These examples help generate
 // sample objects in the UI, making it easier to work with the models.
+
 @RegisterForReflection
 data class InputData(
   // REPLACE BELLOW WITH YOUR FIELDS
-  
-  @Field(description = "An integer number", examples = ["1"]) 
-  val a: Int,
-  
-  @Field(description = "An integer number", examples = ["2"]) 
-  val b: Int,
+  @Field(description = "An integer number", examples = ["1"]) val a: Int,
+  @Field(description = "An integer number", examples = ["2"]) val b: Int,
 )
 
 @RegisterForReflection
 data class OutputData(
   // Define the structure of the output data that your extension will return.
   // REPLACE BELLOW WITH YOUR FIELDS
-
-  @Field(description = "Result of a + b", examples = ["3"]) 
-  val sum_of: Int,
-  
+  @Field(description = "Result of a + b", examples = ["3"]) val sumOf: Int,
   @Field(
     description = "A string field",
     examples = ["This example extension returns sum of a and b"],
     default = "null",
-  )
-  val comment: String? = null,
+  ) val comment: String? = null,
 )
 
-val objectMapper = ObjectMapper()
-
 @Singleton
 class Main : KongFunction<InputData>(InputData::class.java) {
   private val logger = AppLogger(Main::class.simpleName)
 
+  @Inject
+  internal lateinit var jsonMapper: ObjectMapper
+
   override suspend fun handle(
     data: InputData,
     context: KongFunctionContext,
-  ): ByteArray? = objectMapper.writeValueAsBytes(OutputData(sum_of = data.a + data.b))
+  ): ByteArray? {
+    logger.info("handle sum") {
+      it["a"] = data.a
+      it["b"] = data.b
+    }
+
+    return jsonMapper.writeValueAsBytes(
+      OutputData(
+        sumOf = data.a + data.b,
+        comment = "sum of ${data.a} and ${data.b}",
+      ),
+    )
+  }
 }

package/src/generators/preset/files/kotlin/src/main/resources/application.properties.template

@@ -1,6 +1,7 @@
 quarkus.profile=local
 quarkus.log.level=INFO
 quarkus.log.console.format=%d{yyyy-MM-dd'T'HH:mm:ss,SSS} | %-5p | %s thread=%t module=%c{2.} %e%n
+
 quarkus.otel.enabled=true
 quarkus.otel.exporter.otlp.enabled=false
 quarkus.http.test-port=8083

package/src/generators/preset/files/kotlin/src/test/kotlin/io/kong/extension/Test.kt

@@ -1,22 +1,22 @@
-package io.kong.extensionapicall
+package io.kong.extension
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import io.kong.extension.InputData
-import io.kong.extension.Main
-import io.kong.extension.OutputData
+import io.kong.sdk.function.template.ExtensionTestProfile
 import io.quarkus.test.junit.QuarkusTest
+import io.quarkus.test.junit.TestProfile
 import jakarta.inject.Inject
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 @QuarkusTest
+@TestProfile(ExtensionTestProfile::class)
 class Test {
   @Inject
   lateinit var extension: Main
 
   @Inject
-  lateinit var objectMapper: ObjectMapper
+  lateinit var jsonMapper: ObjectMapper
 
   @Test
   fun `when provided valid input then returns expected result`() =
@@ -24,9 +24,8 @@ class Test {
       val input = InputData(a = 1, b = 2)
 
       val bytes = extension.handle(input)
-      val output = objectMapper.readValue(bytes, OutputData::class.java)
-      val sumOf = output.sum_of
+      val output = jsonMapper.readValue(bytes, OutputData::class.java)
 
-      assertEquals(3, sumOf)
+      assertEquals(3, output.sumOf)
     }
 }

package/src/generators/preset/generator.js

@@ -6,14 +6,24 @@ 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* () {
+        const projectRoot = ".";
         const projectName = "";
         (0, devkit_1.addProjectConfiguration)(tree, projectName, {
-            root: ".",
+            root: projectRoot,
             projectType: "application",
         });
         options.os = process.platform;
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, `files/${options.platform}`), "", options);
         yield (0, devkit_1.formatFiles)(tree);
+        try {
+            const gradlewPath = (0, devkit_1.joinPathFragments)(projectRoot, "gradlew");
+            if (tree.exists(gradlewPath)) {
+                tree.changePermissions(gradlewPath, "755"); // rwxr-xr-x
+            }
+        }
+        catch (ex) {
+            console.warn("failed to make gradlew executable", ex);
+        }
     });
 }
 exports.default = presetGenerator;

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/generators/preset/generator.ts"],"names":[],"mappings":";;AAIA,0CAUC;;AAdD,uCAAuF;AACvF,mDAA6B;AAG7B,SAAsB,eAAe,CAAC,IAAU,EAAE,OAA8B;;QAC9E,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,IAAA,gCAAuB,EAAC,IAAI,EAAE,WAAW,EAAE;YACzC,IAAI,EAAE,GAAG;YACT,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;IAC1B,CAAC;CAAA;AAED,kBAAe,eAAe,CAAC"}
+{"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"}