@backstage/repo-tools 0.16.0 → 0.16.1-next.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @backstage/repo-tools
 
+## 0.16.1-next.1
+
+### Patch Changes
+
+- 688f070: Updated to use new utilities from `@backstage/cli-common`.
+- d1e38a7: Properly create workspace in OS temporary directory for `generate-patch` command
+- Updated dependencies
+  - @backstage/cli-node@0.2.16-next.1
+  - @backstage/cli-common@0.1.16-next.1
+
+## 0.16.1-next.0
+
+### Patch Changes
+
+- 85895f9: Updates OpenAPI generator templates to preserve original property names (like 'group-name', 'user-id') from OpenAPI specs when propertyNaming=original is specified. Previously, these were always converted to camelCase regardless of the propertyNaming setting.
+
+  - Updates modelGeneric.mustache templates in both client and server generators
+  - Updates modelTaggedUnion.mustache templates in both client and server generators
+  - Uses {{baseName}} when available, falls back to {{name}} for backward compatibility
+  - Maintains backward compatibility - no changes when propertyNaming=original is not used
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.5.1-next.0
+  - @backstage/cli-common@0.1.16-next.0
+  - @backstage/cli-node@0.2.16-next.0
+  - @backstage/config-loader@1.10.7-next.0
+  - @backstage/catalog-model@1.7.6
+  - @backstage/errors@1.2.7
+
 ## 0.16.0
 
 ### Minor Changes

