@blimu/codegen 0.3.0 → 0.4.0

package/dist/generator/typescript/templates/auth-strategies.ts.hbs

@@ -1,14 +1,10 @@
-import type {
-  AuthStrategy{{~#if (hasBearerScheme IR.securitySchemes)}}, 
-  BearerAuthStrategy{{~/if~}}{{~#if (hasApiKeyScheme IR.securitySchemes)}}, 
-  ApiKeyAuthStrategy{{~/if~}}
-} from '@blimu/fetch';
+import type { AuthStrategy } from '@blimu/fetch';
 import type { ClientOption } from './client';
 
 export function buildAuthStrategies(cfg: ClientOption): AuthStrategy[] {
   const authStrategies: AuthStrategy[] = [...(cfg?.authStrategies || [])];
-  
-  {{~#each IR.securitySchemes~}}
+
+  {{#each IR.securitySchemes~}}
   {{~#if (eq this.type "http")~}}
     {{~#if (eq this.scheme "bearer")~}}
   if (cfg.{{camel this.key}}) {
@@ -20,8 +16,8 @@ export function buildAuthStrategies(cfg: ClientOption): AuthStrategy[] {
     {{~/if~}}
   {{~/if~}}
   {{~/each~}}
-  
-  {{~#each IR.securitySchemes~}}
+
+  {{#each IR.securitySchemes~}}
   {{~#if (eq this.type "http")~}}
     {{~#if (eq this.scheme "basic")~}}
   if (cfg.{{camel this.key}}) {

package/dist/generator/typescript/templates/client.ts.hbs

@@ -1,66 +1,61 @@
 import { FetchClient, FetchError } from '@blimu/fetch';
 import {
-  type FetchClientConfig{{~#if (hasBearerScheme IR.securitySchemes)}}, 
-  type BearerAuthStrategy{{~/if~}}{{~#if (hasApiKeyScheme IR.securitySchemes)}},
-  type ApiKeyAuthStrategy{{~/if~}}
+  type FetchClientConfig{{#if (hasBearerScheme IR.securitySchemes)}},
+  type BearerAuthStrategy{{/if}}{{#if (hasApiKeyScheme IR.securitySchemes)}},
+  type ApiKeyAuthStrategy{{/if}}
 } from '@blimu/fetch';
 import { buildAuthStrategies } from './auth-strategies';
-{{~#each IR.services~}}
+{{#each IR.services}}
 import { {{serviceName tag}} } from './services/{{fileBase tag}}';
-{{~/each~}}
+{{/each}}
 
 export type ClientOption = FetchClientConfig & {
-  {{~#each IR.securitySchemes~}}
-  {{~#if (eq this.type "http")~}}
-    {{~#if (eq this.scheme "bearer")~}}
+  {{#each IR.securitySchemes}}
+  {{#if (eq this.type "http")}}
+  {{#if (eq this.scheme "bearer")}}
   {{camel this.key}}?: BearerAuthStrategy['token'];
-    {{~else if (eq this.scheme "basic")~}}
+  {{else if (eq this.scheme "basic")}}
   {{camel this.key}}?: { username: string; password: string };
-    {{~/if~}}
-    {{~else if (eq this.type "apiKey")~}}
+  {{/if}}
+  {{else if (eq this.type "apiKey")}}
   {{camel this.key}}?: ApiKeyAuthStrategy['key'];
-  {{~/if~}}
-  {{~/each~}}
+  {{/if}}
+  {{/each}}
 };
-
-{{~setVar "grouped" (groupByNamespace IR.services)~}}
-
-{{~! Generate namespace classes for non-root services ~}}
-{{~#each (groupByNamespace IR.services) as |services namespace|~}}
-  {{~#if (ne namespace "")~}}
+{{setVar "grouped" (groupByNamespace IR.services)}}
+{{! Generate namespace classes for non-root services }}
+{{#each (groupByNamespace IR.services) as |services namespace|}}
+  {{#if (ne namespace "")}}
 class {{pascal namespace}}Namespace {
-    {{~#each services~}}
+    {{#each services}}
   readonly {{serviceProp (getServiceName tag)}}: {{serviceName tag}};
-    {{~/each~}}
+    {{/each}}
 
   constructor(core: FetchClient) {
-    {{~#each services~}}
+    {{#each services}}
     this.{{serviceProp (getServiceName tag)}} = new {{serviceName tag}}(core);
-    {{~/each~}}
+    {{/each}}
   }
 }
-
-  {{~/if~}}
-{{~/each~}}
-
+  {{/if}}
+{{/each}}
 export class {{Client.name}} {
-  {{~! Root level services (no namespace) ~}}
-  {{~#each (getRootServices IR.services)~}}
+  {{! Root level services (no namespace) }}
+  {{#each (getRootServices IR.services)}}
   readonly {{serviceProp tag}}: {{serviceName tag}};
-  {{~/each~}}
-  {{~! Namespace properties ~}}
-  {{~#each (groupByNamespace IR.services) as |services namespace|~}}
-    {{~#if (ne namespace "")~}}
+  {{/each}}
+  {{! Namespace properties }}
+  {{#each (groupByNamespace IR.services) as |services namespace|}}
+    {{#if (ne namespace "")}}
   readonly {{serviceProp namespace}}: {{pascal namespace}}Namespace;
-    {{~/if~}}
-  {{~/each~}}
+    {{/if}}
+  {{/each}}
 
   constructor(options?: ClientOption) {
-    const { 
-      {{~#each IR.securitySchemes~}}
-      {{camel this.key}},{{~/each~}}
-      ...restCfg 
-    } = options || {};
+    const restCfg = { ...(options || {}) };
+    {{#each IR.securitySchemes}}
+    delete restCfg.{{camel this.key}};
+    {{/each}}
 
     const authStrategies = buildAuthStrategies(options || {});
     
@@ -70,16 +65,16 @@ export class {{Client.name}} {
       ...(authStrategies.length > 0 ? { authStrategies } : {}),
     });
     
-    {{~! Initialize root services ~}}
-    {{~#each (getRootServices IR.services)~}}
+    {{! Initialize root services }}
+    {{#each (getRootServices IR.services)}}
     this.{{serviceProp tag}} = new {{serviceName tag}}(core);
-    {{~/each~}}
-    {{~! Initialize namespaces ~}}
-    {{~#each (groupByNamespace IR.services) as |services namespace|~}}
-      {{~#if (ne namespace "")~}}
+    {{/each}}
+    {{! Initialize namespaces }}
+    {{#each (groupByNamespace IR.services) as |services namespace|}}
+      {{#if (ne namespace "")}}
     this.{{serviceProp namespace}} = new {{pascal namespace}}Namespace(core);
-      {{~/if~}}
-    {{~/each~}}
+      {{/if}}
+    {{/each}}
   }
 }
 

package/dist/generator/typescript/templates/package.json.hbs

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "files": ["dist/**", "src/**"],
+  "files": ["dist/**", "{{Client.srcDir}}/**"],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",

package/dist/generator/typescript/templates/schema.zod.ts.hbs

@@ -13,19 +13,20 @@ import { z } from 'zod';
 {{/if}}
    */
   export const {{this.name}}Schema = {{zodSchema this.schema}};
+
   {{/if}}
 {{/each}}
 
 {{! Objects and other named models: render Zod schemas from structured IR }}
 {{#if (gt (len IR.modelDefs) 0)}}
-{{~#each IR.modelDefs}}
-  {{~#unless (or (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null"))}}
-  {{~#if (eq this.schema.kind "enum")~}}
+{{#each IR.modelDefs}}
+  {{#unless (or (eq this.schema.kind "string") (eq this.schema.kind "number") (eq this.schema.kind "integer") (eq this.schema.kind "boolean") (eq this.schema.kind "null"))}}
+  {{#if (eq this.schema.kind "enum")}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = z.enum([
   {{~#each this.schema.enumValues as |v|~}}
@@ -33,12 +34,12 @@ export const {{this.name}}Schema = z.enum([
   {{~/each~}}
 ]);
 
-  {{~else if (eq this.schema.kind "object")~}}
+{{else if (eq this.schema.kind "object")}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = z.object({
   {{~#each this.schema.properties~}}
@@ -49,18 +50,18 @@ export const {{this.name}}Schema = z.object({
   {{~/each~}}
 });
 
-  {{~else if (eq this.schema.kind "ref")~}}
+{{else if (eq this.schema.kind "ref")}}
 /**
  * Zod schema for {{this.name}}
  */
 export const {{this.name}}Schema = {{zodSchema this.schema}};
 
-  {{~else if (eq this.schema.kind "oneOf")~}}
+{{else if (eq this.schema.kind "oneOf")}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = z.union([
   {{~#each this.schema.oneOf as |opt|~}}
@@ -68,12 +69,12 @@ export const {{this.name}}Schema = z.union([
   {{~/each~}}
 ]);
 
-  {{~else if (eq this.schema.kind "anyOf")~}}
+{{else if (eq this.schema.kind "anyOf")}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = z.union([
   {{~#each this.schema.anyOf as |opt|~}}
@@ -81,36 +82,37 @@ export const {{this.name}}Schema = z.union([
   {{~/each~}}
 ]);
 
-  {{~else if (eq this.schema.kind "allOf")~}}
+{{else if (eq this.schema.kind "allOf")}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = {{#each this.schema.allOf}}{{#if @first}}{{zodSchema this}}{{else}}.extend({{zodSchema this}}.shape){{/if}}{{/each}};
 
-  {{~else if (eq this.schema.kind "array")~}}
+{{else if (eq this.schema.kind "array")}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = z.array({{#if this.schema.items}}{{zodSchema this.schema.items}}{{else}}z.unknown(){{/if}});
 
-  {{~else~}}
+{{else}}
 /**
  * Zod schema for {{this.name}}
-{{~#if this.annotations.description~}}
+{{#if this.annotations.description}}
  * {{decodeHtml (replace this.annotations.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{this.name}}Schema = {{zodSchema this.schema}};
 
-  {{~/if~}}
-  {{~/unless~}}
-{{~/each~}}
+{{/if}}
+{{/unless}}
+
+{{/each}}
 {{~/if~}}
 
 {{#if IR.services}}
@@ -122,17 +124,17 @@ export const {{this.name}}Schema = {{zodSchema this.schema}};
     {{#if (gt (len this.queryParams) 0)}}
 /**
  * Schema for query params of {{../tag}}.{{pascal (methodName this)}}
-{{~#if this.description~}}
+{{#if this.description}}
  * {{decodeHtml (replace this.description "*/" "*\\/")}}
-{{~/if~}}
+{{/if}}
  */
 export const {{pascal ../tag}}{{pascal (methodName this)}}QuerySchema = z.object({
-  {{~#each this.queryParams~}}
-  {{~#if this.description~}}
+  {{#each this.queryParams}}
+  {{#if this.description}}
   /** {{decodeHtml (replace this.description "*/" "*\\/")}} */
-  {{~/if~}}
+  {{/if}}
   {{quotePropName this.name}}: {{zodSchema this.schema}}{{#unless this.required}}.optional(){{/unless}},
-  {{~/each~}}
+  {{/each}}
 });
 
     {{/if}}

package/dist/generator/typescript/templates/service.ts.hbs

@@ -1,5 +1,7 @@
 import { FetchClient } from '@blimu/fetch';
+{{#if (serviceUsesSchema Service)}}
 import * as Schema from "../schema";
+{{/if}}
 {{#if Client.includeQueryKeys}}
 import { isNotUndefined } from "../utils";
 {{/if}}

package/dist/generator/typescript/templates/tsconfig.json.hbs

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "rootDir": "./src",
+    "rootDir": "./{{Client.srcDir}}",
     "module": "ES2022",
     "moduleResolution": "Bundler",
     "target": "ES2022",
@@ -12,7 +12,7 @@
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
     "outDir": "./dist",
-    "baseUrl": "./src",
+    "baseUrl": "./{{Client.srcDir}}",
     "incremental": true,
     "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo",
     "skipLibCheck": true,
@@ -23,6 +23,6 @@
     "noUnusedParameters": true,
     "useDefineForClassFields": true
   },
-  "include": ["src/**/*"],
+  "include": ["{{Client.srcDir}}/**/*"],
   "exclude": ["node_modules", "dist"]
 }

package/dist/generator/typescript/templates/tsup.config.ts.hbs

@@ -1,7 +1,7 @@
 import { defineConfig } from "tsup";
 
 export default defineConfig({
-  entry: ["src/**/*.ts"],
+  entry: ["{{Client.srcDir}}/**/*.ts"],
   format: ["cjs", "esm"],
   dts: true,
   splitting: false,

package/dist/index.d.mts

@@ -23,6 +23,7 @@ declare const TypeScriptClientSchema: z.ZodObject<{
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
+    srcDir: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
     predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
         type: z.ZodString;
@@ -47,6 +48,7 @@ declare const ClientSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
+    srcDir: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
     predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
         type: z.ZodString;
@@ -74,6 +76,7 @@ declare const ConfigSchema: z.ZodObject<{
         type: z.ZodLiteral<"typescript">;
         packageName: z.ZodString;
         moduleName: z.ZodOptional<z.ZodString>;
+        srcDir: z.ZodOptional<z.ZodString>;
         includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
         predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
             type: z.ZodString;

package/dist/index.d.ts

@@ -23,6 +23,7 @@ declare const TypeScriptClientSchema: z.ZodObject<{
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
+    srcDir: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
     predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
         type: z.ZodString;
@@ -47,6 +48,7 @@ declare const ClientSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     type: z.ZodLiteral<"typescript">;
     packageName: z.ZodString;
     moduleName: z.ZodOptional<z.ZodString>;
+    srcDir: z.ZodOptional<z.ZodString>;
     includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
     predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
         type: z.ZodString;
@@ -74,6 +76,7 @@ declare const ConfigSchema: z.ZodObject<{
         type: z.ZodLiteral<"typescript">;
         packageName: z.ZodString;
         moduleName: z.ZodOptional<z.ZodString>;
+        srcDir: z.ZodOptional<z.ZodString>;
         includeQueryKeys: z.ZodOptional<z.ZodBoolean>;
         predefinedTypes: z.ZodOptional<z.ZodArray<z.ZodObject<{
             type: z.ZodString;