npm - @drttix/drt-sdk - Versions diffs - 1.3.5 → 1.4.1 - Mend

@drttix/drt-sdk 1.3.5 → 1.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (312) hide show

package/src/scripts/build-all.ts CHANGED Viewed

@@ -89,9 +89,87 @@ console.log('✅ Replaced portal/core/request.ts with custom-request.txt');
 fs.writeFileSync(scannerRequestPath, customRequestContent);
 console.log('✅ Replaced scanner/core/request.ts with custom-request.txt');
-// Strip credential params (shopperguid/accountid/apikey) from all generated service methods.
-// DRT.init() injects these globally via OpenAPI.HEADERS, so callers never need to pass them.
-console.log('⚙️  Stripping credential params from generated services...');
+// Strip/rework credential params (shopperguid/accountid/apikey) from all generated service methods.
+//
+// Portal and scanner: DRT.init() injects these globally via OpenAPI.HEADERS,
+// so callers never need to pass them — params are removed entirely.
+//
+// Shopper: the three params collapse into a single optional trailing
+// `context?: { shopperGuid?: string; accountId?: string }` argument, resolved
+// per-call via resolveShopperHeaders(). This is what lets DRT.init({
+// shopperScope: 'per-request' }) serve many shoppers/accounts from one SDK
+// instance — see src/functions/sdkConfig.ts.
+console.log('⚙️  Stripping/reworking credential params in generated services...');
+// Finds each `public static <name>(<params>): <returnType> { <body> }` method
+// by tracking paren/brace nesting (a single regex can't express "matching
+// close paren/brace" when the body itself contains nested {}/() such as
+// `headers: {...}` or `path: {...}`). For any method whose body calls
+// resolveShopperHeaders(context) but whose parameter list doesn't already
+// declare a `context` param, appends `context?: { shopperGuid?: string;
+// accountId?: string }` as the last parameter.
+function patchMissingContextParam(src: string): string {
+    const methodStart = /public static \w+\(/g;
+    let result = '';
+    let cursor = 0;
+    let match: RegExpExecArray | null;
+    while ((match = methodStart.exec(src))) {
+        const parenOpen = match.index + match[0].length - 1;
+        // Walk from the opening '(' to its matching ')'.
+        let depth = 0;
+        let i = parenOpen;
+        for (; i < src.length; i++) {
+            if (src[i] === '(') depth++;
+            else if (src[i] === ')') {
+                depth--;
+                if (depth === 0) break;
+            }
+        }
+        const parenClose = i;
+        // Walk forward to the method's opening '{', then to its matching '}'.
+        const braceOpen = src.indexOf('{', parenClose);
+        depth = 0;
+        let j = braceOpen;
+        for (; j < src.length; j++) {
+            if (src[j] === '{') depth++;
+            else if (src[j] === '}') {
+                depth--;
+                if (depth === 0) break;
+            }
+        }
+        const braceClose = j;
+        const params = src.slice(parenOpen + 1, parenClose);
+        const body = src.slice(braceOpen + 1, braceClose);
+        if (/resolveShopperHeaders\(context\)/.test(body) && !/context\?:/.test(params)) {
+            // Indentation of an existing parameter line (the new param
+            // matches it); indentation of the ')' line (preserved as-is).
+            const paramIndentMatch = /\r?\n([^\S\r\n]+)\S/.exec(params);
+            const paramIndent = paramIndentMatch ? paramIndentMatch[1] : '        ';
+            const closeIndentMatch = /\r?\n([^\S\r\n]*)$/.exec(params);
+            const closeIndent = closeIndentMatch ? closeIndentMatch[1] : '    ';
+            const trimmedParams = params.replace(/[,\s]*$/, '');
+            const sep = trimmedParams.trim() ? ',\r\n' : '\r\n';
+            const newParams =
+                trimmedParams +
+                sep +
+                `${paramIndent}context?: { shopperGuid?: string; accountId?: string },\r\n${closeIndent}`;
+            result += src.slice(cursor, parenOpen + 1) + newParams;
+            cursor = parenClose;
+        }
+        methodStart.lastIndex = braceClose;
+    }
+    result += src.slice(cursor);
+    return result;
+}
 function walkServices(dir: string): string[] {
     const results: string[] = [];
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
@@ -107,39 +185,146 @@ function walkServices(dir: string): string[] {
     return results;
 }
 const serviceFiles = walkServices(GENERATED_BASE);
+const shopperServicesDir = path.join(GENERATED_BASE, 'shopper', 'services');
 for (const file of serviceFiles) {
+    const isShopperService = file.startsWith(shopperServicesDir);
     let src = fs.readFileSync(file, 'utf-8');
-    let patched = src
-        // Remove param lines from function signatures
+    let patched: string;
+    if (isShopperService) {
+        patched = src
+            // Fold the shopperguid param into an optional context param
+            .replace(
+                /\n(\s*)shopperguid: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+                '\n$1context?: { shopperGuid?: string; accountId?: string },',
+            )
+            // accountid/apikey are resolved from context/DRT.init() instead
+            .replace(
+                /\n\s*accountid: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+                '',
+            )
+            .replace(
+                /\n\s*apikey: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+                '',
+            )
+            // Rework @param jsdoc lines
+            .replace(
+                /\n(\s*)\* @param shopperguid[^\n]*/g,
+                '\n$1* @param context Optional per-call { shopperGuid, accountId } override. Falls back to the values passed to DRT.init().',
+            )
+            .replace(/\n\s*\* @param accountid[^\n]*/g, '')
+            .replace(/\n\s*\* @param apikey[^\n]*/g, '')
+            // Replace the credential header block with a resolver call. A few
+            // endpoints (e.g. DonationService.postDonation's ipAddress header)
+            // have an additional non-credential header — merge into those
+            // instead of emitting a second "headers:" key.
+            .replace(/\n\s*'shopperguid': shopperguid,/g, '')
+            .replace(/\n\s*'accountid': accountid,/g, '')
+            .replace(/\n\s*'apikey': apikey,/g, '')
+            .replace(
+                /headers: \{\s*\},/g,
+                'headers: resolveShopperHeaders(context),',
+            )
+            .replace(
+                /headers: \{\n(\s*)/g,
+                'headers: {\n$1...resolveShopperHeaders(context),\n$1',
+            )
+            // TS1016: a required parameter cannot follow an optional one.
+            // When context? was injected in place of shopperguid (which appeared
+            // before requestBody in the original spec), it ends up before a
+            // required requestBody param. Move context? to after requestBody.
+            // Note: blank "lines" between params may be orphaned \r chars (CRLF
+            // files lose the \n when accountid/apikey lines are stripped) — use
+            // [\r\n]+ to match any combination of CR/LF between the two params.
+            .replace(
+                /\n([^\S\n]+)context\?:\s*\{\s*shopperGuid\?:\s*string;\s*accountId\?:\s*string\s*\},[\r\n]+[^\S\n]+(requestBody:\s+[^?,\r\n][^,\r\n]*),/g,
+                (_, indent, rbPart) =>
+                    `\n${indent}${rbPart},\n${indent}context?: { shopperGuid?: string; accountId?: string },`,
+            );
+        // Some endpoints (e.g. Stripe's integrator-only calls) declare no
+        // shopperguid param, so the replace above never injects a `context`
+        // parameter into their signature — yet they still call
+        // resolveShopperHeaders(context) via the headers: {} replacement,
+        // leaving a dangling reference to an undeclared `context`. Add the
+        // param to any method signature whose body calls
+        // resolveShopperHeaders(context) but doesn't already declare one.
+        // Brace/paren nesting inside method bodies (headers: {...}, path:
+        // {...}, etc.) makes this unsafe to express as a single regex, so
+        // methods are located by tracking paren depth from `public static`
+        // through the matching close-paren of the parameter list, then brace
+        // depth from the following `{` through the matching method-closing
+        // `}`.
+        patched = patchMissingContextParam(patched);
+        if (patched !== src) {
+            patched = patched.replace(
+                "import { request as __request } from '../core/request';",
+                "import { request as __request } from '../core/request';\nimport { resolveShopperHeaders } from '../../../functions/sdkConfig';",
+            );
+        }
+    } else {
+        patched = src
+            // Remove param lines from function signatures
+            .replace(
+                /\n\s*shopperguid: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+                '',
+            )
+            .replace(
+                /\n\s*accountid: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+                '',
+            )
+            .replace(
+                /\n\s*apikey: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+                '',
+            )
+            // Remove @param jsdoc lines
+            .replace(/\n\s*\* @param shopperguid[^\n]*/g, '')
+            .replace(/\n\s*\* @param accountid[^\n]*/g, '')
+            .replace(/\n\s*\* @param apikey[^\n]*/g, '')
+            // Remove header entries inside __request
+            .replace(/\n\s*'shopperguid': shopperguid,/g, '')
+            .replace(/\n\s*'accountid': accountid,/g, '')
+            .replace(/\n\s*'apikey': apikey,/g, '')
+            // Remove empty headers: {} blocks left behind
+            .replace(/\n\s*headers: \{\s*\},/g, '');
+    }
+    if (patched !== src) {
+        fs.writeFileSync(file, patched);
+    }
+}
+console.log(
+    `✅ Stripped/reworked credentials in ${serviceFiles.length} service files`,
+);
+// --- Patch portal ClientToolsTicketingLinkService to return Blob for generateFlyer
+// The AdminPortal Swagger declares this as binary/pdf but openapi-typescript-codegen
+// may still emit a non-Blob return type depending on the spec version. Patch as a safeguard.
+const flyerServicePath = path.resolve(
+    'src/generated/portal/services/ClientToolsTicketingLinkService.ts',
+);
+if (fs.existsSync(flyerServicePath)) {
+    let flyerSrc = fs.readFileSync(flyerServicePath, 'utf-8');
+    // Remove the SuccessResponse import if present (no longer needed for this file if it was only used here)
+    const patchedFlyerSrc = flyerSrc
         .replace(
-            /\n\s*shopperguid: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
+            /import type \{ SuccessResponse \} from '\.\.\/models\/SuccessResponse';\n/g,
             '',
         )
         .replace(
-            /\n\s*accountid: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
-            '',
+            /\* @returns SuccessResponse [^\n]*\n(\s*\* @throws)/,
+            '* @returns binary Returns the generated PDF Flyer as a blob\n$1',
         )
         .replace(
-            /\n\s*apikey: string(?:\s*\|\s*undefined)?\s*(?:=\s*undefined)?,/g,
-            '',
-        )
-        // Remove @param jsdoc lines
-        .replace(/\n\s*\* @param shopperguid[^\n]*/g, '')
-        .replace(/\n\s*\* @param accountid[^\n]*/g, '')
-        .replace(/\n\s*\* @param apikey[^\n]*/g, '')
-        // Remove header entries inside __request
-        .replace(/\n\s*'shopperguid': shopperguid,/g, '')
-        .replace(/\n\s*'accountid': accountid,/g, '')
-        .replace(/\n\s*'apikey': apikey,/g, '')
-        // Remove empty headers: {} blocks left behind
-        .replace(/\n\s*headers: \{\s*\},/g, '');
-    if (patched !== src) {
-        fs.writeFileSync(file, patched);
+            /\): CancelablePromise<SuccessResponse> \{(\s*return __request\(OpenAPI, \{[\s\S]*?url: '\/client-tools\/ticketing-link\/flyer')/,
+            '): CancelablePromise<Blob> {$1',
+        );
+    if (patchedFlyerSrc !== flyerSrc) {
+        fs.writeFileSync(flyerServicePath, patchedFlyerSrc);
+        console.log('✅ Patched generateFlyer return type to Blob');
+    } else {
+        console.log('✅ generateFlyer already returns Blob (no patch needed)');
     }
 }
-console.log(
-    `✅ Stripped credentials from ${serviceFiles.length} service files`,
-);
 // --- Generate index.ts
 console.log(`🧩 Generating DRT index...`);

package/src/generated/shopper/models/SaveNonceBody.ts DELETED Viewed

@@ -1,15 +0,0 @@
-/* generated using openapi-typescript-codegen -- do not edit */
-/* istanbul ignore file */
-/* tslint:disable */
-/* eslint-disable */
-export type SaveNonceBody = {
-    descriptor: string;
-    value: string;
-    firstName: string;
-    lastName: string;
-    ccType?: string;
-    ccNum4?: string;
-    ccExpMonth?: string;
-    ccExpYear?: string;
-};