strapi-typed-client 1.6.1 → 2.0.1

package/dist/core/endpoint-converter.js

@@ -35,13 +35,90 @@ export function convertEndpointsToRoutes(endpoints) {
     }
     return { byController, all };
 }
+/**
+ * TS built-in / global type names that are always valid in a type expression
+ * and must never be treated as unresolved. Primitives (string, number, …) are
+ * lowercase so they aren't matched by the capitalised-identifier scan.
+ */
+const TS_BUILTIN_TYPES = new Set([
+    'Array',
+    'ReadonlyArray',
+    'Record',
+    'Partial',
+    'Required',
+    'Readonly',
+    'Pick',
+    'Omit',
+    'Exclude',
+    'Extract',
+    'NonNullable',
+    'Parameters',
+    'ReturnType',
+    'InstanceType',
+    'Awaited',
+    'Promise',
+    'Map',
+    'Set',
+    'WeakMap',
+    'WeakSet',
+    'Date',
+    'RegExp',
+    'Error',
+    'Object',
+    'String',
+    'Number',
+    'Boolean',
+    'Function',
+    'Symbol',
+    'BigInt',
+    'Uint8Array',
+    'ArrayBuffer',
+    'Blob',
+    'File',
+    'FormData',
+]);
+/**
+ * Custom-endpoint type strings are scraped verbatim from controller source, so
+ * they can reference named types that only exist in the controller's module
+ * (imported, never shipped) — emitting those would produce `Cannot find name`
+ * errors. Replace any capitalised identifier that isn't a TS built-in or a
+ * known generated/local type with `unknown` so the client always compiles.
+ * Full cross-module resolution is deferred to the ts-morph Endpoints parser.
+ *
+ * Heuristic and deliberately conservative: string literals are masked so names
+ * inside them are left alone, and identifiers in object-key position (followed
+ * by `:`) are treated as keys, not type references. Collects the names it
+ * dropped into `unresolved`.
+ */
+function sanitizeTypeRefs(typeStr, known, unresolved) {
+    // Mask string literals ('...' / "...") so identifiers inside them survive.
+    const literals = [];
+    const masked = typeStr.replace(/'[^']*'|"[^"]*"/g, m => {
+        literals.push(m);
+        return `${literals.length - 1}`;
+    });
+    const scanned = masked.replace(/\b[A-Z][A-Za-z0-9_]*\b/g, (name, offset, full) => {
+        // Skip object keys / labels: identifier immediately followed by `:`.
+        if (/^\s*:/.test(full.slice(offset + name.length)))
+            return name;
+        if (TS_BUILTIN_TYPES.has(name) || known.has(name))
+            return name;
+        unresolved.add(name);
+        return 'unknown';
+    });
+    return scanned.replace(/(\d+)/g, (_, i) => literals[Number(i)]);
+}
 /**
  * Convert ParsedEndpoint[] to ParsedCustomTypes format
  *
  * Extracts inline type definitions from endpoint types (body/response)
  * and creates handler-to-type mappings.
+ *
+ * `knownTypeNames` is the set of type names the generated client defines
+ * (content-type + component cleanNames, MediaFile, extra controller types) so
+ * the sanitizer can tell a resolvable reference from a dangling one.
  */
