@devkong/cli 0.0.67-alpha.20 → 0.0.67-alpha.22

package/assets/python-install.bat

@@ -1,28 +1,28 @@
-@echo off
-
-set EXTENSION_DIR=%1
-echo %EXTENSION_DIR%
-
-where python >nul 2>&1
-if %errorlevel% equ 0 (
-    set PYTHON_CMD=python
-) else (
-    set PYTHON_CMD=python3
-)
-
-cd %EXTENSION_DIR%
-
-REM Recreate the venv from scratch so a stale interpreter path (e.g. left over
-REM after a Python upgrade or a moved/copied project) can't leave pip pointing
-REM at a missing binary.
-%PYTHON_CMD% -m venv --clear .venv
-if errorlevel 1 exit /b 1
-
-call .venv\Scripts\activate.bat
-
-REM Invoke pip via `python -m pip` rather than the pip/pip3 wrapper so we don't
-REM depend on the wrapper script's (possibly stale) shebang.
-python -m pip freeze > requirements-lock.txt
-python -m pip install --default-timeout=120 -r requirements.txt -r requirements-dev.txt
-if errorlevel 1 exit /b 1
-python -m pip freeze > requirements-lock.txt
+@echo off
+
+set EXTENSION_DIR=%1
+echo %EXTENSION_DIR%
+
+where python >nul 2>&1
+if %errorlevel% equ 0 (
+    set PYTHON_CMD=python
+) else (
+    set PYTHON_CMD=python3
+)
+
+cd %EXTENSION_DIR%
+
+REM Recreate the venv from scratch so a stale interpreter path (e.g. left over
+REM after a Python upgrade or a moved/copied project) can't leave pip pointing
+REM at a missing binary.
+%PYTHON_CMD% -m venv --clear .venv
+if errorlevel 1 exit /b 1
+
+call .venv\Scripts\activate.bat
+
+REM Invoke pip via `python -m pip` rather than the pip/pip3 wrapper so we don't
+REM depend on the wrapper script's (possibly stale) shebang.
+python -m pip freeze > requirements-lock.txt
+python -m pip install --default-timeout=120 -r requirements.txt -r requirements-dev.txt
+if errorlevel 1 exit /b 1
+python -m pip freeze > requirements-lock.txt

package/index.js

@@ -60771,25 +60771,25 @@ async function spawnCommandWithArgs(command, commandArgs, logger = null, shell =
     });
   });
 }
-function printError(message2, error) {
+function printError(label, error) {
   if (axios_default.isAxiosError(error)) {
-    console.error(message2 + ":", error.message);
-    console.error("URL:", error.config?.url);
-    console.error("Method:", error.config?.method);
-    console.error("Headers:", error.config?.headers);
-    console.error("Request Data:", error.config?.data);
+    console.error("url:", error.config?.url);
+    console.error("method:", error.config?.method);
+    console.error("headers:", error.config?.headers);
+    console.error("request data:", error.config?.data);
     if (error.response) {
-      console.error("Response Status:", error.response.status);
-      console.error("Response Headers:", error.response.headers);
-      console.error("Response Data:", error.response.data);
+      console.error("response status:", error.response.status);
+      console.error("response headers:", error.response.headers);
+      console.error("response data:", error.response.data);
     } else if (error.request) {
-      console.error("Request was made but no response received");
-      console.error("Request Data:", error.request);
+      console.error("request was made but no response received");
+      console.error("request data:", error.request);
     }
+    console.error(label + ":", error.message);
   } else if (error instanceof AppError) {
-    console.error(message2, error.message);
+    console.error(label + ":", error.message);
   } else {
-    console.error(message2, error);
+    console.error(label + ":", error);
   }
 }
 function escapePathSpaces(sourcePath) {

package/package.json

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

package/packages/kong-cli/src/common/utils.d.ts

@@ -12,5 +12,5 @@ export declare function resolveProjectPath(fileName: string): string;
 export declare function generateShortId(): ShortUUID;
 export declare function spawnCommand(commandText: string, logger?: ILogger | null, shell?: boolean): Promise<string>;
 export declare function spawnCommandWithArgs(command: string, commandArgs: string[], logger?: ILogger | null, shell?: boolean): Promise<string>;
-export declare function printError(message: string, error: unknown): void;
+export declare function printError(label: string, error: unknown): void;
 export declare function escapePathSpaces(sourcePath: string): string;

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

@@ -20,7 +20,7 @@ export { applyJqFilterReplacements, applyJqObjectReplacements, applyJqTextReplac
 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, updateNestedValue, } from "./lib/jsonSchema";
+export { buildExampleObject, buildJSONSchemaType, createEmptyJsonSchema, getNestedValue, getPropertyType, hasJSONSchemaType, 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/jsonSchema.d.ts

@@ -1,5 +1,17 @@
 import { JSONSchema7, JSONSchema7TypeName } from "json-schema";
 import { JsonObject, Optional } from "./types";
+/**
+ * Collapses Pydantic's optional idiom `anyOf: [X, { "type": "null" }]` (and the `oneOf` form) down
+ * to `X`, recursively, and drops the now-dead `$defs`/`definitions`.
+ *
+ * Pydantic encodes every optional/nullable field as such a union instead of a nullable type, and
+ * `$ref` dereferencing inlines the branch but leaves the union in place. A form that reads
+ * `properties`/`type` straight off the node then sees an `anyOf` wrapper with no `properties` and
+ * renders nothing. When a single non-null branch remains it is merged with the union's sibling
+ * keywords (`default`, `description`, `title`, ...); genuine multi-branch unions keep their non-null
+ * branches. Run this right after dereferencing, before the schema reaches the form.
+ */
+export declare function normalizeNullableUnions<T = JSONSchema7>(schema: T): T;
 export declare function hasJSONSchemaType(type: JSONSchema7["type"], name: JSONSchema7TypeName): boolean;
 export declare function getPropertyType(schema: Optional<JSONSchema7> | null): string;
 export declare function isRequired(schema: Optional<JSONSchema7> | null, propertyKey: string): boolean;