@tetrascience-npm/request 0.2.0-beta.106.2 → 0.2.1-beta.112.2

package/dist/cli/generate-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-schemas.d.ts","sourceRoot":"","sources":["../../src/cli/generate-schemas.ts"],"names":[],"mappings":";AA8DA;;GAEG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5C;AAMD,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CA6GnG"}
+{"version":3,"file":"generate-schemas.d.ts","sourceRoot":"","sources":["../../src/cli/generate-schemas.ts"],"names":[],"mappings":";AA8DA;;GAEG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5C;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAkEnG"}

package/dist/cli/generate-schemas.js

@@ -39,14 +39,14 @@ exports.generateRequestSchemas = generateRequestSchemas;
 /**
  * Generates Zod request-body schemas from an OpenAPI spec.
  *
- * 1. Runs openapi-zod-client to get Zod schemas for all components
- * 2. Parses the OpenAPI spec to find which path+method has a request body
- * 3. Outputs a validation map: "METHOD /path" -> Zod schema
+ * Uses openapi-zod-client's programmatic API to:
+ * 1. Parse the OpenAPI spec into structured schema + endpoint data
+ * 2. Extract request body schema mappings from endpoint definitions
+ * 3. Output a validation map: "METHOD /path" -> Zod schema
  *
  * Usage:
  *   generate-request-schemas --spec <path-to-openapi-yaml> --out <output-dir>
  */