-export function convertEndpointsToCustomTypes(endpoints, extraTypes) {
+export function convertEndpointsToCustomTypes(endpoints, extraTypes, knownTypeNames = new Set()) {
     const types = new Map();
     const typeDefinitions = [];
     const namespaceImports = [];
@@ -78,15 +155,36 @@ export function convertEndpointsToCustomTypes(endpoints, extraTypes) {
         const namespaceName = toPascalCasePreserve(controller) + 'API';
         const namespaceLines = [];
         namespaceLines.push(`export namespace ${namespaceName} {`);
-        // Add extra (standalone) types first
         const controllerExtraTypes = extraByController.get(controller);
+        const controllerEndpoints = byController.get(controller);
+        // Names this namespace itself defines — added to the known set so a
+        // reference to a sibling type in the same namespace isn't mistaken for
+        // an unresolved one by the sanitizer.
+        const ownNames = new Set();
+        if (controllerExtraTypes) {
+            for (const extra of controllerExtraTypes)
+                ownNames.add(extra.typeName);
+        }
+        if (controllerEndpoints) {
+            for (const endpoint of controllerEndpoints) {
+                if (!endpoint.types)
+                    continue;
+                const ap = toPascalCasePreserve(endpoint.action);
+                if (endpoint.types.body)
+                    ownNames.add(`${ap}Request`);
+                if (endpoint.types.response)
+                    ownNames.add(`${ap}Response`);
+            }
+        }
+        const nsKnown = new Set([...knownTypeNames, ...ownNames]);
+        const unresolved = new Set();
+        // Add extra (standalone) types first
         if (controllerExtraTypes) {
             for (const extra of controllerExtraTypes) {
-                namespaceLines.push(`  export type ${extra.typeName} = ${extra.typeDefinition}`);
+                namespaceLines.push(`  export type ${extra.typeName} = ${sanitizeTypeRefs(extra.typeDefinition, nsKnown, unresolved)}`);
             }
         }
         // Add endpoint-derived types
-        const controllerEndpoints = byController.get(controller);
         if (controllerEndpoints) {
             for (const endpoint of controllerEndpoints) {
                 if (!endpoint.types)
@@ -95,7 +193,7 @@ export function convertEndpointsToCustomTypes(endpoints, extraTypes) {
                 // Generate Request type from body
                 if (endpoint.types.body) {
                     const typeName = `${actionPascal}Request`;
-                    namespaceLines.push(`  export type ${typeName} = ${endpoint.types.body}`);
+                    namespaceLines.push(`  export type ${typeName} = ${sanitizeTypeRefs(endpoint.types.body, nsKnown, unresolved)}`);
                     // Map handler to input type
                     const existing = types.get(endpoint.handler) || {
                         handler: endpoint.handler,
@@ -108,7 +206,7 @@ export function convertEndpointsToCustomTypes(endpoints, extraTypes) {
                     const typeName = `${actionPascal}Response`;
                     // Unwrap { data: ... } wrapper — StrapiClient already does response.data
                     const unwrappedResponse = unwrapDataWrapper(endpoint.types.response);
-                    namespaceLines.push(`  export type ${typeName} = ${unwrappedResponse}`);
+                    namespaceLines.push(`  export type ${typeName} = ${sanitizeTypeRefs(unwrappedResponse, nsKnown, unresolved)}`);
                     // Map handler to output type
                     const existing = types.get(endpoint.handler) || {
                         handler: endpoint.handler,
@@ -118,9 +216,17 @@ export function convertEndpointsToCustomTypes(endpoints, extraTypes) {
                 }
             }
         }
+        // If any referenced name couldn't be resolved we degraded it to
+        // `unknown` — leave a discoverable note in the committed output. Full
+        // cross-module resolution is deferred to the ts-morph Endpoints parser.
+        if (unresolved.size > 0) {
+            namespaceLines.splice(1, 0, `  // NOTE: ${[...unresolved].sort().join(', ')} could not be resolved from the schema and fall back to \`unknown\` (custom-endpoint types referencing controller-local types).`);
+        }
         namespaceLines.push('}');
-        // Only add namespace if it has content
-        if (namespaceLines.length > 2) {
+        // Only add namespace if it has real content (open + close, plus an
+        // optional NOTE, is empty).
+        const minLines = unresolved.size > 0 ? 3 : 2;
+        if (namespaceLines.length > minLines) {
             typeDefinitions.push(namespaceLines.join('\n'));
             namespaceImports.push(namespaceName);
         }

package/dist/core/endpoint-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint-converter.js","sourceRoot":"","sources":["../../src/core/endpoint-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"endpoint-converter.js","sourceRoot":"","sources":["../../src/core/endpoint-converter.ts"],"names":[],"mappings":"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"}

package/dist/generator/auth-api-generator.d.ts

@@ -2,13 +2,21 @@ import { ParsedRoute } from '../shared/route-types.js';
 export declare class AuthApiGenerator {
     generateAuthTypes(): string;
     generateAuthApiClass(authRoutes?: ParsedRoute[], userRoutes?: ParsedRoute[]): string;
-    private generateHardcodedAuthApiClass;
-    private generateDynamicAuthApiClass;
-    private generateDynamicAuthMethod;
+    private buildAuthApiClass;
+    /**
+     * The method name a route will be emitted under — mirrors the renames in
+     * generateAuthMethod (login, confirmEmail). Used to detect collisions with
+     * the injected client-side helpers.
+     */
+    private methodNameFor;
+    private generateAuthMethod;
     private getReturnType;
     private generateMeMethod;
     private generateUpdateMeMethod;
     private generateCallbackMethod;
+    private generateConfirmEmailMethod;
+    private generateSendEmailConfirmationMethod;
+    private generateClientSideHelpers;
     private generateAuthMethodParams;
     private generateAuthPathExpression;
 }

package/dist/generator/auth-api-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-api-generator.d.ts","sourceRoot":"","sources":["../../src/generator/auth-api-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAGtD,qBAAa,gBAAgB;IACzB,iBAAiB,IAAI,MAAM;IAkF3B,oBAAoB,CAChB,UAAU,GAAE,WAAW,EAAO,EAC9B,UAAU,GAAE,WAAW,EAAO,GAC/B,MAAM;IAYT,OAAO,CAAC,6BAA6B;IAiMrC,OAAO,CAAC,2BAA2B;IAgCnC,OAAO,CAAC,yBAAyB;IAoEjC,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,0BAA0B;CAWrC"}
+{"version":3,"file":"auth-api-generator.d.ts","sourceRoot":"","sources":["../../src/generator/auth-api-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AA+FtD,qBAAa,gBAAgB;IACzB,iBAAiB,IAAI,MAAM;IAqG3B,oBAAoB,CAChB,UAAU,GAAE,WAAW,EAAO,EAC9B,UAAU,GAAE,WAAW,EAAO,GAC/B,MAAM;IAkBT,OAAO,CAAC,iBAAiB;IA+CzB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,kBAAkB;IAqE1B,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,0BAA0B;IAiBlC,OAAO,CAAC,mCAAmC;IAe3C,OAAO,CAAC,yBAAyB;IAuBjC,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,0BAA0B;CAWrC"}