@omnixdp/typegen 0.1.0 → 0.2.1

package/README.md

@@ -13,16 +13,19 @@ npm install -D @omnixdp/typegen
 ```bash
 npx omnixdp-typegen \
   --api-url https://api.example.com \
-  --management-token "$OMNIXDP_MANAGEMENT_TOKEN" \
-  --business-objects-token "$OMNIXDP_BO_TOKEN" \
-  --ratings-and-reviews-token "$OMNIXDP_RR_TOKEN" \
+  --management-client-id "$OMNIXDP_MANAGEMENT_CLIENT_ID" \
+  --management-client-secret "$OMNIXDP_MANAGEMENT_CLIENT_SECRET" \
+  --business-objects-client-id "$OMNIXDP_BO_CLIENT_ID" \
+  --business-objects-client-secret "$OMNIXDP_BO_CLIENT_SECRET" \
+  --ratings-and-reviews-client-id "$OMNIXDP_RR_CLIENT_ID" \
+  --ratings-and-reviews-client-secret "$OMNIXDP_RR_CLIENT_SECRET" \
   --cms-space marketing \
   --bo-space products \
   --rr-space storefront-reviews \
   --out src/omnixdp.generated.ts
 ```
 
-Space arguments can be a space id, slug, or exact name. Regenerate the output after changing content types, taxonomy types, data types, or global fields in the admin.
+Space arguments can be a space id, slug, or exact name. Typegen exchanges client credentials for short-lived access tokens. Existing `--management-token`, `--business-objects-token`, and `--ratings-and-reviews-token` flags remain supported when you already have bearer tokens. Regenerate the output after changing content types, taxonomy types, data types, or global fields in the admin.
 
 ## Check in CI
 
@@ -37,9 +40,12 @@ npx omnixdp-typegen --config omnixdp.typegen.config.js --check
 ```js
 module.exports = {
   apiUrl: process.env.OMNIXDP_API_URL,
-  managementToken: process.env.OMNIXDP_MANAGEMENT_TOKEN,
-  businessObjectsToken: process.env.OMNIXDP_BO_TOKEN,
-  ratingsAndReviewsToken: process.env.OMNIXDP_RR_TOKEN,
+  managementClientId: process.env.OMNIXDP_MANAGEMENT_CLIENT_ID,
+  managementClientSecret: process.env.OMNIXDP_MANAGEMENT_CLIENT_SECRET,
+  businessObjectsClientId: process.env.OMNIXDP_BO_CLIENT_ID,
+  businessObjectsClientSecret: process.env.OMNIXDP_BO_CLIENT_SECRET,
+  ratingsAndReviewsClientId: process.env.OMNIXDP_RR_CLIENT_ID,
+  ratingsAndReviewsClientSecret: process.env.OMNIXDP_RR_CLIENT_SECRET,
   cmsSpace: "marketing",
   boSpace: "products",
   rrSpace: "storefront-reviews",

package/dist/cli.d.ts

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
-export {};
+import type { TypegenConfig } from "./schema";
+export declare function loadConfig(file: string): Promise<Partial<TypegenConfig>>;

package/dist/cli.js

@@ -24,11 +24,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadConfig = loadConfig;
 const promises_1 = require("node:fs/promises");
+const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const fetch_schema_1 = require("./fetch-schema");
 const generate_1 = require("./generate");
+const requireConfig = (0, node_module_1.createRequire)(__filename);
 async function main() {
     const args = parseArgs(process.argv.slice(2));
     if (args.help) {
@@ -89,12 +92,30 @@ function assignArg(out, key, value) {
         case "management-token":
             out.managementToken = value;
             break;
+        case "management-client-id":
+            out.managementClientId = value;
+            break;
+        case "management-client-secret":
+            out.managementClientSecret = value;
+            break;
         case "business-objects-token":
             out.businessObjectsToken = value;
             break;
+        case "business-objects-client-id":
+            out.businessObjectsClientId = value;
+            break;
+        case "business-objects-client-secret":
+            out.businessObjectsClientSecret = value;
+            break;
         case "ratings-and-reviews-token":
             out.ratingsAndReviewsToken = value;
             break;
+        case "ratings-and-reviews-client-id":
+            out.ratingsAndReviewsClientId = value;
+            break;
+        case "ratings-and-reviews-client-secret":
+            out.ratingsAndReviewsClientSecret = value;
+            break;
         case "cms-space":
             out.cmsSpace = value;
             break;
@@ -131,8 +152,18 @@ async function loadConfig(file) {
     if (path.endsWith(".json")) {
         return JSON.parse(await (0, promises_1.readFile)(path, "utf8"));
     }
+    if (path.endsWith(".cjs") || path.endsWith(".js")) {
+        return normalizeLoadedConfig(requireConfig(path));
+    }
     const imported = await Promise.resolve(`${(0, node_url_1.pathToFileURL)(path).href}`).then(s => __importStar(require(s)));
-    return (imported.default ?? imported.config ?? imported);
+    return normalizeLoadedConfig(imported);
+}
+function normalizeLoadedConfig(imported) {
+    if (imported && typeof imported === "object") {
+        const record = imported;
+        return (record.default ?? record.config ?? imported);
+    }
+    return {};
 }
 function compactConfig(config) {
     return Object.fromEntries(Object.entries(config).filter(([, value]) => value !== undefined && value !== ""));
@@ -142,9 +173,18 @@ function printHelp() {
 
 Options:
   --config <path>                    Load omnixdp typegen config
-  --management-token <token>          CMS Management API bearer token
-  --business-objects-token <token>    Business Objects API bearer token
-  --ratings-and-reviews-token <token> Ratings and Reviews API bearer token
+  --management-token <token>          CMS Management API bearer token, or use client credentials below
+  --management-client-id <id>         CMS Management API OAuth client id
+  --management-client-secret <secret> CMS Management API OAuth client secret
+  --business-objects-token <token>    Business Objects API bearer token, or use client credentials below
+  --business-objects-client-id <id>   Business Objects API OAuth client id
+  --business-objects-client-secret <secret>
+                                      Business Objects API OAuth client secret
+  --ratings-and-reviews-token <token> Ratings and Reviews API bearer token, or use client credentials below
+  --ratings-and-reviews-client-id <id>
+                                      Ratings and Reviews API OAuth client id
+  --ratings-and-reviews-client-secret <secret>
+                                      Ratings and Reviews API OAuth client secret
   --cms-space <id|slug|name>          CMS space to generate
   --bo-space <id|slug|name>           Business Objects space to generate
   --rr-space <id|slug|name>           Ratings and Reviews space to generate
@@ -152,7 +192,9 @@ Options:
   --check                             Fail if the output file is stale
 `);
 }