-const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function parseArgs() {
@@ -100,103 +100,53 @@ function findBin(name) {
     console.error(`Error: ${name} not found. Install it as a devDependency: yarn add -D ${name}`);
     process.exit(1);
 }
-function findZodClientBin() {
-    return findBin('openapi-zod-client');
-}
 function generateRequestSchemas(specPath, outDir, outFileName) {
-    const tmpFile = path.join(outDir, '.zod-raw.ts');
     const outFile = path.join(outDir, outFileName || 'request-schemas.ts');
     fs.mkdirSync(outDir, { recursive: true });
-    // 1. Generate full zodios output to a temp file
-    const zodClientBin = findZodClientBin();
-    (0, child_process_1.execSync)(`"${zodClientBin}" "${specPath}" -o "${tmpFile}" --export-schemas`, { stdio: 'inherit' });
-    let raw;
+    // 1. Load OpenAPI spec and get structured schema/endpoint data via programmatic API
+    const spec = loadYaml(specPath);
+    let getZodClientTemplateContext;
     try {
-        raw = fs.readFileSync(tmpFile, 'utf-8');
+        ({ getZodClientTemplateContext } = require('openapi-zod-client'));
     }
     catch {
-        throw new Error(`Failed to read generated file: ${tmpFile}`);
-    }
-    // Extract schema section (everything before `const endpoints = makeApi(`)
-    const endpointsIdx = raw.indexOf('const endpoints = makeApi(');
-    if (endpointsIdx === -1) {
-        fs.unlinkSync(tmpFile);
-        throw new Error('Could not find endpoints definition in generated file');
+        console.error('Error: openapi-zod-client is required for schema generation. Install it as a devDependency: yarn add -D openapi-zod-client');
+        process.exit(1);
     }
-    const schemaSection = raw
-        .substring(0, endpointsIdx)
-        .split('\n')
-        .filter((l) => !l.startsWith('import '))
-        .join('\n')
-        .trim();
-    // 2. Parse the OpenAPI spec to find request body -> schema name mappings
-    const spec = loadYaml(specPath);
+    const ctx = getZodClientTemplateContext(spec, { shouldExportAllSchemas: true });
+    // 2. Build "METHOD /path" -> schema name map from endpoint definitions
+    //    openapi-zod-client converts path params to Express format (:id),
+    //    but openapi-fetch's schemaPath uses OpenAPI format ({id}).
+    const toOpenApiPath = (p) => p.replace(/:(\w+)/g, '{$1}');
     const bodyMap = {};
-    for (const [pathStr, methods] of Object.entries(spec.paths || {})) {
-        for (const [method, operation] of Object.entries(methods)) {
-            if (method === 'parameters')
-                continue;
-            const op = operation;
-            const requestBody = op.requestBody;
-            if (!requestBody?.content?.['application/json']?.schema)
-                continue;
-            const schema = requestBody.content['application/json'].schema;
-            const key = `${method.toUpperCase()} ${pathStr}`;
-            if (schema.$ref) {
-                const schemaName = schema.$ref.split('/').pop();
-                bodyMap[key] = schemaName;
-            }
-            else if (schema.type === 'array' && schema.items?.$ref) {
-                const opId = op.operationId?.replace(/-/g, '_');
-                if (opId)
-                    bodyMap[key] = `${opId}_Body`;
-            }
-            else {
-                const opId = op.operationId?.replace(/-/g, '_');
-                if (opId)
-                    bodyMap[key] = `${opId}_Body`;
-            }
-        }
-    }
-    // 3. Verify all referenced schema names exist in the generated code
-    const exportedSchemaNames = [...raw.matchAll(/^const (\w+)\s*=\s*z[.\s]/gm)].map((m) => m[1]);
-    for (const [key, schemaName] of Object.entries(bodyMap)) {
-        if (raw.includes(`const ${schemaName} =`) || raw.includes(`const ${schemaName}=`)) {
+    for (const endpoint of ctx.endpoints) {
+        const bodyParam = endpoint.parameters.find((p) => p.type === 'Body');
+        if (!bodyParam)
             continue;
-        }
-        // Try to find a schema with matching suffix
-        const parts = schemaName.split('_');
-        const resourceHint = parts.slice(1, -1).join('_');
-        const fallback = exportedSchemaNames.find((name) => name.endsWith('_Body') && name.includes(resourceHint));
-        if (fallback) {
-            console.log(`  info: ${key}: "${schemaName}" -> "${fallback}" (shared schema)`);
-            bodyMap[key] = fallback;
-        }
-        else {
-            console.warn(`  warn: Schema "${schemaName}" for ${key} not found — skipping`);
-            delete bodyMap[key];
-        }
+        const key = `${endpoint.method.toUpperCase()} ${toOpenApiPath(endpoint.path)}`;
+        bodyMap[key] = bodyParam.schema;
     }
-    // 4. Build output file
+    // 3. Build output file — schemas are already in dependency order (topologically sorted)
     const lines = [
         '// AUTO-GENERATED — do not edit. Run `generate-request-schemas` to regenerate.',
         "import { z } from 'zod'",
         '',
-        schemaSection,
-        '',
-        '/**',
-        ' * Map of "METHOD /path" -> Zod schema for request body validation.',
-        ' * Used by the request validation middleware.',
-        ' */',
-        'export const requestBodySchemas: Record<string, z.ZodTypeAny> = {',
     ];
+    for (const [name, code] of Object.entries(ctx.schemas)) {
+        lines.push(`const ${name} = ${code}`);
+    }
+    lines.push('');
+    lines.push('/**');
+    lines.push(' * Map of "METHOD /path" -> Zod schema for request body validation.');
+    lines.push(' * Used by the request validation middleware.');
+    lines.push(' */');
+    lines.push('export const requestBodySchemas: Record<string, z.ZodTypeAny> = {');
     for (const [key, schemaName] of Object.entries(bodyMap)) {
         lines.push(`  '${key}': ${schemaName},`);
     }
     lines.push('}');
     lines.push('');
     fs.writeFileSync(outFile, lines.join('\n'));
-    fs.unlinkSync(tmpFile);
     console.log(`\nGenerated ${outFile}`);
     console.log(`  ${Object.keys(bodyMap).length} request body schemas mapped:`);
     for (const [key, schemaName] of Object.entries(bodyMap)) {

package/dist/cli/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/cli/templates.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAkBzC;AAaD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,MAAM,CA4E3F;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC1B,GAAG,MAAM,CAsBT;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAKhD;AAED,wBAAgB,cAAc,IAAI,MAAM,CAOvC"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/cli/templates.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAM7D;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAkBzC;AAaD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,MAAM,CA4E3F;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;CAC1B,GAAG,MAAM,CAsBT;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAKhD;AAED,wBAAgB,cAAc,IAAI,MAAM,CAGvC"}

package/dist/cli/templates.js

@@ -157,9 +157,5 @@ dist/
 }
 function generateYarnRc() {
     return `nodeLinker: node-modules
-
-npmScopes:
-  tetrascience:
-    npmRegistryServer: "https://tetrascience.jfrog.io/artifactory/api/npm/ts-npm-virtual/"
 `;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tetrascience-npm/request",
-	"version": "0.2.0-beta.106.2",
+	"version": "0.2.1-beta.112.2",
 	"description": "Request tracking middleware for TetraScience services and data apps (client + server).",
 	"license": "Apache-2.0",
 	"packageManager": "yarn@4.1.0",