npm - oazapfts - Versions diffs - 4.3.1-formatted-path-params.1 → 4.3.2 - Mend

oazapfts 4.3.1-formatted-path-params.1 → 4.3.2

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 (29) hide show

package/lib/codegen/generate.d.ts +4 -5
package/lib/codegen/generate.js +6 -36
package/lib/codegen/generate.js.map +1 -1
package/lib/codegen/generate.test.js +0 -6
package/lib/codegen/generate.test.js.map +1 -1
package/lib/codegen/index.d.ts +1 -1
package/lib/codegen/tscodegen.d.ts +6 -11
package/lib/codegen/tscodegen.js +10 -10
package/lib/codegen/tscodegen.js.map +1 -1
package/lib/index.d.ts +10 -10
package/lib/runtime/index.d.ts +10 -7
package/lib/runtime/index.js +3 -3
package/lib/runtime/index.js.map +1 -1
package/lib/runtime/query.d.ts +2 -5
package/lib/runtime/query.js +4 -7
package/lib/runtime/query.js.map +1 -1
package/lib/runtime/query.test.js +2 -8
package/lib/runtime/query.test.js.map +1 -1
package/lib/runtime/util.d.ts +2 -3
package/lib/runtime/util.js +8 -17
package/lib/runtime/util.js.map +1 -1
package/package.json +15 -15
package/src/codegen/generate.test.ts +1 -8
package/src/codegen/generate.ts +13 -72
package/src/codegen/tscodegen.ts +0 -15
package/src/runtime/index.ts +9 -5
package/src/runtime/query.test.ts +2 -8
package/src/runtime/query.ts +4 -12
package/src/runtime/util.ts +9 -26

package/lib/codegen/generate.d.ts CHANGED Viewed

@@ -2,15 +2,15 @@ import ts from "typescript";
 import { OpenAPIV3 } from "openapi-types";
 import { Opts } from ".";
 export declare const verbs: string[];
-declare type ContentType = "json" | "form" | "multipart";
+type ContentType = "json" | "form" | "multipart";
 export declare const contentTypes: Record<string, ContentType>;