package/dist/commands/api-reports/api-reports/generateTypeDeclarations.cjs.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var child_process = require('child_process');
+var cliCommon = require('@backstage/cli-common');
 var paths = require('../../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
@@ -10,22 +10,27 @@ var fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function generateTypeDeclarations(tsconfigFilePath) {
   await fs__default.default.remove(paths.paths.resolveTargetRoot("dist-types"));
-  const { status } = child_process.spawnSync(
-    "yarn",
-    [
-      "tsc",
-      ["--project", tsconfigFilePath],
-      ["--skipLibCheck", "false"],
-      ["--incremental", "false"]
-    ].flat(),
-    {
-      stdio: "inherit",
-      shell: true,
-      cwd: paths.paths.targetRoot
+  try {
+    await cliCommon.run(
+      [
+        "yarn",
+        "tsc",
+        "--project",
+        tsconfigFilePath,
+        "--skipLibCheck",
+        "false",
+        "--incremental",
+        "false"
+      ],
+      {
+        cwd: paths.paths.targetRoot
+      }
+    ).waitForExit();
+  } catch (error) {
+    if (error instanceof cliCommon.ExitCodeError) {
+      process.exit(error.code);
     }
-  );
-  if (status !== 0) {
-    process.exit(status || void 0);
+    throw error;
   }
 }
 

package/dist/commands/generate-patch/generate-patch.cjs.js

@@ -56,7 +56,9 @@ var generatePatch = async (packageArg, opts) => {
   if (!sourcePkg) {
     throw new Error(`Could not find package ${packageArg} in source repo`);
   }
-  const tmpDir = await fs__default.default.mkdtemp(os__default.default.tmpdir());
+  const tmpDir = await fs__default.default.mkdtemp(
+    path.join(os__default.default.tmpdir(), "backstage-repo-tools-generate-patch-")
+  );
   const ctx = {
     sourceRepo,
     targetRepo,

package/dist/commands/package/schema/openapi/generate/client.cjs.js

@@ -1,14 +1,14 @@
 'use strict';
 
+var backendPluginApi = require('@backstage/backend-plugin-api');
 var chalk = require('chalk');
-var path = require('path');
-var constants = require('../../../../../lib/openapi/constants.cjs.js');
-var paths = require('../../../../../lib/paths.cjs.js');
 var fs = require('fs-extra');
+var path = require('path');
 var exec = require('../../../../../lib/exec.cjs.js');
-var backendPluginApi = require('@backstage/backend-plugin-api');
-var helpers = require('../../../../../lib/openapi/helpers.cjs.js');
+var constants = require('../../../../../lib/openapi/constants.cjs.js');
 var dedupeImports = require('../../../../../lib/openapi/dedupe-imports.cjs.js');
+var helpers = require('../../../../../lib/openapi/helpers.cjs.js');
+var paths = require('../../../../../lib/paths.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 

package/dist/commands/repo/schema/openapi/lint.cjs.js

@@ -51,7 +51,9 @@ async function lint(directoryPath, config) {
             "api-home-get": "off",
             "operation-tags": "off",
             "hosts-https-only-oas3": "off",
-            "no-unknown-error-format": "off"
+            "no-unknown-error-format": "off",
+            // Disabled as it currently gives false positives when 'example' is used as a property name.
+            "oas3-valid-media-example": "off"
           }
         }
       ]

package/dist/package.json.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "0.16.0";
+var version = "0.16.1-next.1";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/repo-tools",
-  "version": "0.16.0",
+  "version": "0.16.1-next.1",
   "description": "CLI for Backstage repo tooling ",
   "backstage": {
     "role": "cli"
@@ -43,12 +43,12 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@apisyouwonthate/style-guide": "^1.4.0",
-    "@backstage/backend-plugin-api": "^1.5.0",
-    "@backstage/catalog-model": "^1.7.6",
-    "@backstage/cli-common": "^0.1.15",
-    "@backstage/cli-node": "^0.2.15",
-    "@backstage/config-loader": "^1.10.6",
-    "@backstage/errors": "^1.2.7",
+    "@backstage/backend-plugin-api": "1.5.1-next.0",
+    "@backstage/catalog-model": "1.7.6",
+    "@backstage/cli-common": "0.1.16-next.1",
+    "@backstage/cli-node": "0.2.16-next.1",
+    "@backstage/config-loader": "1.10.7-next.0",
+    "@backstage/errors": "1.2.7",
     "@electric-sql/pglite": "^0.3.0",
     "@manypkg/get-packages": "^1.1.3",
     "@microsoft/api-documenter": "^7.25.7",
@@ -86,9 +86,9 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^1.10.0",
-    "@backstage/cli": "^0.34.5",
-    "@backstage/types": "^1.2.2",
+    "@backstage/backend-test-utils": "1.10.1-next.0",
+    "@backstage/cli": "0.34.6-next.1",
+    "@backstage/types": "1.2.2",
     "@types/is-glob": "^4.0.2",
     "@types/node": "^20.16.0",
     "@types/prettier": "^2.0.0",

package/templates/typescript-backstage-client/modelGeneric.mustache

@@ -18,7 +18,7 @@ export {{#isNullable}}type{{/isNullable}}{{^isNullable}}interface{{/isNullable}}
     * {{{.}}}
     */
 {{/description}}
-    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
+    '{{#baseName}}{{baseName}}{{/baseName}}{{^baseName}}{{name}}{{/baseName}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
 {{/vars}}
 }{{#isNullable}} | null{{/isNullable}}
 

package/templates/typescript-backstage-client/modelTaggedUnion.mustache

@@ -12,7 +12,7 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
     * {{{.}}}
     */
     {{/description}}
-    {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{.}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}}{{#isNullable}} | null{{/isNullable}};
+    '{{#baseName}}{{baseName}}{{/baseName}}{{^baseName}}{{name}}{{/baseName}}'{{^required}}?{{/required}}: {{#discriminatorValue}}'{{.}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}}{{#isNullable}} | null{{/isNullable}};
 {{/allVars}}
 }
 {{>modelGenericEnums}}

package/templates/typescript-backstage-server/modelGeneric.mustache

@@ -18,7 +18,7 @@ export {{#isNullable}}type{{/isNullable}}{{^isNullable}}interface{{/isNullable}}
     * {{{.}}}
     */
 {{/description}}
-    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
+    '{{#baseName}}{{baseName}}{{/baseName}}{{^baseName}}{{name}}{{/baseName}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}};
 {{/vars}}
 }{{#isNullable}} | null{{/isNullable}}
 

package/templates/typescript-backstage-server/modelTaggedUnion.mustache

@@ -12,7 +12,7 @@ export interface {{classname}} { {{>modelGenericAdditionalProperties}}
     * {{{.}}}
     */
     {{/description}}
-    {{name}}{{^required}}?{{/required}}: {{#discriminatorValue}}'{{.}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}}{{#isNullable}} | null{{/isNullable}};
+    '{{#baseName}}{{baseName}}{{/baseName}}{{^baseName}}{{name}}{{/baseName}}'{{^required}}?{{/required}}: {{#discriminatorValue}}'{{.}}'{{/discriminatorValue}}{{^discriminatorValue}}{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{/discriminatorValue}}{{#isNullable}} | null{{/isNullable}};
 {{/allVars}}
 }
 {{>modelGenericEnums}}