@omnixdp/typegen 0.2.0 → 0.2.2

package/README.md

@@ -25,7 +25,7 @@ npx omnixdp-typegen \
   --out src/omnixdp.generated.ts
 ```
 
-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.
+Space arguments can be a space id, slug, or exact name. Typegen loads `.env` and `.env.local` before evaluating config files, then 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
 

package/dist/cli.d.ts

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

package/dist/cli.js

@@ -24,17 +24,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadEnvFiles = loadEnvFiles;
+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) {
         printHelp();
         return;
     }
+    await loadEnvFiles();
     const fileConfig = args.config ? await loadConfig(args.config) : await loadDefaultConfig();
     const config = compactConfig({ ...fileConfig, ...args });
     const out = config.out ?? "src/omnixdp.generated.ts";
@@ -56,6 +61,56 @@ async function main() {
     await (0, promises_1.writeFile)(outPath, output, "utf8");
     console.log(`Generated ${out}`);
 }
+async function loadEnvFiles(cwd = process.cwd()) {
+    const protectedKeys = new Set(Object.keys(process.env));
+    for (const file of [".env", ".env.local"]) {
+        const values = await readEnvFile((0, node_path_1.join)(cwd, file));
+        for (const [key, value] of Object.entries(values)) {
+            if (!protectedKeys.has(key)) {
+                process.env[key] = value;
+            }
+        }
+    }
+}
+async function readEnvFile(path) {
+    const content = await (0, promises_1.readFile)(path, "utf8").catch((error) => {
+        if (error.code === "ENOENT")
+            return null;
+        throw error;
+    });
+    if (content === null)
+        return {};
+    const values = {};
+    for (const line of content.split(/\r?\n/)) {
+        const parsed = parseEnvLine(line);
+        if (parsed) {
+            values[parsed.key] = parsed.value;
+        }
+    }
+    return values;
+}
+function parseEnvLine(line) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#"))
+        return null;
+    const normalized = trimmed.startsWith("export ") ? trimmed.slice("export ".length).trimStart() : trimmed;
+    const separatorIndex = normalized.indexOf("=");
+    if (separatorIndex <= 0)
+        return null;
+    const key = normalized.slice(0, separatorIndex).trim();
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
+        return null;
+    return { key, value: unquoteEnvValue(normalized.slice(separatorIndex + 1).trim()) };
+}
+function unquoteEnvValue(value) {
+    if (value.length >= 2 && value.startsWith("\"") && value.endsWith("\"")) {
+        return value.slice(1, -1).replace(/\\n/g, "\n").replace(/\\r/g, "\r").replace(/\\"/g, "\"").replace(/\\\\/g, "\\");
+    }
+    if (value.length >= 2 && value.startsWith("'") && value.endsWith("'")) {
+        return value.slice(1, -1);
+    }
+    return value.replace(/\s+#.*$/, "");
+}
 function parseArgs(argv) {
     const out = {};
     for (let i = 0; i < argv.length; i += 1) {
@@ -149,8 +204,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 !== ""));
@@ -179,7 +244,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/package.json

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