-declare type SchemaObject = OpenAPIV3.SchemaObject & {
+type SchemaObject = OpenAPIV3.SchemaObject & {
     const?: unknown;
 };
 /**
  * Get the name of a formatter function for a given parameter.
  */
-export declare function getFormatter({ style, explode, }: OpenAPIV3.ParameterObject): "form" | "deep" | "explode" | "simple" | "space" | "pipe";
+export declare function getFormatter({ style, explode, }: OpenAPIV3.ParameterObject): "form" | "deep" | "explode" | "space" | "pipe";
 export declare function getOperationIdentifier(id?: string): string | undefined;
 /**
  * Create a method name for a given operation, either from its operationId or
@@ -29,7 +29,7 @@ export declare function getReferenceName(obj: any): string | undefined;
  * Curly braces in the path are turned into identifier expressions,
  * which are read from the local scope during runtime.
  */
-export declare function createUrlExpression(path: string, qs?: ts.Expression, formatPathParameter?: (name: string) => ts.Expression): ts.StringLiteral | ts.TemplateExpression;
+export declare function createUrlExpression(path: string, qs?: ts.Expression): ts.StringLiteral | ts.TemplateExpression;
 /**
  * Create a call expression for one of the QS runtime functions.
  */
@@ -104,7 +104,6 @@ export default class ApiGenerator {
     getResponseType(responses?: OpenAPIV3.ResponsesObject): "json" | "text" | "blob";
     getSchemaFromContent(content: any): any;
     wrapResult(ex: ts.Expression): ts.Expression;
-    formatPathParameter(name: string, parameter?: OpenAPIV3.ParameterObject): ts.CallExpression;
     generateApi(): ts.SourceFile;
 }
 export {};

package/lib/codegen/generate.js CHANGED Viewed

@@ -60,8 +60,6 @@ function getFormatter({ style = "form", explode = true, }) {
         return "deep";
     if (explode)
         return "explode";
-    if (style === "simple")
-        return "simple";
     if (style === "spaceDelimited")
         return "space";
     if (style === "pipeDelimited")
@@ -121,23 +119,18 @@ function getReferenceName(obj) {
     }
 }
 exports.getReferenceName = getReferenceName;
-const formatPrimitivePathParameter = (name) => {
-    const expression = lodash_1.default.camelCase(name);
-    return cg.createCall(typescript_1.factory.createIdentifier("encodeURIComponent"), {
-        args: [typescript_1.factory.createIdentifier(expression)],
-    });
-};
 /**
  * Create a template string literal from the given OpenAPI urlTemplate.
  * Curly braces in the path are turned into identifier expressions,
  * which are read from the local scope during runtime.
  */
-function createUrlExpression(path, qs, formatPathParameter = formatPrimitivePathParameter) {
+function createUrlExpression(path, qs) {
     const spans = [];
     // Use a replacer function to collect spans as a side effect:
     const head = path.replace(/(.*?)\{(.+?)\}(.*?)(?=\{|$)/g, (_substr, head, name, literal) => {
+        const expression = lodash_1.default.camelCase(name);
         spans.push({
-            expression: formatPathParameter(name),
+            expression: cg.createCall(typescript_1.factory.createIdentifier("encodeURIComponent"), { args: [typescript_1.factory.createIdentifier(expression)] }),
             literal,
         });
         return head;
@@ -449,7 +442,7 @@ class ApiGenerator {
                 ? typescript_1.factory.createNumericLiteral(index)
                 : typescript_1.factory.createStringLiteral(s));
         });
-        this.enumAliases.push(typescript_1.factory.createEnumDeclaration(undefined, [cg.modifier.export], name, members));
+        this.enumAliases.push(typescript_1.factory.createEnumDeclaration([cg.modifier.export], name, members));
         const type = typescript_1.factory.createTypeReferenceNode(name, undefined);
         this.enumRefs[proposedName] = {
             values: stringEnumValue,
@@ -556,23 +549,6 @@ class ApiGenerator {
         var _a;
         return ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.optimistic) ? callOazapftsFunction("ok", [ex]) : ex;
     }
-    formatPathParameter(name, parameter) {
-        const schema = (parameter === null || parameter === void 0 ? void 0 : parameter.schema)
-            ? this.resolve(parameter.schema)
-            : null;
-        if (parameter && ((schema === null || schema === void 0 ? void 0 : schema.type) === "array" || (schema === null || schema === void 0 ? void 0 : schema.type) === "object")) {
-            const expression = lodash_1.default.camelCase(name);
-            const formatter = getFormatter(Object.assign({ style: "simple", explode: parameter.style === "form" }, parameter));
-            return callQsFunction(formatter, formatter === "simple" || formatter === "pipe" || formatter === "space"
-                ? [typescript_1.factory.createIdentifier(expression)]
-                : [
-                    cg.createObjectLiteral([
-                        [expression, typescript_1.factory.createIdentifier(expression)],
-                    ]),
-                ]);
-        }
-        return formatPrimitivePathParameter(name);
-    }
     generateApi() {
         this.reset();
         // Parse ApiStub.ts so that we don't have to generate everything manually
@@ -679,18 +655,12 @@ class ApiGenerator {
                     const paramsByFormatter = lodash_1.default.groupBy(query, getFormatter);
                     qs = callQsFunction("query", Object.entries(paramsByFormatter).map(([format, params]) => {
                         //const [allowReserved, encodeReserved] = _.partition(params, "allowReserved");
-                        return callQsFunction(format === "simple"
-                            ? "form"
-                            : format === "pipe"
-                                ? "formPipe"
-                                : format === "space"
-                                    ? "formSpace"
-                                    : format, [
+                        return callQsFunction(format, [
                             cg.createObjectLiteral(params.map((p) => [p.name, argNames[p.name]])),
                         ]);
                     }));
                 }
-                const url = createUrlExpression(path, qs, (name) => this.formatPathParameter(name, parameters.find(({ name: n, in: loc }) => loc === "path" && n === name)));
+                const url = createUrlExpression(path, qs);
                 const init = [
                     typescript_1.factory.createSpreadAssignment(typescript_1.factory.createIdentifier("opts")),
                 ];

package/lib/codegen/generate.js.map CHANGED Viewed

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

package/lib/codegen/generate.test.js CHANGED Viewed

@@ -125,10 +125,4 @@ describe("generate with const", () => {
         expect(oneLine).toContain(constTypeDefinition);
     }));
 });
-// // https://spec.openapis.org/oas/v3.0.3#style-examples
-// describe('getFormatter', () => {
-//   it('formats correctly', () => {
-//     const formatter = getFormatter()
-//   })
-// })
 //# sourceMappingURL=generate.test.js.map

package/lib/codegen/generate.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate.test.js","sourceRoot":"","sources":["../../src/codegen/generate.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,~~uDAA0E~~;~~AAC1E~~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~~;AAEH,yDAAyD;AACzD,mCAAmC;AACnC,oCAAoC;AACpC,uCAAuC;AACvC,OAAO;AACP,KAAK~~"}
1	+ {"version":3,"file":"generate.test.js","sourceRoot":"","sources":["../../src/codegen/generate.test.ts"],"names":[],"mappings":"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"}

package/lib/codegen/index.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import * as cg from "./tscodegen";
 import ts from "typescript";
 import { OpenAPIV3 } from "openapi-types";
 export { cg };
-export declare type Opts = {
+export type Opts = {
     include?: string[];
     exclude?: string[];
     optimistic?: boolean;

package/lib/codegen/tscodegen.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import ts from "typescript";
-declare type KeywordTypeName = "any" | "number" | "object" | "string" | "boolean" | "undefined" | "null";
+type KeywordTypeName = "any" | "number" | "object" | "string" | "boolean" | "undefined" | "null";
 export declare const questionToken: ts.PunctuationToken<ts.SyntaxKind.QuestionToken>;
 export declare function createQuestionToken(token?: boolean | ts.QuestionToken): ts.PunctuationToken<ts.SyntaxKind.QuestionToken> | undefined;
 export declare function createKeywordType(type: KeywordTypeName): ts.KeywordTypeNode<ts.SyntaxKind.AnyKeyword> | ts.KeywordTypeNode<ts.SyntaxKind.NumberKeyword> | ts.KeywordTypeNode<ts.SyntaxKind.ObjectKeyword> | ts.KeywordTypeNode<ts.SyntaxKind.StringKeyword> | ts.KeywordTypeNode<ts.SyntaxKind.BooleanKeyword> | ts.KeywordTypeNode<ts.SyntaxKind.UndefinedKeyword> | ts.LiteralTypeNode;
@@ -10,8 +10,7 @@ export declare const modifier: {
     async: ts.ModifierToken<ts.SyntaxKind.AsyncKeyword>;
     export: ts.ModifierToken<ts.SyntaxKind.ExportKeyword>;
 };
-export declare function createTypeAliasDeclaration({ decorators, modifiers, name, typeParameters, type, }: {
-    decorators?: Array<ts.Decorator>;
+export declare function createTypeAliasDeclaration({ modifiers, name, typeParameters, type, }: {
     modifiers?: Array<ts.Modifier>;
     name: string | ts.Identifier;
     typeParameters?: Array<ts.TypeParameterDeclaration>;
@@ -35,8 +34,7 @@ export declare function createArrowFunction(parameters: ts.ParameterDeclaration[
     type?: ts.TypeNode;
     equalsGreaterThanToken?: ts.EqualsGreaterThanToken;
 }): ts.ArrowFunction;
-export declare function createFunctionDeclaration(name: string | ts.Identifier | undefined, { decorators, modifiers, asteriskToken, typeParameters, type, }: {
-    decorators?: ts.Decorator[];
+export declare function createFunctionDeclaration(name: string | ts.Identifier | undefined, { modifiers, asteriskToken, typeParameters, type, }: {
     modifiers?: ts.Modifier[];
     asteriskToken?: ts.AsteriskToken;
     typeParameters?: ts.TypeParameterDeclaration[];
@@ -56,16 +54,14 @@ export declare function createConstructor({ decorators, modifiers, parameters, b
     parameters: Array<ts.ParameterDeclaration>;
     body?: ts.Block;
 }): ts.ConstructorDeclaration;
-export declare function createMethod(name: string | ts.Identifier | ts.StringLiteral | ts.NumericLiteral | ts.ComputedPropertyName, { decorators, modifiers, asteriskToken, questionToken, typeParameters, type, }?: {
-    decorators?: ts.Decorator[];
+export declare function createMethod(name: string | ts.Identifier | ts.StringLiteral | ts.NumericLiteral | ts.ComputedPropertyName, { modifiers, asteriskToken, questionToken, typeParameters, type, }?: {
     modifiers?: ts.Modifier[];
     asteriskToken?: ts.AsteriskToken;
     questionToken?: ts.QuestionToken | boolean;
     typeParameters?: ts.TypeParameterDeclaration[];
     type?: ts.TypeNode;
 }, parameters?: ts.ParameterDeclaration[], body?: ts.Block): ts.MethodDeclaration;
-export declare function createParameter(name: string | ts.BindingName, { decorators, modifiers, dotDotDotToken, questionToken, type, initializer, }: {
-    decorators?: Array<ts.Decorator>;
+export declare function createParameter(name: string | ts.BindingName, { modifiers, dotDotDotToken, questionToken, type, initializer, }: {
     modifiers?: Array<ts.Modifier>;
     dotDotDotToken?: ts.DotDotDotToken;
     questionToken?: ts.QuestionToken | boolean;
@@ -78,10 +74,9 @@ export declare function createPropertySignature({ modifiers, name, questionToken
     questionToken?: ts.QuestionToken | boolean;
     type?: ts.TypeNode;
 }): ts.PropertySignature;
-export declare function createIndexSignature(type: ts.TypeNode, { decorators, modifiers, indexName, indexType, }?: {
+export declare function createIndexSignature(type: ts.TypeNode, { modifiers, indexName, indexType, }?: {
     indexName?: string;
     indexType?: ts.TypeNode;
-    decorators?: Array<ts.Decorator>;
     modifiers?: Array<ts.Modifier>;
 }): ts.IndexSignatureDeclaration;
 export declare function createObjectBinding(elements: Array<{

package/lib/codegen/tscodegen.js CHANGED Viewed

@@ -71,8 +71,8 @@ exports.modifier = {
     async: typescript_1.factory.createModifier(typescript_1.default.SyntaxKind.AsyncKeyword),
     export: typescript_1.factory.createModifier(typescript_1.default.SyntaxKind.ExportKeyword),
 };
-function createTypeAliasDeclaration({ decorators, modifiers, name, typeParameters, type, }) {
-    return typescript_1.factory.createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type);
+function createTypeAliasDeclaration({ modifiers, name, typeParameters, type, }) {
+    return typescript_1.factory.createTypeAliasDeclaration(modifiers, name, typeParameters, type);
 }
 exports.createTypeAliasDeclaration = createTypeAliasDeclaration;
 function toExpression(ex) {
@@ -110,8 +110,8 @@ function createArrowFunction(parameters, body, { modifiers, typeParameters, type
     return typescript_1.factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
 }
 exports.createArrowFunction = createArrowFunction;
-function createFunctionDeclaration(name, { decorators, modifiers, asteriskToken, typeParameters, type, }, parameters, body) {
-    return typescript_1.factory.createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body);
+function createFunctionDeclaration(name, { modifiers, asteriskToken, typeParameters, type, }, parameters, body) {
+    return typescript_1.factory.createFunctionDeclaration(modifiers, asteriskToken, name, typeParameters, parameters, type, body);
 }
 exports.createFunctionDeclaration = createFunctionDeclaration;
 function createClassDeclaration({ decorators, modifiers, name, typeParameters, heritageClauses, members, }) {
@@ -122,12 +122,12 @@ function createConstructor({ decorators, modifiers, parameters, body, }) {
     return typescript_1.factory.createConstructorDeclaration(decorators, modifiers, parameters, body);
 }
 exports.createConstructor = createConstructor;
-function createMethod(name, { decorators, modifiers, asteriskToken, questionToken, typeParameters, type, } = {}, parameters = [], body) {
-    return typescript_1.factory.createMethodDeclaration(decorators, modifiers, asteriskToken, name, createQuestionToken(questionToken), typeParameters, parameters, type, body);
+function createMethod(name, { modifiers, asteriskToken, questionToken, typeParameters, type, } = {}, parameters = [], body) {
+    return typescript_1.factory.createMethodDeclaration(modifiers, asteriskToken, name, createQuestionToken(questionToken), typeParameters, parameters, type, body);
 }
 exports.createMethod = createMethod;
-function createParameter(name, { decorators, modifiers, dotDotDotToken, questionToken, type, initializer, }) {
-    return typescript_1.factory.createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, createQuestionToken(questionToken), type, initializer);
+function createParameter(name, { modifiers, dotDotDotToken, questionToken, type, initializer, }) {
+    return typescript_1.factory.createParameterDeclaration(modifiers, dotDotDotToken, name, createQuestionToken(questionToken), type, initializer);
 }
 exports.createParameter = createParameter;
 function propertyName(name) {
@@ -142,8 +142,8 @@ function createPropertySignature({ modifiers, name, questionToken, type, }) {
     return typescript_1.factory.createPropertySignature(modifiers, propertyName(name), createQuestionToken(questionToken), type);
 }
 exports.createPropertySignature = createPropertySignature;
-function createIndexSignature(type, { decorators, modifiers, indexName = "key", indexType = exports.keywordType.string, } = {}) {
-    return typescript_1.factory.createIndexSignature(decorators, modifiers, [createParameter(indexName, { type: indexType })], type);
+function createIndexSignature(type, { modifiers, indexName = "key", indexType = exports.keywordType.string, } = {}) {
+    return typescript_1.factory.createIndexSignature(modifiers, [createParameter(indexName, { type: indexType })], type);
 }
 exports.createIndexSignature = createIndexSignature;
 function createObjectBinding(elements) {

package/lib/codegen/tscodegen.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tscodegen.js","sourceRoot":"","sources":["../../src/codegen/tscodegen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,yDAAyC;AAEzC,oBAAE,CAAC,uBAAuB,CAAC;AAUd,QAAA,aAAa,GAAG,oBAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAE9E,SAAgB,mBAAmB,CAAC,KAAkC;IACpE,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,qBAAa,CAAC;IACzC,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,kDAIC;AAED,SAAgB,iBAAiB,CAAC,IAAqB;IACrD,QAAQ,IAAI,EAAE;QACZ,KAAK,KAAK;YACR,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjE,KAAK,QAAQ;YACX,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,KAAK,QAAQ;YACX,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,KAAK,QAAQ;YACX,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,KAAK,SAAS;YACZ,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrE,KAAK,WAAW;YACd,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACvE,KAAK,MAAM;YACT,OAAO,oBAAO,CAAC,qBAAqB,CAClC,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAClD,CAAC;KACL;AACH,CAAC;AAnBD,8CAmBC;AAEY,QAAA,WAAW,GAEpB;IACF,GAAG,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAC5D,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAClE,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAClE,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAClE,OAAO,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC;IACpE,SAAS,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;IACxE,IAAI,EAAE,oBAAO,CAAC,qBAAqB,CACjC,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAClD;CACF,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,KAAK,EAAE,oBAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,YAAY,CAAC;IACzD,MAAM,EAAE,oBAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;CAC5D,CAAC;AAEF,SAAgB,0BAA0B,CAAC,EACzC,~~UAAU,EACV,~~SAAS,EACT,IAAI,EACJ,cAAc,EACd,IAAI,~~GAOL~~;IACC,OAAO,oBAAO,CAAC,0BAA0B,CACvC,~~UAAU,EACV,~~SAAS,EACT,IAAI,EACJ,cAAc,EACd,IAAI,CACL,CAAC;AACJ,CAAC;~~AApBD~~,~~gEAoBC~~;AAED,SAAgB,YAAY,CAAC,EAA0B;IACrD,IAAI,OAAO,EAAE,KAAK,QAAQ;QAAE,OAAO,oBAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAChE,OAAO,EAAE,CAAC;AACZ,CAAC;AAHD,oCAGC;AAED,SAAgB,UAAU,CACxB,UAAkC,EAClC,EACE,QAAQ,EACR,IAAI,MAIF,EAAE;IAEN,OAAO,oBAAO,CAAC,oBAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChF,CAAC;AAXD,gCAWC;AAED,SAAgB,gBAAgB,CAC9B,MAAc,EACd,IAGC;IAED,OAAO,UAAU,CACf,oBAAO,CAAC,8BAA8B,CAAC,oBAAO,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC,EACpE,IAAI,CACL,CAAC;AACJ,CAAC;AAXD,4CAWC;AAED,SAAgB,mBAAmB,CAAC,KAAyC;IAC3E,OAAO,oBAAO,CAAC,6BAA6B,CAC1C,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAC/B,wBAAwB,CAAC,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CACzD,EACD,IAAI,CACL,CAAC;AACJ,CAAC;AAPD,kDAOC;AAED,SAAgB,wBAAwB,CACtC,IAAY,EACZ,UAAyB;IAEzB,IAAI,oBAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;QAC/B,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,EAAE;YAC5B,OAAO,oBAAO,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;SACxD;KACF;IACD,OAAO,oBAAO,CAAC,wBAAwB,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;AAC1E,CAAC;AAVD,4DAUC;AAED,SAAgB,KAAK,CAAC,GAAG,UAA0B;IACjD,OAAO,oBAAO,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC;AAFD,sBAEC;AAED,SAAgB,mBAAmB,CACjC,UAAqC,EACrC,IAAoB,EACpB,EACE,SAAS,EACT,cAAc,EACd,IAAI,EACJ,sBAAsB,MAMpB,EAAE;IAEN,OAAO,oBAAO,CAAC,mBAAmB,CAChC,SAAS,EACT,cAAc,EACd,UAAU,EACV,IAAI,EACJ,sBAAsB,EACtB,IAAI,CACL,CAAC;AACJ,CAAC;AAvBD,kDAuBC;AAED,SAAgB,yBAAyB,CACvC,IAAwC,EACxC,EACE,~~UAAU,EACV,~~SAAS,EACT,aAAa,EACb,cAAc,EACd,IAAI,~~GAOL~~,EACD,UAAqC,EACrC,IAAe;IAEf,OAAO,oBAAO,CAAC,yBAAyB,CACtC,~~UAAU,EACV,~~SAAS,EACT,aAAa,EACb,IAAI,EACJ,cAAc,EACd,UAAU,EACV,IAAI,EACJ,IAAI,CACL,CAAC;AACJ,CAAC;~~AA5BD~~,~~8DA4BC~~;AAED,SAAgB,sBAAsB,CAAC,EACrC,UAAU,EACV,SAAS,EACT,IAAI,EACJ,cAAc,EACd,eAAe,EACf,OAAO,GAQR;IACC,OAAO,oBAAO,CAAC,sBAAsB,CACnC,UAAU,EACV,SAAS,EACT,IAAI,EACJ,cAAc,EACd,eAAe,EACf,OAAO,CACR,CAAC;AACJ,CAAC;AAvBD,wDAuBC;AAED,SAAgB,iBAAiB,CAAC,EAChC,UAAU,EACV,SAAS,EACT,UAAU,EACV,IAAI,GAML;IACC,OAAO,oBAAO,CAAC,4BAA4B,CACzC,UAAU,EACV,SAAS,EACT,UAAU,EACV,IAAI,CACL,CAAC;AACJ,CAAC;AAjBD,8CAiBC;AAED,SAAgB,YAAY,CAC1B,IAK2B,EAC3B,EACE,~~UAAU,EACV,~~SAAS,EACT,aAAa,EACb,aAAa,EACb,cAAc,EACd,IAAI,~~MAQF~~,EAAE,EACN,aAAwC,EAAE,EAC1C,IAAe;IAEf,OAAO,oBAAO,CAAC,uBAAuB,CACpC,~~UAAU,EACV,~~SAAS,EACT,aAAa,EACb,IAAI,EACJ,mBAAmB,CAAC,aAAa,CAAC,EAClC,cAAc,EACd,UAAU,EACV,IAAI,EACJ,IAAI,CACL,CAAC;AACJ,CAAC;~~AApCD~~,~~oCAoCC~~;AAED,SAAgB,eAAe,CAC7B,IAA6B,EAC7B,EACE,~~UAAU,EACV,~~SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,EACJ,WAAW,~~GAQZ~~;IAED,OAAO,oBAAO,CAAC,0BAA0B,CACvC,~~UAAU,EACV,~~SAAS,EACT,cAAc,EACd,IAAI,EACJ,mBAAmB,CAAC,aAAa,CAAC,EAClC,IAAI,EACJ,WAAW,CACZ,CAAC;AACJ,CAAC;~~AA3BD~~,~~0CA2BC~~;AAED,SAAS,YAAY,CAAC,IAA8B;IAClD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,OAAO,iBAAiB,CAAC,IAAI,CAAC;YAC5B,CAAC,CAAC,oBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAChC,CAAC,CAAC,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;KACvC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,uBAAuB,CAAC,EACtC,SAAS,EACT,IAAI,EACJ,aAAa,EACb,IAAI,GAML;IACC,OAAO,oBAAO,CAAC,uBAAuB,CACpC,SAAS,EACT,YAAY,CAAC,IAAI,CAAC,EAClB,mBAAmB,CAAC,aAAa,CAAC,EAClC,IAAI,CACL,CAAC;AACJ,CAAC;AAjBD,0DAiBC;AAED,SAAgB,oBAAoB,CAClC,IAAiB,EACjB,EACE,~~UAAU,EACV,~~SAAS,EACT,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,mBAAW,CAAC,MAAM,~~MAM5B~~,EAAE;IAEN,OAAO,oBAAO,CAAC,oBAAoB,CACjC,~~UAAU,EACV,~~SAAS,EACT,CAAC,eAAe,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EACjD,IAAI,CACL,CAAC;AACJ,CAAC;~~AApBD~~,~~oDAoBC~~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"}
1	+ {"version":3,"file":"tscodegen.js","sourceRoot":"","sources":["../../src/codegen/tscodegen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,yDAAyC;AAEzC,oBAAE,CAAC,uBAAuB,CAAC;AAUd,QAAA,aAAa,GAAG,oBAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAE9E,SAAgB,mBAAmB,CAAC,KAAkC;IACpE,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,qBAAa,CAAC;IACzC,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,kDAIC;AAED,SAAgB,iBAAiB,CAAC,IAAqB;IACrD,QAAQ,IAAI,EAAE;QACZ,KAAK,KAAK;YACR,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjE,KAAK,QAAQ;YACX,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,KAAK,QAAQ;YACX,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,KAAK,QAAQ;YACX,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,KAAK,SAAS;YACZ,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrE,KAAK,WAAW;YACd,OAAO,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACvE,KAAK,MAAM;YACT,OAAO,oBAAO,CAAC,qBAAqB,CAClC,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAClD,CAAC;KACL;AACH,CAAC;AAnBD,8CAmBC;AAEY,QAAA,WAAW,GAEpB;IACF,GAAG,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,UAAU,CAAC;IAC5D,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAClE,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAClE,MAAM,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;IAClE,OAAO,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAC;IACpE,SAAS,EAAE,oBAAO,CAAC,qBAAqB,CAAC,oBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC;IACxE,IAAI,EAAE,oBAAO,CAAC,qBAAqB,CACjC,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAClD;CACF,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,KAAK,EAAE,oBAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,YAAY,CAAC;IACzD,MAAM,EAAE,oBAAO,CAAC,cAAc,CAAC,oBAAE,CAAC,UAAU,CAAC,aAAa,CAAC;CAC5D,CAAC;AAEF,SAAgB,0BAA0B,CAAC,EACzC,SAAS,EACT,IAAI,EACJ,cAAc,EACd,IAAI,GAML;IACC,OAAO,oBAAO,CAAC,0BAA0B,CACvC,SAAS,EACT,IAAI,EACJ,cAAc,EACd,IAAI,CACL,CAAC;AACJ,CAAC;AAjBD,gEAiBC;AAED,SAAgB,YAAY,CAAC,EAA0B;IACrD,IAAI,OAAO,EAAE,KAAK,QAAQ;QAAE,OAAO,oBAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAChE,OAAO,EAAE,CAAC;AACZ,CAAC;AAHD,oCAGC;AAED,SAAgB,UAAU,CACxB,UAAkC,EAClC,EACE,QAAQ,EACR,IAAI,MAIF,EAAE;IAEN,OAAO,oBAAO,CAAC,oBAAoB,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChF,CAAC;AAXD,gCAWC;AAED,SAAgB,gBAAgB,CAC9B,MAAc,EACd,IAGC;IAED,OAAO,UAAU,CACf,oBAAO,CAAC,8BAA8B,CAAC,oBAAO,CAAC,UAAU,EAAE,EAAE,MAAM,CAAC,EACpE,IAAI,CACL,CAAC;AACJ,CAAC;AAXD,4CAWC;AAED,SAAgB,mBAAmB,CAAC,KAAyC;IAC3E,OAAO,oBAAO,CAAC,6BAA6B,CAC1C,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAC/B,wBAAwB,CAAC,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CACzD,EACD,IAAI,CACL,CAAC;AACJ,CAAC;AAPD,kDAOC;AAED,SAAgB,wBAAwB,CACtC,IAAY,EACZ,UAAyB;IAEzB,IAAI,oBAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;QAC/B,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,EAAE;YAC5B,OAAO,oBAAO,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;SACxD;KACF;IACD,OAAO,oBAAO,CAAC,wBAAwB,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;AAC1E,CAAC;AAVD,4DAUC;AAED,SAAgB,KAAK,CAAC,GAAG,UAA0B;IACjD,OAAO,oBAAO,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC;AAFD,sBAEC;AAED,SAAgB,mBAAmB,CACjC,UAAqC,EACrC,IAAoB,EACpB,EACE,SAAS,EACT,cAAc,EACd,IAAI,EACJ,sBAAsB,MAMpB,EAAE;IAEN,OAAO,oBAAO,CAAC,mBAAmB,CAChC,SAAS,EACT,cAAc,EACd,UAAU,EACV,IAAI,EACJ,sBAAsB,EACtB,IAAI,CACL,CAAC;AACJ,CAAC;AAvBD,kDAuBC;AAED,SAAgB,yBAAyB,CACvC,IAAwC,EACxC,EACE,SAAS,EACT,aAAa,EACb,cAAc,EACd,IAAI,GAML,EACD,UAAqC,EACrC,IAAe;IAEf,OAAO,oBAAO,CAAC,yBAAyB,CACtC,SAAS,EACT,aAAa,EACb,IAAI,EACJ,cAAc,EACd,UAAU,EACV,IAAI,EACJ,IAAI,CACL,CAAC;AACJ,CAAC;AAzBD,8DAyBC;AAED,SAAgB,sBAAsB,CAAC,EACrC,UAAU,EACV,SAAS,EACT,IAAI,EACJ,cAAc,EACd,eAAe,EACf,OAAO,GAQR;IACC,OAAO,oBAAO,CAAC,sBAAsB,CACnC,UAAU,EACV,SAAS,EACT,IAAI,EACJ,cAAc,EACd,eAAe,EACf,OAAO,CACR,CAAC;AACJ,CAAC;AAvBD,wDAuBC;AAED,SAAgB,iBAAiB,CAAC,EAChC,UAAU,EACV,SAAS,EACT,UAAU,EACV,IAAI,GAML;IACC,OAAO,oBAAO,CAAC,4BAA4B,CACzC,UAAU,EACV,SAAS,EACT,UAAU,EACV,IAAI,CACL,CAAC;AACJ,CAAC;AAjBD,8CAiBC;AAED,SAAgB,YAAY,CAC1B,IAK2B,EAC3B,EACE,SAAS,EACT,aAAa,EACb,aAAa,EACb,cAAc,EACd,IAAI,MAOF,EAAE,EACN,aAAwC,EAAE,EAC1C,IAAe;IAEf,OAAO,oBAAO,CAAC,uBAAuB,CACpC,SAAS,EACT,aAAa,EACb,IAAI,EACJ,mBAAmB,CAAC,aAAa,CAAC,EAClC,cAAc,EACd,UAAU,EACV,IAAI,EACJ,IAAI,CACL,CAAC;AACJ,CAAC;AAjCD,oCAiCC;AAED,SAAgB,eAAe,CAC7B,IAA6B,EAC7B,EACE,SAAS,EACT,cAAc,EACd,aAAa,EACb,IAAI,EACJ,WAAW,GAOZ;IAED,OAAO,oBAAO,CAAC,0BAA0B,CACvC,SAAS,EACT,cAAc,EACd,IAAI,EACJ,mBAAmB,CAAC,aAAa,CAAC,EAClC,IAAI,EACJ,WAAW,CACZ,CAAC;AACJ,CAAC;AAxBD,0CAwBC;AAED,SAAS,YAAY,CAAC,IAA8B;IAClD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,OAAO,iBAAiB,CAAC,IAAI,CAAC;YAC5B,CAAC,CAAC,oBAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAChC,CAAC,CAAC,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;KACvC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,uBAAuB,CAAC,EACtC,SAAS,EACT,IAAI,EACJ,aAAa,EACb,IAAI,GAML;IACC,OAAO,oBAAO,CAAC,uBAAuB,CACpC,SAAS,EACT,YAAY,CAAC,IAAI,CAAC,EAClB,mBAAmB,CAAC,aAAa,CAAC,EAClC,IAAI,CACL,CAAC;AACJ,CAAC;AAjBD,0DAiBC;AAED,SAAgB,oBAAoB,CAClC,IAAiB,EACjB,EACE,SAAS,EACT,SAAS,GAAG,KAAK,EACjB,SAAS,GAAG,mBAAW,CAAC,MAAM,MAK5B,EAAE;IAEN,OAAO,oBAAO,CAAC,oBAAoB,CACjC,SAAS,EACT,CAAC,eAAe,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EACjD,IAAI,CACL,CAAC;AACJ,CAAC;AAjBD,oDAiBC;AAED,SAAgB,mBAAmB,CACjC,QAKE;IAEF,OAAO,oBAAO,CAAC,0BAA0B,CACvC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,YAAY,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CACnE,oBAAO,CAAC,oBAAoB,CAC1B,cAAc,EACd,YAAY,EACZ,IAAI,EACJ,WAAW,CACZ,CACF,CACF,CAAC;AACJ,CAAC;AAlBD,kDAkBC;AAED,SAAgB,oBAAoB,CAClC,IAAY,EACZ,KAA4D;IAE5D,IAAI,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,oBAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC5D,OAAO,oBAAO,CAAC,wBAAwB,CACrC,oBAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAChC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CACvC,oBAAO,CAAC,kBAAkB,CACxB,UAAU,EACV,CAAC,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC;QACpB,CAAC,CAAC,oBAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC;QACrC,CAAC,CAAC,oBAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC1C,CACF,CACF,CAAC;AACJ,CAAC;AAhBD,oDAgBC;AAED,SAAgB,QAAQ,CACtB,KAA4B,EAC5B,IAA6C,EAC7C,IAAuC;IAEvC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CACrB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAM,CAAC,CAAC,CAC7C,CAAC;IACP,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;IACtD,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,4BAUC;AAED,SAAgB,OAAO,CAAC,IAAa;IACnC,IAAI,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC;KACzB;IACD,IAAI,oBAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE;QAChC,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AARD,0BAQC;AAED,SAAgB,uBAAuB,CAAC,CAAuB;IAC7D,MAAM,IAAI,GAAG,oBAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACnC,CAAC;AAHD,0DAGC;AAED,SAAgB,4BAA4B,CAC1C,KAA4B,EAC5B,IAAY;IAEZ,MAAM,SAAS,GAAG,QAAQ,CACxB,KAAK,EACL,oBAAE,CAAC,UAAU,CAAC,iBAAiB,EAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,IAAI,CAC3C,CAAC;IACF,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC;IACvD,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,oEAYC;AAED,SAAgB,mBAAmB,CACjC,CAA6B,EAC7B,QAAgB,EAChB,KAAoB;IAEpB,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,QAAQ,CAClE,CAAC;IACF,IAAI,CAAC,IAAI,oBAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE;QACnC,8FAA8F;QAC9F,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;KAC1C;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;KAClD;AACH,CAAC;AAdD,kDAcC;AAED,SAAgB,WAAW,CACzB,KAAsB,EACtB,GAAG,KAAU;IAEb,OAAO,oBAAO,CAAC,eAAe,CAAC,CAAC,GAAG,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;AACvD,CAAC;AALD,kCAKC;AAED,SAAgB,UAAU,CAAoB,IAAO,EAAE,OAAgB;IACrE,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,oBAAE,CAAC,0BAA0B,CAClC,IAAI,EACJ,oBAAE,CAAC,UAAU,CAAC,sBAAsB,EACpC,SAAS,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,EAC7C,IAAI,CACL,CAAC;AACJ,CAAC;AARD,gCAQC;AAED,SAAgB,SAAS,CAAC,IAAY;IACpC,OAAO,oBAAE,CAAC,gBAAgB,CACxB,IAAI,EACJ,YAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAC7B,oBAAE,CAAC,YAAY,CAAC,MAAM;IACtB,kBAAkB,CAAC,KAAK,EACxB,oBAAE,CAAC,UAAU,CAAC,EAAE,CACjB,CAAC;AACJ,CAAC;AARD,8BAQC;AAED,MAAM,OAAO,GAAG,oBAAE,CAAC,aAAa,CAAC;IAC/B,OAAO,EAAE,oBAAE,CAAC,WAAW,CAAC,QAAQ;CACjC,CAAC,CAAC;AAEH,SAAgB,SAAS,CAAC,IAAa;IACrC,MAAM,IAAI,GAAG,oBAAE,CAAC,gBAAgB,CAC9B,iBAAiB,EACjB,EAAE,EACF,oBAAE,CAAC,YAAY,CAAC,MAAM;IACtB,kBAAkB,CAAC,KAAK,EACxB,oBAAE,CAAC,UAAU,CAAC,EAAE,CACjB,CAAC;IACF,OAAO,OAAO,CAAC,SAAS,CAAC,oBAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC;AATD,8BASC;AAED,SAAgB,UAAU,CAAC,KAAgB;IACzC,MAAM,IAAI,GAAG,oBAAE,CAAC,gBAAgB,CAC9B,iBAAiB,EACjB,EAAE,EACF,oBAAE,CAAC,YAAY,CAAC,MAAM;IACtB,kBAAkB,CAAC,KAAK,EACxB,oBAAE,CAAC,UAAU,CAAC,EAAE,CACjB,CAAC;IACF,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,oBAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SACrE,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAXD,gCAWC;AAED,SAAgB,SAAS,CAAC,UAAyB;IACjD,OAAO,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AACvC,CAAC;AAFD,8BAEC;AAED,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC;IACpD,MAAM,IAAI,GAAG,oBAAE,CAAC,uBAAuB,CAAC,GAAG,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACrE,OAAO,CACL,CAAC,CAAC,IAAI;QACN,IAAI,CAAC,IAAI,KAAK,oBAAE,CAAC,UAAU,CAAC,UAAU;QACtC,IAAI,CAAC,mBAAmB,KAAK,SAAS,CACvC,CAAC;AACJ,CAAC;AARD,8CAQC"}

package/lib/index.d.ts CHANGED Viewed

@@ -2,13 +2,13 @@ import { ApiResponse } from "./runtime";
 /**
  * Type to access a response's data property for a given status.
  */
-declare type DataType<T extends ApiResponse, S extends number> = T extends {
+type DataType<T extends ApiResponse, S extends number> = T extends {
     status: S;
 } ? T["data"] : never;
 /**
  * Object with methods to handle possible status codes of an ApiResponse.
  */
-declare type ResponseHandler<T extends ApiResponse> = {
+type ResponseHandler<T extends ApiResponse> = {
     [P in T["status"]]: (res: DataType<T, P>) => any;
 } & {
     default?: (status: number, data: any) => any;
@@ -25,8 +25,8 @@ declare type ResponseHandler<T extends ApiResponse> = {
  **/
 export declare function handle<T extends ApiResponse, H extends ResponseHandler<T>>(promise: Promise<T>, handler: H): Promise<ReturnType<H[keyof H]>>;
 declare const SUCCESS_CODES: readonly [200, 201, 202, 204];
-declare type SuccessCodes = typeof SUCCESS_CODES[number];
-declare type SuccessResponse<T extends ApiResponse> = DataType<T, SuccessCodes>;
+type SuccessCodes = typeof SUCCESS_CODES[number];
+type SuccessResponse<T extends ApiResponse> = DataType<T, SuccessCodes>;
 /**
  * Utility function to directly return any successful response
  * and throw a HttpError otherwise.
@@ -41,16 +41,16 @@ declare type SuccessResponse<T extends ApiResponse> = DataType<T, SuccessCodes>;
  * }
  */
 export declare function ok<T extends ApiResponse>(promise: Promise<T>): Promise<SuccessResponse<T>>;
-export declare type Args<T> = T extends (...args: infer U) => any ? U : any;
-export declare type ApiFunction = (...args: any[]) => Promise<ApiResponse>;
-export declare type AsyncReturnType<T> = T extends (...args: any[]) => Promise<infer V> ? V : never;
-export declare type OkResponse<T extends ApiFunction> = SuccessResponse<AsyncReturnType<T>>;
-export declare type Okify<T extends ApiFunction> = (...args: Args<T>) => Promise<OkResponse<T>>;
+export type Args<T> = T extends (...args: infer U) => any ? U : any;
+export type ApiFunction = (...args: any[]) => Promise<ApiResponse>;
+export type AsyncReturnType<T> = T extends (...args: any[]) => Promise<infer V> ? V : never;
+export type OkResponse<T extends ApiFunction> = SuccessResponse<AsyncReturnType<T>>;
+export type Okify<T extends ApiFunction> = (...args: Args<T>) => Promise<OkResponse<T>>;
 /**
  * Utility function to wrap an API function with `ok(...)`.
  */
 export declare function okify<T extends ApiFunction>(fn: T): Okify<T>;
-declare type OptimisticApi<T> = {
+type OptimisticApi<T> = {
     [K in keyof T]: T[K] extends ApiFunction ? Okify<T[K]> : T[K];
 };
 /**

package/lib/runtime/index.d.ts CHANGED Viewed

@@ -1,21 +1,24 @@
 import { ok } from "../";
-export declare type RequestOpts = {
+export type RequestOpts = {
     baseUrl?: string;
     fetch?: typeof fetch;
     formDataConstructor?: new () => FormData;
     headers?: Record<string, string | undefined>;
 } & Omit<RequestInit, "body" | "headers">;
-declare type FetchRequestOpts = RequestOpts & {
+type FetchRequestOpts = RequestOpts & {
     body?: string | FormData | Blob;
 };
-declare type JsonRequestOpts = RequestOpts & {
-    body?: object;
+type JsonRequestOpts = RequestOpts & {
+    body?: any;
 };
-export declare type ApiResponse = {
+type FormRequestOpts = RequestOpts & {
+    body?: Record<string, any>;
+};
+export type ApiResponse = {
     status: number;
     data?: any;
 };
-declare type MultipartRequestOpts = RequestOpts & {
+type MultipartRequestOpts = RequestOpts & {
     body?: Record<string, string | Blob | undefined | any>;
 };
 export declare function runtime(defaults: RequestOpts): {
@@ -47,7 +50,7 @@ export declare function runtime(defaults: RequestOpts): {
         signal?: AbortSignal | null | undefined;
         window?: null | undefined;
     };
-    form({ body, headers, ...req }: JsonRequestOpts): {
+    form({ body, headers, ...req }: FormRequestOpts): {
         headers: {
             "Content-Type": string;
         };

package/lib/runtime/index.js CHANGED Viewed

@@ -107,15 +107,15 @@ function runtime(defaults) {
         fetchBlob,
         json(_a) {
             var { body, headers } = _a, req = __rest(_a, ["body", "headers"]);
-            return Object.assign(Object.assign(Object.assign({}, req), (body && { body: JSON.stringify(body) })), { headers: Object.assign(Object.assign({}, headers), { "Content-Type": "application/json" }) });
+            return Object.assign(Object.assign(Object.assign({}, req), (body != null && { body: JSON.stringify(body) })), { headers: Object.assign(Object.assign({}, headers), { "Content-Type": "application/json" }) });
         },
         form(_a) {
             var { body, headers } = _a, req = __rest(_a, ["body", "headers"]);
-            return Object.assign(Object.assign(Object.assign({}, req), (body && { body: qs.form(body) })), { headers: Object.assign(Object.assign({}, headers), { "Content-Type": "application/x-www-form-urlencoded" }) });
+            return Object.assign(Object.assign(Object.assign({}, req), (body != null && { body: qs.form(body) })), { headers: Object.assign(Object.assign({}, headers), { "Content-Type": "application/x-www-form-urlencoded" }) });
         },
         multipart(_a) {
             var { body } = _a, req = __rest(_a, ["body"]);
-            if (!body)
+            if (body == null)
                 return req;
             const data = new (defaults.formDataConstructor ||
                 req.formDataConstructor ||

package/lib/runtime/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA8B;AAC9B,iCAAiD;AACjD,2BAAyB;~~AAuBzB~~,SAAgB,OAAO,CAAC,QAAqB;IAC3C,SAAe,SAAS,CAAC,GAAW,EAAE,GAAsB;;YAC1D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC;YACT,IAAI;gBACF,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aACzB;YAAC,OAAO,GAAG,EAAE,GAAE;YAEhB,OAAO;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,WAAW,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;gBAC5C,IAAI;aACL,CAAC;QACJ,CAAC;KAAA;IAED,SAAe,SAAS,CACtB,GAAW,EACX,MAAwB,EAAE;;YAE1B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,kCACpD,GAAG,KACN,OAAO,kCACF,GAAG,CAAC,OAAO,KACd,MAAM,EAAE,kBAAkB,OAE5B,CAAC;YAEH,MAAM,SAAS,GAAG;gBAChB,kBAAkB;gBAClB,sBAAsB;gBACtB,0BAA0B;gBAC1B,sBAAsB;aACvB,CAAC;YACF,MAAM,MAAM,GAAG,WAAW;gBACxB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC9D,CAAC,CAAC,KAAK,CAAC;YAEV,IAAI,MAAM,EAAE;gBACV,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAO,CAAC;aAC9D;YAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAO,CAAC;QAC/B,CAAC;KAAA;IAED,SAAe,SAAS,CACtB,GAAW,EACX,MAAwB,EAAE;;YAE1B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC;YACT,IAAI;gBACF,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aACzB;YAAC,OAAO,GAAG,EAAE,GAAE;YAChB,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAO,CAAC;QAC3C,CAAC;KAAA;IAED,SAAe,OAAO,CAAC,GAAW,EAAE,MAAwB,EAAE;;YAC5D,MAAM,qCAMD,QAAQ,GACR,GAAG,CACP,EARK,EACJ,OAAO,EACP,OAAO,EACP,KAAK,EAAE,WAAW,OAKnB,EAJI,IAAI,cAJH,+BAKL,CAGA,CAAC;YACF,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACnC,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,CAAC,IAAI,kCACxC,IAAI,KACP,OAAO,EAAE,IAAA,qBAAc,kCAAM,QAAQ,CAAC,OAAO,GAAK,OAAO,EAAG,IAC5D,CAAC;YACH,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAED,OAAO;QACL,EAAE,EAAF,MAAE;QACF,SAAS;QACT,SAAS;QACT,SAAS;QAET,IAAI,CAAC,EAA0C;gBAA1C,EAAE,IAAI,EAAE,OAAO,OAA2B,EAAtB,GAAG,cAAvB,mBAAyB,CAAF;YAC1B,qDACK,GAAG,GACH,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,~~KAC3C~~,OAAO,kCACF,OAAO,KACV,cAAc,EAAE,kBAAkB,OAEpC;QACJ,CAAC;QAED,IAAI,CAAC,EAA0C;gBAA1C,EAAE,IAAI,EAAE,OAAO,OAA2B,EAAtB,GAAG,cAAvB,mBAAyB,CAAF;YAC1B,qDACK,GAAG,GACH,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,~~KACpC~~,OAAO,kCACF,OAAO,KACV,cAAc,EAAE,mCAAmC,OAErD;QACJ,CAAC;QAED,SAAS,CAAC,EAAsC;gBAAtC,EAAE,IAAI,OAAgC,EAA3B,GAAG,cAAd,QAAgB,CAAF;YACtB,IAAI,~~CAAC~~,IAAI;gBAAE,OAAO,GAAG,CAAC;~~YACtB~~,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB;gBAC5C,GAAG,CAAC,mBAAmB;gBACvB,QAAQ,CAAC,EAAE,CAAC;YACd,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,uCACK,GAAG,KACN,IAAI,EAAE,IAAI,IACV;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AApHD,0BAoHC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}

package/lib/runtime/query.d.ts CHANGED Viewed

@@ -15,8 +15,5 @@ export declare function deep(params: Record<string, any>, [k, v]?: (typeof encod
  */
 export declare function explode(params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]): string;
 export declare const form: (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;
-export declare const formPipe: (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;
-export declare const formSpace: (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;
-export declare const simple: (param: unknown[] | Record<string, unknown>, encoders?: (typeof encodeURIComponent)[]) => any;
-export declare const pipe: (param: unknown[] | Record<string, unknown>, encoders?: (typeof encodeURIComponent)[]) => any;
-export declare const space: (param: unknown[] | Record<string, unknown>, encoders?: (typeof encodeURIComponent)[]) => any;
+export declare const pipe: (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;
+export declare const space: (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;

package/lib/runtime/query.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.space = exports.pipe = exports.simple = exports.formSpace = exports.formPipe = exports.form = exports.explode = exports.deep = exports.query = void 0;
+exports.space = exports.pipe = exports.form = exports.explode = exports.deep = exports.query = void 0;
 const util_1 = require("./util");
 /**
  * Join params using an ampersand and prepends a questionmark if not empty.
@@ -55,10 +55,7 @@ function explode(params, encoders = util_1.encodeReserved) {
         .join("&");
 }
 exports.explode = explode;
-exports.form = (0, util_1.form)();
-exports.formPipe = (0, util_1.form)("|");
-exports.formSpace = (0, util_1.form)("%20");
-exports.simple = (0, util_1.simple)();
-exports.pipe = (0, util_1.simple)("|");
-exports.space = (0, util_1.simple)("%20");
+exports.form = (0, util_1.delimited)();
+exports.pipe = (0, util_1.delimited)("|");
+exports.space = (0, util_1.delimited)("%20");
 //# sourceMappingURL=query.js.map

package/lib/runtime/query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/runtime/query.ts"],"names":[],"mappings":";;;AAAA,~~iCAKgB~~;~~AAEhB~~;;GAEG;AACH,SAAgB,KAAK,CAAC,GAAG,MAAgB;IACvC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;AACtB,CAAC;AAHD,sBAGC;AAED;;;GAGG;AACH,SAAgB,IAAI,CAClB,MAA2B,EAC3B,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,qBAAc;IAEvB,MAAM,EAAE,GAAG,IAAA,aAAM,EAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,EAAE,GAAG,IAAA,aAAM,EAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,4BAA4B;IAC5B,sDAAsD;IACtD,MAAM,KAAK,GAAG,CAAC,GAAQ,EAAE,MAAM,GAAG,EAAE,EAAU,EAAE,CAC9C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA,GAAG,MAAM,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QACpD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;YACzB,OAAO,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACtB;QACD,OAAO,EAAE,CAAA,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IACzB,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IAEf,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;AAtBD,oBAsBC;AAED;;;;;GAKG;AACH,SAAgB,OAAO,CACrB,MAA2B,EAC3B,QAAQ,GAAG,qBAAc;IAEzB,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpD;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;SACjC;QACD,OAAO,CAAC,CAAA,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;IAC7B,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAjBD,0BAiBC;AAEY,QAAA,IAAI,GAAG,IAAA,~~WAAU~~,GAAE,CAAC;~~AACpB~~,QAAA,~~QAAQ,GAAG,IAAA,WAAU,EAAC,GAAG,CAAC,CAAC;AAC3B,QAAA,SAAS,GAAG,IAAA,WAAU,EAAC,KAAK,CAAC,CAAC;AAC9B,QAAA,MAAM,GAAG,IAAA,aAAY,GAAE,CAAC;AACxB,QAAA,~~IAAI,GAAG,IAAA,~~aAAY~~,EAAC,GAAG,CAAC,CAAC;~~AACzB~~,QAAA,KAAK,GAAG,IAAA,~~aAAY~~,EAAC,KAAK,CAAC,CAAC"}
1	+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/runtime/query.ts"],"names":[],"mappings":";;;AAAA,iCAA2D;AAE3D;;GAEG;AACH,SAAgB,KAAK,CAAC,GAAG,MAAgB;IACvC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;AACtB,CAAC;AAHD,sBAGC;AAED;;;GAGG;AACH,SAAgB,IAAI,CAClB,MAA2B,EAC3B,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,qBAAc;IAEvB,MAAM,EAAE,GAAG,IAAA,aAAM,EAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,EAAE,GAAG,IAAA,aAAM,EAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,4BAA4B;IAC5B,sDAAsD;IACtD,MAAM,KAAK,GAAG,CAAC,GAAQ,EAAE,MAAM,GAAG,EAAE,EAAU,EAAE,CAC9C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;SAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;QACjB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA,GAAG,MAAM,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QACpD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;YACzB,OAAO,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACtB;QACD,OAAO,EAAE,CAAA,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;IACzB,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;IAEf,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;AAtBD,oBAsBC;AAED;;;;;GAKG;AACH,SAAgB,OAAO,CACrB,MAA2B,EAC3B,QAAQ,GAAG,qBAAc;IAEzB,MAAM,CAAC,GAAG,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpD;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,OAAO,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;SACjC;QACD,OAAO,CAAC,CAAA,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;IAC7B,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAjBD,0BAiBC;AAEY,QAAA,IAAI,GAAG,IAAA,gBAAS,GAAE,CAAC;AACnB,QAAA,IAAI,GAAG,IAAA,gBAAS,EAAC,GAAG,CAAC,CAAC;AACtB,QAAA,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC"}

package/lib/runtime/query.test.js CHANGED Viewed

@@ -28,17 +28,11 @@ describe("delimited", () => {
     it("should use commas", () => {
         expect(qs.form({ id: [3, 4, 5] })).toEqual("id=3,4,5");
     });
-    it("should use pipes for form", () => {
-        expect(qs.formPipe({ id: [3, 4, 5] })).toEqual("id=3|4|5");
-    });
-    it("should use spaces for form", () => {
-        expect(qs.formSpace({ id: [3, 4, 5] })).toEqual("id=3%204%205");
-    });
     it("should use pipes", () => {
-        expect(qs.pipe([3, 4, 5])).toEqual("3|4|5");
+        expect(qs.pipe({ id: [3, 4, 5] })).toEqual("id=3|4|5");
     });
     it("should use spaces", () => {
-        expect(qs.space([3, 4, 5])).toEqual("3%204%205");
+        expect(qs.space({ id: [3, 4, 5] })).toEqual("id=3%204%205");
     });
     it("should enumerate entries", () => {
         expect(qs.form({ author: { firstName: "Felix", role: "admin" } })).toEqual("author=firstName,Felix,role,admin");

package/lib/runtime/query.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"query.test.js","sourceRoot":"","sources":["../../src/runtime/query.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAA8B;AAE9B,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,~~2BAA2B~~,EAAE,GAAG,EAAE;~~QACnC~~,MAAM,CAAC,EAAE,CAAC,~~QAAQ~~,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;~~IAC7D~~,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,~~4BAA4B~~,EAAE,GAAG,EAAE;~~QACpC~~,MAAM,CAAC,EAAE,CAAC,~~SAAS~~,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;~~IAClE~~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"}
1	+ {"version":3,"file":"query.test.js","sourceRoot":"","sources":["../../src/runtime/query.test.ts"],"names":[],"mappings":"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"}

package/lib/runtime/util.d.ts CHANGED Viewed

@@ -1,15 +1,14 @@
-declare type Encoders = Array<(s: string) => string>;
+type Encoders = Array<(s: string) => string>;
 export declare const encodeReserved: (typeof encodeURIComponent)[];
 export declare const allowReserved: (typeof encodeURI)[];
 /**
  * Creates a tag-function to encode template strings with the given encoders.
  */
 export declare function encode(encoders: Encoders, delimiter?: string): (strings: TemplateStringsArray, ...values: any[]) => string;
-export declare function simple(delimiter?: string): (param: unknown[] | Record<string, unknown>, encoders?: (typeof encodeURIComponent)[]) => any;
 /**
  * Separate array values by the given delimiter.
  */
-export declare function form(delimiter?: string): (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;
+export declare function delimited(delimiter?: string): (params: Record<string, any>, encoders?: (typeof encodeURIComponent)[]) => string;
 /**
  * Deeply remove all properties with undefined values.
  */

package/lib/runtime/util.js CHANGED Viewed

@@ -1,16 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinUrl = exports.stripUndefined = exports.form = exports.simple = exports.encode = exports.allowReserved = exports.encodeReserved = void 0;
+exports.joinUrl = exports.stripUndefined = exports.delimited = exports.encode = exports.allowReserved = exports.encodeReserved = void 0;
 // Encode param names and values as URIComponent
 exports.encodeReserved = [encodeURIComponent, encodeURIComponent];
 exports.allowReserved = [encodeURIComponent, encodeURI];
-function join(value, encoder = encodeURIComponent, delimiter = ",") {
-    if (Array.isArray(value)) {
-        return value.map(encoder).join(delimiter);
-    }
-    const flat = Object.entries(value).reduce((flat, entry) => [...flat, ...entry], []);
-    return flat.map(encoder).join(delimiter);
-}
 /**
  * Creates a tag-function to encode template strings with the given encoders.
  */
@@ -21,7 +14,11 @@ function encode(encoders, delimiter = ",") {
             return "";
         }
         if (typeof v === "object") {
-            return join(v, encoder, delimiter);
+            if (Array.isArray(v)) {
+                return v.map(encoder).join(delimiter);
+            }
+            const flat = Object.entries(v).reduce((flat, entry) => [...flat, ...entry], []);
+            return flat.map(encoder).join(delimiter);
         }
         return encoder(String(v));
     };
@@ -32,22 +29,16 @@ function encode(encoders, delimiter = ",") {
     };
 }
 exports.encode = encode;
-function simple(delimiter = ",") {
-    return (param, encoders = exports.encodeReserved) => {
-        return join(param, encoders[1], delimiter);
-    };
-}
-exports.simple = simple;
 /**
  * Separate array values by the given delimiter.
  */
-function form(delimiter = ",") {
+function delimited(delimiter = ",") {
     return (params, encoders = exports.encodeReserved) => Object.entries(params)
         .filter(([, value]) => value !== undefined)
         .map(([name, value]) => encode(encoders, delimiter) `${name}=${value}`)
         .join("&");
 }
-exports.form = form;
+exports.delimited = delimited;
 /**
  * Deeply remove all properties with undefined values.
  */

package/lib/runtime/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/runtime/util.ts"],"names":[],"mappings":";;;AAEA,gDAAgD;AACnC,QAAA,cAAc,GAAG,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;AAC1D,QAAA,aAAa,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;AAE7D,~~SAAS~~,~~IAAI~~,~~CACX~~,~~KAAa~~,~~EACb~~,~~UAAuB,kBAAkB,EACzC,~~SAAS,GAAG,GAAG;~~IAEf~~,~~IAAI~~,~~KAAK,~~CAAC,~~OAAO~~,CAAC,~~KAAK~~,~~CAAC~~,EAAE;~~QACxB~~,OAAO,~~KAAK,CAAC,~~GAAG,~~CAAC~~,~~OAAO,~~CAAC,CAAC,~~IAAI~~,CAAC,~~SAAS~~,CAAC,CAAC;~~KAC3C;IACD~~,~~MAAM,~~IAAI,~~GAAG,MAAM,CAAC,~~OAAO,CAAC,KAAK,~~CAAC~~,~~CAAC~~,~~MAAM~~,~~CACvC~~,CAAC,IAAI,~~EAAE~~,KAAK,~~EAAE~~,EAAE,~~CAAC,CAAC,GAAG,~~IAAI,~~EAAE,GAAG,~~KAAK,CAAC,~~EACpC~~,~~EAAS~~,~~CACV~~,CAAC;~~IACF~~,OAAO,~~IAAI~~,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;~~AAC3C,CAAC~~;~~AAED;;GAEG;AACH~~,~~SAAgB~~,MAAM,CAAC,~~QAAkB~~,~~EAAE~~,~~SAAS~~,~~GAAG~~,~~GAAG;IACxD~~,MAAM,~~CAAC~~,~~GAAG,~~CAAC,~~CAAM~~,EAAE,~~CAAS~~,EAAE,EAAE~~;QAC9B~~,~~MAAM~~,~~OAAO~~,GAAG,~~QAAQ~~,~~CAAC~~,~~CAAC,~~GAAG,~~QAAQ~~,CAAC,~~MAAM~~,~~CAAC~~,~~CAAC;QAC9C~~,~~IAAI,OAAO,~~CAAC~~,KAAK,WAAW,EAAE~~;~~YAC5B~~,OAAO,~~EAAE~~,CAAC~~;SACX;QACD~~,~~IAAI~~,~~OAAO,~~CAAC,~~KAAK,QAAQ,EAAE;YACzB,~~OAAO,~~IAAI,~~CAAC,CAAC,~~EAAE~~,~~OAAO~~,~~EAAE,~~SAAS,CAAC,CAAC;~~SACpC~~;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,OAAO,CAAC,OAA6B,EAAE,GAAG,MAAa,EAAE,EAAE;QACzD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;YACnC,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACzC,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;~~AAlBD~~,~~wBAkBC~~;AAED~~,SAAgB,MAAM,CAAC,SAAS,GAAG,GAAG;IACpC,OAAO,CACL,KAA0C,EAC1C,QAAQ,GAAG,sBAAc,EACzB,EAAE;QACF,OAAO,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC;AACJ,CAAC;AAPD,wBAOC;AAED~~;;GAEG;AACH,SAAgB,~~IAAI~~,CAAC,SAAS,GAAG,GAAG;~~IAClC~~,OAAO,CAAC,MAA2B,EAAE,QAAQ,GAAG,sBAAc,EAAE,EAAE,CAChE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;SAC1C,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;SACrE,IAAI,CAAC,GAAG,CAAC,CAAC;AACjB,CAAC;AAND,~~oBAMC~~;AAED;;GAEG;AACH,SAAgB,cAAc,CAAI,GAAM;IACtC,OAAO,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AAChD,CAAC;AAFD,wCAEC;AAED,SAAgB,OAAO,CAAC,GAAG,KAAgC;IACzD,OAAO,KAAK;SACT,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;SACrD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;SACnE,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAND,0BAMC"}
1	+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/runtime/util.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "oazapfts",
-  "version": "4.3.1-formatted-path-params.1",
+  "version": "4.3.2",
   "description": "OpenApi TypeScript client generator",
   "main": "lib/index.js",
   "bin": {
@@ -23,28 +23,28 @@
   "license": "MIT",
   "repository": "cellular/oazapfts",
   "devDependencies": {
-    "@jest/types": "^29.2.0",
-    "@types/jest": "^29.1.2",
-    "@types/lodash": "^4.14.182",
+    "@jest/types": "^29.3.1",
+    "@types/jest": "^29.2.3",
+    "@types/lodash": "^4.14.190",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^18.6.3",
+    "@types/node": "^18.11.9",
     "form-data": "^4.0.0",
-    "husky": "^8.0.1",
-    "jest": "^29.2.0",
-    "lint-staged": "^13.0.3",
+    "husky": "^8.0.2",
+    "jest": "^29.3.1",
+    "lint-staged": "^13.0.4",
     "open-api-mocker": "^1.11.1",
-    "openapi-types": "^12.0.0",
-    "prettier": "^2.7.1",
+    "openapi-types": "^12.0.2",
+    "prettier": "^2.8.0",
     "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "with-server": "^2.1.0"
   },
   "dependencies": {
-    "@apidevtools/swagger-parser": "^10.0.1",
-    "lodash": "^4.17.20",
-    "minimist": "^1.2.5",
-    "swagger2openapi": "^7.0.7",
-    "typescript": "^4.1.2"
+    "@apidevtools/swagger-parser": "^10.1.0",
+    "lodash": "^4.17.21",
+    "minimist": "^1.2.7",
+    "swagger2openapi": "^7.0.8",
+    "typescript": "^4.9.3"
   },
   "lint-staged": {
     "*.{ts,js,json,md,yml}": "prettier --write"

package/src/codegen/generate.test.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import ApiGenerator, { getOperationName, getFormatter } from "./generate";
+import ApiGenerator, { getOperationName } from "./generate";
 import { printAst } from "./index";
 import SwaggerParser from "@apidevtools/swagger-parser";
 import { OpenAPIV3 } from "openapi-types";
@@ -139,10 +139,3 @@ describe("generate with const", () => {
     expect(oneLine).toContain(constTypeDefinition);
   });
 });
-// // https://spec.openapis.org/oas/v3.0.3#style-examples
-// describe('getFormatter', () => {
-//   it('formats correctly', () => {
-//     const formatter = getFormatter()
-//   })
-// })

package/src/codegen/generate.ts CHANGED Viewed

@@ -45,7 +45,6 @@ export function getFormatter({
 }: OpenAPIV3.ParameterObject) {
   if (explode && style === "deepObject") return "deep";
   if (explode) return "explode";
-  if (style === "simple") return "simple";
   if (style === "spaceDelimited") return "space";
   if (style === "pipeDelimited") return "pipe";
   return "form";
@@ -103,32 +102,23 @@ export function getReferenceName(obj: any) {
   }
 }
-const formatPrimitivePathParameter = (name: string) => {
-  const expression = _.camelCase(name);
-  return cg.createCall(factory.createIdentifier("encodeURIComponent"), {
-    args: [factory.createIdentifier(expression)],
-  });
-};
 /**
  * Create a template string literal from the given OpenAPI urlTemplate.
  * Curly braces in the path are turned into identifier expressions,
  * which are read from the local scope during runtime.
  */
-export function createUrlExpression(
-  path: string,
-  qs?: ts.Expression,
-  formatPathParameter: (
-    name: string
-  ) => ts.Expression = formatPrimitivePathParameter
-) {
+export function createUrlExpression(path: string, qs?: ts.Expression) {
   const spans: Array<{ expression: ts.Expression; literal: string }> = [];
   // Use a replacer function to collect spans as a side effect:
   const head = path.replace(
     /(.*?)\{(.+?)\}(.*?)(?=\{|$)/g,
     (_substr, head, name, literal) => {
+      const expression = _.camelCase(name);
       spans.push({
-        expression: formatPathParameter(name),
+        expression: cg.createCall(
+          factory.createIdentifier("encodeURIComponent"),
+          { args: [factory.createIdentifier(expression)] }
+        ),
         literal,
       });
       return head;
@@ -534,12 +524,7 @@ export default class ApiGenerator {
       );
     });
     this.enumAliases.push(
-      factory.createEnumDeclaration(
-        undefined,
-        [cg.modifier.export],
-        name,
-        members
-      )
+      factory.createEnumDeclaration([cg.modifier.export], name, members)
     );
     const type = factory.createTypeReferenceNode(name, undefined);
@@ -694,34 +679,6 @@ export default class ApiGenerator {
     return this.opts?.optimistic ? callOazapftsFunction("ok", [ex]) : ex;
   }
-  formatPathParameter(name: string, parameter?: OpenAPIV3.ParameterObject) {
-    const schema = parameter?.schema
-      ? this.resolve<SchemaObject>(parameter.schema)
-      : null;
-    if (parameter && (schema?.type === "array" || schema?.type === "object")) {
-      const expression = _.camelCase(name);
-      const formatter = getFormatter({
-        style: "simple",
-        explode: parameter.style === "form",
-        ...parameter,
-      });
-      return callQsFunction(
-        formatter,
-        formatter === "simple" || formatter === "pipe" || formatter === "space"
-          ? [factory.createIdentifier(expression)]
-          : [
-              cg.createObjectLiteral([
-                [expression, factory.createIdentifier(expression)],
-              ]),
-            ]
-      );
-    }
-    return formatPrimitivePathParameter(name);
-  }
   generateApi() {
     this.reset();
@@ -892,32 +849,16 @@ export default class ApiGenerator {
             "query",
             Object.entries(paramsByFormatter).map(([format, params]) => {
               //const [allowReserved, encodeReserved] = _.partition(params, "allowReserved");
-              return callQsFunction(
-                format === "simple"
-                  ? "form"
-                  : format === "pipe"
-                  ? "formPipe"
-                  : format === "space"
-                  ? "formSpace"
-                  : format,
-                [
-                  cg.createObjectLiteral(
-                    params.map((p) => [p.name, argNames[p.name]])
-                  ),
-                ]
-              );
+              return callQsFunction(format, [
+                cg.createObjectLiteral(
+                  params.map((p) => [p.name, argNames[p.name]])
+                ),
+              ]);
             })
           );
         }
-        const url = createUrlExpression(path, qs, (name) =>
-          this.formatPathParameter(
-            name,
-            parameters.find(
-              ({ name: n, in: loc }) => loc === "path" && n === name
-            )
-          )
-        );
+        const url = createUrlExpression(path, qs);
         const init: ts.ObjectLiteralElementLike[] = [
           factory.createSpreadAssignment(factory.createIdentifier("opts")),
         ];

package/src/codegen/tscodegen.ts CHANGED Viewed

@@ -60,20 +60,17 @@ export const modifier = {
 };
 export function createTypeAliasDeclaration({
-  decorators,
   modifiers,
   name,
   typeParameters,
   type,
 }: {
-  decorators?: Array<ts.Decorator>;
   modifiers?: Array<ts.Modifier>;
   name: string | ts.Identifier;
   typeParameters?: Array<ts.TypeParameterDeclaration>;
   type: ts.TypeNode;
 }) {
   return factory.createTypeAliasDeclaration(
-    decorators,
     modifiers,
     name,
     typeParameters,
@@ -165,13 +162,11 @@ export function createArrowFunction(
 export function createFunctionDeclaration(
   name: string | ts.Identifier | undefined,
   {
-    decorators,
     modifiers,
     asteriskToken,
     typeParameters,
     type,
   }: {
-    decorators?: ts.Decorator[];
     modifiers?: ts.Modifier[];
     asteriskToken?: ts.AsteriskToken;
     typeParameters?: ts.TypeParameterDeclaration[];
@@ -181,7 +176,6 @@ export function createFunctionDeclaration(
   body?: ts.Block
 ): ts.FunctionDeclaration {
   return factory.createFunctionDeclaration(
-    decorators,
     modifiers,
     asteriskToken,
     name,
@@ -244,14 +238,12 @@ export function createMethod(
     | ts.NumericLiteral
     | ts.ComputedPropertyName,
   {
-    decorators,
     modifiers,
     asteriskToken,
     questionToken,
     typeParameters,
     type,
   }: {
-    decorators?: ts.Decorator[];
     modifiers?: ts.Modifier[];
     asteriskToken?: ts.AsteriskToken;
     questionToken?: ts.QuestionToken | boolean;
@@ -262,7 +254,6 @@ export function createMethod(
   body?: ts.Block
 ): ts.MethodDeclaration {
   return factory.createMethodDeclaration(
-    decorators,
     modifiers,
     asteriskToken,
     name,
@@ -277,14 +268,12 @@ export function createMethod(
 export function createParameter(
   name: string | ts.BindingName,
   {
-    decorators,
     modifiers,
     dotDotDotToken,
     questionToken,
     type,
     initializer,
   }: {
-    decorators?: Array<ts.Decorator>;
     modifiers?: Array<ts.Modifier>;
     dotDotDotToken?: ts.DotDotDotToken;
     questionToken?: ts.QuestionToken | boolean;
@@ -293,7 +282,6 @@ export function createParameter(
   }
 ): ts.ParameterDeclaration {
   return factory.createParameterDeclaration(
-    decorators,
     modifiers,
     dotDotDotToken,
     name,
@@ -334,19 +322,16 @@ export function createPropertySignature({
 export function createIndexSignature(
   type: ts.TypeNode,
   {
-    decorators,
     modifiers,
     indexName = "key",
     indexType = keywordType.string,
   }: {
     indexName?: string;
     indexType?: ts.TypeNode;
-    decorators?: Array<ts.Decorator>;
     modifiers?: Array<ts.Modifier>;
   } = {}
 ) {
   return factory.createIndexSignature(
-    decorators,
     modifiers,
     [createParameter(indexName, { type: indexType })],
     type

package/src/runtime/index.ts CHANGED Viewed

@@ -14,7 +14,11 @@ type FetchRequestOpts = RequestOpts & {
 };
 type JsonRequestOpts = RequestOpts & {
-  body?: object;
+  body?: any;
+};
+type FormRequestOpts = RequestOpts & {
+  body?: Record<string, any>;
 };
 export type ApiResponse = { status: number; data?: any };
@@ -106,7 +110,7 @@ export function runtime(defaults: RequestOpts) {
     json({ body, headers, ...req }: JsonRequestOpts) {
       return {
         ...req,
-        ...(body && { body: JSON.stringify(body) }),
+        ...(body != null && { body: JSON.stringify(body) }),
         headers: {
           ...headers,
           "Content-Type": "application/json",
@@ -114,10 +118,10 @@ export function runtime(defaults: RequestOpts) {
       };
     },
-    form({ body, headers, ...req }: JsonRequestOpts) {
+    form({ body, headers, ...req }: FormRequestOpts) {
       return {
         ...req,
-        ...(body && { body: qs.form(body) }),
+        ...(body != null && { body: qs.form(body) }),
         headers: {
           ...headers,
           "Content-Type": "application/x-www-form-urlencoded",
@@ -126,7 +130,7 @@ export function runtime(defaults: RequestOpts) {
     },
     multipart({ body, ...req }: MultipartRequestOpts) {
-      if (!body) return req;
+      if (body == null) return req;
       const data = new (defaults.formDataConstructor ||
         req.formDataConstructor ||
         FormData)();

package/src/runtime/query.test.ts CHANGED Viewed

@@ -4,17 +4,11 @@ describe("delimited", () => {
   it("should use commas", () => {
     expect(qs.form({ id: [3, 4, 5] })).toEqual("id=3,4,5");
   });
-  it("should use pipes for form", () => {
-    expect(qs.formPipe({ id: [3, 4, 5] })).toEqual("id=3|4|5");
-  });
-  it("should use spaces for form", () => {
-    expect(qs.formSpace({ id: [3, 4, 5] })).toEqual("id=3%204%205");
-  });
   it("should use pipes", () => {
-    expect(qs.pipe([3, 4, 5])).toEqual("3|4|5");
+    expect(qs.pipe({ id: [3, 4, 5] })).toEqual("id=3|4|5");
   });
   it("should use spaces", () => {
-    expect(qs.space([3, 4, 5])).toEqual("3%204%205");
+    expect(qs.space({ id: [3, 4, 5] })).toEqual("id=3%204%205");
   });
   it("should enumerate entries", () => {
     expect(qs.form({ author: { firstName: "Felix", role: "admin" } })).toEqual(

package/src/runtime/query.ts CHANGED Viewed

@@ -1,9 +1,4 @@
-import {
-  encode,
-  form as encodeForm,
-  simple as encodeSimple,
-  encodeReserved,
-} from "./util";
+import { encode, delimited, encodeReserved } from "./util";
 /**
  * Join params using an ampersand and prepends a questionmark if not empty.
@@ -66,9 +61,6 @@ export function explode(
     .join("&");
 }
-export const form = encodeForm();
-export const formPipe = encodeForm("|");
-export const formSpace = encodeForm("%20");
-export const simple = encodeSimple();
-export const pipe = encodeSimple("|");
-export const space = encodeSimple("%20");
+export const form = delimited();
+export const pipe = delimited("|");
+export const space = delimited("%20");

package/src/runtime/util.ts CHANGED Viewed

@@ -4,21 +4,6 @@ type Encoders = Array<(s: string) => string>;
 export const encodeReserved = [encodeURIComponent, encodeURIComponent];
 export const allowReserved = [encodeURIComponent, encodeURI];
-function join(
-  value: object,
-  encoder: Encoders[0] = encodeURIComponent,
-  delimiter = ","
-) {
-  if (Array.isArray(value)) {
-    return value.map(encoder).join(delimiter);
-  }
-  const flat = Object.entries(value).reduce(
-    (flat, entry) => [...flat, ...entry],
-    [] as any
-  );
-  return flat.map(encoder).join(delimiter);
-}
 /**
  * Creates a tag-function to encode template strings with the given encoders.
  */
@@ -29,7 +14,14 @@ export function encode(encoders: Encoders, delimiter = ",") {
       return "";
     }
     if (typeof v === "object") {
-      return join(v, encoder, delimiter);
+      if (Array.isArray(v)) {
+        return v.map(encoder).join(delimiter);
+      }
+      const flat = Object.entries(v).reduce(
+        (flat, entry) => [...flat, ...entry],
+        [] as any
+      );
+      return flat.map(encoder).join(delimiter);
     }
     return encoder(String(v));
@@ -42,19 +34,10 @@ export function encode(encoders: Encoders, delimiter = ",") {
   };
 }
-export function simple(delimiter = ",") {
-  return (
-    param: unknown[] | Record<string, unknown>,
-    encoders = encodeReserved
-  ) => {
-    return join(param, encoders[1], delimiter);
-  };
-}
 /**
  * Separate array values by the given delimiter.
  */
-export function form(delimiter = ",") {
+export function delimited(delimiter = ",") {
   return (params: Record<string, any>, encoders = encodeReserved) =>
     Object.entries(params)
       .filter(([, value]) => value !== undefined)