-main().catch((error) => {
-    console.error(error instanceof Error ? error.message : String(error));
-    process.exitCode = 1;
-});
+if (require.main === module) {
+    main().catch((error) => {
+        console.error(error instanceof Error ? error.message : String(error));
+        process.exitCode = 1;
+    });
+}

package/dist/fetch-schema.js

@@ -11,14 +11,26 @@ function normalizeApiUrl(apiUrl) {
 async function fetchTypegenSchema(config) {
     const apiBase = normalizeApiUrl(config.apiUrl);
     const [cms, businessObjects, ratingsAndReviews] = await Promise.all([
-        config.managementToken && config.cmsSpace
-            ? fetchCmsSchema(apiBase, config.managementToken, config.cmsSpace)
+        config.cmsSpace
+            ? fetchCmsSchema(apiBase, await resolveAccessToken(apiBase, "management", {
+                token: config.managementToken,
+                clientId: config.managementClientId,
+                clientSecret: config.managementClientSecret
+            }), config.cmsSpace)
             : Promise.resolve({ contentTypes: [], taxonomyTypes: [] }),
-        config.businessObjectsToken && config.boSpace
-            ? fetchBoSchema(apiBase, "business-objects", config.businessObjectsToken, config.boSpace)
+        config.boSpace
+            ? fetchBoSchema(apiBase, "business-objects", await resolveAccessToken(apiBase, "business-objects", {
+                token: config.businessObjectsToken,
+                clientId: config.businessObjectsClientId,
+                clientSecret: config.businessObjectsClientSecret
+            }), config.boSpace)
             : Promise.resolve({ dataTypes: [] }),
-        config.ratingsAndReviewsToken && config.rrSpace
-            ? fetchBoSchema(apiBase, "ratings-and-reviews", config.ratingsAndReviewsToken, config.rrSpace)
+        config.rrSpace
+            ? fetchBoSchema(apiBase, "ratings-and-reviews", await resolveAccessToken(apiBase, "ratings-and-reviews", {
+                token: config.ratingsAndReviewsToken,
+                clientId: config.ratingsAndReviewsClientId,
+                clientSecret: config.ratingsAndReviewsClientSecret
+            }), config.rrSpace)
             : Promise.resolve({ dataTypes: [] })
     ]);
     const canonical = JSON.stringify({ cms, businessObjects, ratingsAndReviews });
@@ -30,6 +42,36 @@ async function fetchTypegenSchema(config) {
         ratingsAndReviews
     };
 }
+async function resolveAccessToken(apiBase, app, auth) {
+    const token = auth.token?.trim();
+    if (token)
+        return token;
+    const clientId = auth.clientId?.trim();
+    const clientSecret = auth.clientSecret?.trim();
+    if (!clientId && !clientSecret) {
+        throw new Error(`Either a bearer token or client credentials are required for ${app} type generation.`);
+    }
+    if (!clientId || !clientSecret) {
+        throw new Error(`Both client id and client secret are required for ${app} type generation.`);
+    }
+    const response = await fetch(`${apiBase}/${app}/oauth/token`, {
+        method: "POST",
+        headers: {
+            accept: "application/json",
+            "content-type": "application/x-www-form-urlencoded"
+        },
+        body: new URLSearchParams({
+            grant_type: "client_credentials",
+            client_id: clientId,
+            client_secret: clientSecret
+        })
+    });
+    const body = (await response.json().catch(() => null));
+    if (!response.ok || typeof body?.access_token !== "string" || !body.access_token.trim()) {
+        throw new Error(`Failed to request ${app} access token: ${response.statusText}`);
+    }
+    return body.access_token;
+}
 async function fetchCmsSchema(apiBase, token, spaceRef) {
     const space = await resolveSpace(apiBase, "management", token, spaceRef);
     const [contentTypes, taxonomyTypes] = await Promise.all([

package/dist/schema.d.ts

@@ -49,8 +49,14 @@ export type TypegenSchema = {
 export type TypegenConfig = {
     apiUrl: string;
     managementToken?: string;
+    managementClientId?: string;
+    managementClientSecret?: string;
     businessObjectsToken?: string;
+    businessObjectsClientId?: string;
+    businessObjectsClientSecret?: string;
     ratingsAndReviewsToken?: string;
+    ratingsAndReviewsClientId?: string;
+    ratingsAndReviewsClientSecret?: string;
     cmsSpace?: string;
     boSpace?: string;
     rrSpace?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnixdp/typegen",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "TypeScript type generator for Omni xDP SDK response models.",
   "license": "MIT",
   "repository": {