@tailor-platform/sdk 0.8.5 → 0.8.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tailor-platform/sdk
 
+## 0.8.6
+
+### Patch Changes
+
+- [#24](https://github.com/tailor-platform/sdk/pull/24) [`ffa71fe`](https://github.com/tailor-platform/sdk/commit/ffa71feba26b36be84292dbaaadc0d2a37dc6b96) Thanks [@riku99](https://github.com/riku99)! - Fix generator bugs with multiple TailorDB namespaces and refactor to object-based data passing
+
 ## 0.8.5
 
 ### Patch Changes

package/dist/cli/api.d.mts

@@ -1,6 +1,6 @@
 /// <reference path="./../plugin-generated.d.ts" />
 
-import { AppConfig, CodeGeneratorBase, Executor, Generator, Resolver, TailorDBTypeConfig } from "../types-BP7g8Bh3.mjs";
+import { AppConfig, CodeGeneratorBase, Executor, Generator, Resolver, TailorDBTypeConfig } from "../types-CPcmGK_X.mjs";
 import "citty";
 import "zod";
 import "@bufbuild/protobuf/wkt";

package/dist/cli/api.mjs

@@ -1,4 +1,4 @@
-import { apply, generate, generateUserTypes, loadConfig, machineUserList, machineUserToken, show, workspaceCreate, workspaceDelete, workspaceList } from "../token-B9zkxSMS.mjs";
+import { apply, generate, generateUserTypes, loadConfig, machineUserList, machineUserToken, show, workspaceCreate, workspaceDelete, workspaceList } from "../token-Cbs_El75.mjs";
 import "../auth-Di3vQUrT.mjs";
 
 export { apply, generate, generateUserTypes, loadConfig, machineUserList, machineUserToken, show, workspaceCreate, workspaceDelete, workspaceList };

package/dist/cli/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { PATScope, applyCommand, commonArgs, createCommand, deleteCommand, fetchAll, fetchLatestToken, formatArgs, generateCommand, initOperatorClient, listCommand as listCommand$4, listCommand$1 as listCommand, loadAccessToken, loadConfig, loadConfigPath, loadWorkspaceId, parseFormat, printWithFormat, readPlatformConfig, showCommand, tokenCommand, userAgent, withCommonArgs, writePlatformConfig } from "../token-B9zkxSMS.mjs";
+import { PATScope, applyCommand, commonArgs, createCommand, deleteCommand, fetchAll, fetchLatestToken, formatArgs, generateCommand, initOperatorClient, listCommand as listCommand$4, listCommand$1 as listCommand, loadAccessToken, loadConfig, loadConfigPath, loadWorkspaceId, parseFormat, printWithFormat, readPlatformConfig, showCommand, tokenCommand, userAgent, withCommonArgs, writePlatformConfig } from "../token-Cbs_El75.mjs";
 import "../auth-Di3vQUrT.mjs";
 import { register } from "node:module";
 import { defineCommand, runCommand, runMain } from "citty";

package/dist/configure/index.d.mts

@@ -1,5 +1,5 @@
 /// <reference path="./../plugin-generated.d.ts" />
 
-import { AuthConfig, AuthServiceInput, BuiltinIdP, ExecutorServiceConfig, ExecutorServiceInput, IDToken, IdPConfig, IdProviderConfig, OAuth2Client, OAuth2ClientGrantType, OIDC, PermissionCondition, QueryType, Resolver, ResolverServiceConfig, ResolverServiceInput, SAML, SCIMAttribute, SCIMAttributeMapping, SCIMAttributeType, SCIMAuthorization, SCIMConfig, SCIMResource, StaticWebsiteConfig, TailorField, TailorTypeGqlPermission, TailorTypePermission, TailorUser, TenantProviderConfig, UserAttributeKey, UserAttributeListKey, UserAttributeMap, UsernameFieldKey, ValueOperand, db, defineAuth, defineConfig, defineGenerators, defineIdp, defineStaticWebSite, unauthenticatedTailorUser } from "../types-BP7g8Bh3.mjs";
-import { FunctionOperation, GqlOperation, IncomingWebhookArgs, IncomingWebhookRequest, IncomingWebhookTrigger, Operation, RecordCreatedArgs, RecordDeletedArgs, RecordTrigger, RecordUpdatedArgs, ResolverExecutedArgs, ResolverExecutedTrigger, ScheduleTrigger, Trigger, WebhookOperation, createExecutor, createResolver, incomingWebhookTrigger, infer, output, recordCreatedTrigger, recordDeletedTrigger, recordUpdatedTrigger, resolverExecutedTrigger, scheduleTrigger, t } from "../index-Bwrm8M8p.mjs";
+import { AuthConfig, AuthServiceInput, BuiltinIdP, ExecutorServiceConfig, ExecutorServiceInput, IDToken, IdPConfig, IdProviderConfig, OAuth2Client, OAuth2ClientGrantType, OIDC, PermissionCondition, QueryType, Resolver, ResolverServiceConfig, ResolverServiceInput, SAML, SCIMAttribute, SCIMAttributeMapping, SCIMAttributeType, SCIMAuthorization, SCIMConfig, SCIMResource, StaticWebsiteConfig, TailorField, TailorTypeGqlPermission, TailorTypePermission, TailorUser, TenantProviderConfig, UserAttributeKey, UserAttributeListKey, UserAttributeMap, UsernameFieldKey, ValueOperand, db, defineAuth, defineConfig, defineGenerators, defineIdp, defineStaticWebSite, unauthenticatedTailorUser } from "../types-CPcmGK_X.mjs";
+import { FunctionOperation, GqlOperation, IncomingWebhookArgs, IncomingWebhookRequest, IncomingWebhookTrigger, Operation, RecordCreatedArgs, RecordDeletedArgs, RecordTrigger, RecordUpdatedArgs, ResolverExecutedArgs, ResolverExecutedTrigger, ScheduleTrigger, Trigger, WebhookOperation, createExecutor, createResolver, incomingWebhookTrigger, infer, output, recordCreatedTrigger, recordDeletedTrigger, recordUpdatedTrigger, resolverExecutedTrigger, scheduleTrigger, t } from "../index-DHpKRtq3.mjs";
 export { AuthConfig, AuthServiceInput, BuiltinIdP, ExecutorServiceConfig, ExecutorServiceInput, FunctionOperation, GqlOperation, IDToken, IdPConfig, IdProviderConfig, IncomingWebhookArgs, IncomingWebhookRequest, IncomingWebhookTrigger, OAuth2Client, OAuth2ClientGrantType, OIDC, Operation, PermissionCondition, QueryType, RecordCreatedArgs, RecordDeletedArgs, RecordTrigger, RecordUpdatedArgs, Resolver, ResolverExecutedArgs, ResolverExecutedTrigger, ResolverServiceConfig, ResolverServiceInput, SAML, SCIMAttribute, SCIMAttributeMapping, SCIMAttributeType, SCIMAuthorization, SCIMConfig, SCIMResource, ScheduleTrigger, StaticWebsiteConfig, TailorField, TailorTypeGqlPermission, TailorTypePermission, TailorUser, TenantProviderConfig, Trigger, UserAttributeKey, UserAttributeListKey, UserAttributeMap, UsernameFieldKey, ValueOperand, WebhookOperation, createExecutor, createResolver, db, defineAuth, defineConfig, defineGenerators, defineIdp, defineStaticWebSite, incomingWebhookTrigger, infer, output, recordCreatedTrigger, recordDeletedTrigger, recordUpdatedTrigger, resolverExecutedTrigger, scheduleTrigger, t, unauthenticatedTailorUser };

package/dist/{index-Bwrm8M8p.d.mts → index-DHpKRtq3.d.mts}

@@ -1,6 +1,6 @@
 /// <reference path="./plugin-generated.d.ts" />
 
-import { AllowedValues, AllowedValuesOutput, ArrayFieldOutput, ExecutorInput, FieldMetadata, FieldOptions, FieldOutput, FunctionOperation, GqlOperation, IncomingWebhookTrigger as IncomingWebhookTrigger$1, InferFieldsOutput, RecordTrigger as RecordTrigger$1, ResolverExecutedTrigger as ResolverExecutedTrigger$1, ResolverInput, ScheduleTriggerInput, TailorDBType, TailorField, TailorUser, WebhookOperation, output as output$1 } from "./types-BP7g8Bh3.mjs";
+import { AllowedValues, AllowedValuesOutput, ArrayFieldOutput, ExecutorInput, FieldMetadata, FieldOptions, FieldOutput, FunctionOperation, GqlOperation, IncomingWebhookTrigger as IncomingWebhookTrigger$1, InferFieldsOutput, RecordTrigger as RecordTrigger$1, ResolverExecutedTrigger as ResolverExecutedTrigger$1, ResolverInput, ScheduleTriggerInput, TailorDBType, TailorField, TailorUser, WebhookOperation, output as output$1 } from "./types-CPcmGK_X.mjs";
 import { EmptyObject } from "type-fest";
 import { Client } from "@urql/core";
 import { StandardCRON } from "ts-cron-validator";

package/dist/{token-B9zkxSMS.mjs → token-Cbs_El75.mjs}

@@ -867,10 +867,11 @@ var EnumProcessor = class {
 	/**
 	* Generate enum constant definitions from collected metadata.
 	*/
-	static async generateEnumConstants(types) {
-		const allEnums = /* @__PURE__ */ new Map();
-		for (const typeMetadata of Object.values(types)) if (typeMetadata.enums) for (const enumDef of typeMetadata.enums) allEnums.set(enumDef.name, enumDef);
-		const enumDefs = Array.from(allEnums.values()).map((e) => {
+	static generateUnifiedEnumConstants(allEnums) {
+		if (allEnums.length === 0) return "";
+		const enumMap = /* @__PURE__ */ new Map();
+		for (const enumDef of allEnums) enumMap.set(enumDef.name, enumDef);
+		const enumDefs = Array.from(enumMap.values()).map((e) => {
 			const members = e.values.map((v) => {
 				return `  "${v.value.replace(/[-\s]/g, "_")}": "${v.value}"`;
 			}).join(",\n");
@@ -920,17 +921,27 @@ var EnumConstantsGenerator = class {
 	processResolver() {}
 	processExecutor() {}
 	async processTailorDBNamespace(args) {
-		return await EnumProcessor.generateEnumConstants(args.types);
+		const allEnums = [];
+		for (const enumConstantMetadata of Object.values(args.types)) allEnums.push(...enumConstantMetadata.enums);
+		return {
+			namespace: args.namespace,
+			enums: allEnums
+		};
 	}
 	processIdProvider() {}
 	processAuth() {}
 	processStaticWebsite() {}
 	aggregate(args) {
 		const files = [];
-		for (const input of args.inputs) for (const nsResult of input.tailordb) if (nsResult.types) files.push({
-			path: this.options.distPath,
-			content: nsResult.types
-		});
+		const allEnums = [];
+		for (const input of args.inputs) for (const nsResult of input.tailordb) if (nsResult.types && nsResult.types.enums.length > 0) allEnums.push(...nsResult.types.enums);
+		if (allEnums.length > 0) {
+			const content = EnumProcessor.generateUnifiedEnumConstants(allEnums);
+			files.push({
+				path: this.options.distPath,
+				content
+			});
+		}
 		return { files };
 	}
 };
@@ -1083,7 +1094,7 @@ var FileUtilsGenerator = class {
 /**
 * Processor that converts a ParsedTailorDBType into Kysely type metadata.
 */
-var TypeProcessor = class TypeProcessor {
+var TypeProcessor = class {
 	/**
 	* Convert a ParsedTailorDBType into KyselyTypeMetadata.
 	*/
@@ -1221,49 +1232,52 @@ var TypeProcessor = class TypeProcessor {
 			usedUtilityTypes: aggregatedUtilityTypes
 		};
 	}
-	static async processTypes(types, namespace) {
-		const aggregatedUtilityTypes = Object.values(types).reduce((acc, type) => ({
-			Timestamp: acc.Timestamp || type.usedUtilityTypes.Timestamp,
-			Serial: acc.Serial || type.usedUtilityTypes.Serial
+	/**
+	* Generate unified types file from multiple namespaces.
+	*/
+	static generateUnifiedTypes(namespaceData) {
+		if (namespaceData.length === 0) return "";
+		const globalUsedUtilityTypes = namespaceData.reduce((acc, ns) => ({
+			Timestamp: acc.Timestamp || ns.usedUtilityTypes.Timestamp,
+			Serial: acc.Serial || ns.usedUtilityTypes.Serial
 		}), {
 			Timestamp: false,
 			Serial: false
 		});
 		const utilityTypeDeclarations = [];
-		if (aggregatedUtilityTypes.Timestamp) utilityTypeDeclarations.push(`type Timestamp = ColumnType<Date, Date | string, Date | string>;`);
+		if (globalUsedUtilityTypes.Timestamp) utilityTypeDeclarations.push(`type Timestamp = ColumnType<Date, Date | string, Date | string>;`);
 		utilityTypeDeclarations.push(ml`
         type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
           ? ColumnType<S, I | undefined, U>
           : ColumnType<T, T | undefined, T>;
       `);
-		if (aggregatedUtilityTypes.Serial) utilityTypeDeclarations.push(`type Serial<T = string | number> = ColumnType<T, never, never>;`);
-		return [
-			ml`
-          import { type ColumnType, Kysely } from "kysely";
-          import { TailordbDialect } from "@tailor-platform/function-kysely-tailordb";
+		if (globalUsedUtilityTypes.Serial) utilityTypeDeclarations.push(`type Serial<T = string | number> = ColumnType<T, never, never>;`);
+		const importsSection = ml`
+      import { type ColumnType, Kysely } from "kysely";
+      import { TailordbDialect } from "@tailor-platform/function-kysely-tailordb";
 
-          ${utilityTypeDeclarations.join("\n")}
-        `,
-			TypeProcessor.generateNamespaceInterface(Object.values(types), namespace),
-			ml`
-          export function getDB<const N extends keyof Namespace>(namespace: N): Kysely<Namespace[N]> {
-            const client = new tailordb.Client({ namespace });
-            return new Kysely<Namespace[N]>({ dialect: new TailordbDialect(client) });
-          }
+      ${utilityTypeDeclarations.join("\n")}
+    `;
+		const namespaceInterface = `export interface Namespace {\n${namespaceData.map(({ namespace, types }) => {
+			const typeDefsWithIndent = types.map((type) => {
+				return type.typeDef.split("\n").map((line) => line.trim() ? `    ${line}` : "").join("\n");
+			}).join("\n\n");
+			return `  "${namespace}": {\n${typeDefsWithIndent}\n  }`;
+		}).join(",\n")}\n}`;
+		const getDBFunction = ml`
+      export function getDB<const N extends keyof Namespace>(namespace: N): Kysely<Namespace[N]> {
+        const client = new tailordb.Client({ namespace });
+        return new Kysely<Namespace[N]>({ dialect: new TailordbDialect(client) });
+      }
 
-          export type DB<N extends keyof Namespace = keyof Namespace> = ReturnType<typeof getDB<N>>;
-        `
+      export type DB<N extends keyof Namespace = keyof Namespace> = ReturnType<typeof getDB<N>>;
+    `;
+		return [
+			importsSection,
+			namespaceInterface,
+			getDBFunction
 		].join("\n\n") + "\n";
 	}
-	/**
-	* Generate the Namespace interface.
-	*/
-	static generateNamespaceInterface(types, namespace) {
-		const typeDefsWithIndent = types.map((type) => {
-			return type.typeDef.split("\n").map((line) => line.trim() ? `    ${line}` : "").join("\n");
-		}).join("\n\n");
-		return `export interface Namespace {\n  "${namespace}": {\n${typeDefsWithIndent}\n  }\n}`;
-	}
 };
 
 //#endregion
@@ -1284,14 +1298,31 @@ var KyselyGenerator = class {
 	processResolver() {}
 	processExecutor() {}
 	async processTailorDBNamespace(args) {
-		return await TypeProcessor.processTypes(args.types, args.namespace);
+		const typesList = Object.values(args.types);
+		const usedUtilityTypes = typesList.reduce((acc, type) => ({
+			Timestamp: acc.Timestamp || type.usedUtilityTypes.Timestamp,
+			Serial: acc.Serial || type.usedUtilityTypes.Serial
+		}), {
+			Timestamp: false,
+			Serial: false
+		});
+		return {
+			namespace: args.namespace,
+			types: typesList,
+			usedUtilityTypes
+		};
 	}
 	aggregate(args) {
 		const files = [];
-		for (const input of args.inputs) for (const nsResult of input.tailordb) if (nsResult.types) files.push({
-			path: this.options.distPath,
-			content: nsResult.types
-		});
+		const allNamespaceData = [];
+		for (const input of args.inputs) for (const nsResult of input.tailordb) if (nsResult.types && nsResult.types.types.length > 0) allNamespaceData.push(nsResult.types);
+		if (allNamespaceData.length > 0) {
+			const content = TypeProcessor.generateUnifiedTypes(allNamespaceData);
+			files.push({
+				path: this.options.distPath,
+				content
+			});
+		}
 		return { files };
 	}
 };

package/dist/{types-BP7g8Bh3.d.mts → types-CPcmGK_X.d.mts}

@@ -1,11 +1,11 @@
 /// <reference path="./plugin-generated.d.ts" />
 
-import * as zod0 from "zod";
+import * as zod34 from "zod";
 import { z } from "zod";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 import * as type_fest0 from "type-fest";
 import { IsAny, NonEmptyObject } from "type-fest";
-import * as zod_v4_core0 from "zod/v4/core";
+import * as zod_v4_core50 from "zod/v4/core";
 
 //#region src/configure/types/helpers.d.ts
 type Prettify<T> = { [K in keyof T as string extends K ? never : K]: T[K] } & {};
@@ -1277,12 +1277,12 @@ declare function defineGenerators(...configs: GeneratorConfig[]): (["@tailor-pla
 }] | {
   id: string;
   description: string;
-  processType: zod_v4_core0.$InferInnerFunctionType<zod_v4_core0.$ZodFunctionArgs, zod_v4_core0.$ZodFunctionOut>;
-  processResolver: zod_v4_core0.$InferInnerFunctionType<zod_v4_core0.$ZodFunctionArgs, zod_v4_core0.$ZodFunctionOut>;
-  processExecutor: zod_v4_core0.$InferInnerFunctionType<zod_v4_core0.$ZodFunctionArgs, zod_v4_core0.$ZodFunctionOut>;
-  aggregate: zod_v4_core0.$InferInnerFunctionType<zod_v4_core0.$ZodFunctionArgs, zod0.ZodAny>;
-  processTailorDBNamespace?: zod_v4_core0.$InferInnerFunctionType<zod_v4_core0.$ZodFunctionArgs, zod_v4_core0.$ZodFunctionOut> | undefined;
-  processResolverNamespace?: zod_v4_core0.$InferInnerFunctionType<zod_v4_core0.$ZodFunctionArgs, zod_v4_core0.$ZodFunctionOut> | undefined;
+  processType: zod_v4_core50.$InferInnerFunctionType<zod_v4_core50.$ZodFunctionArgs, zod_v4_core50.$ZodFunctionOut>;
+  processResolver: zod_v4_core50.$InferInnerFunctionType<zod_v4_core50.$ZodFunctionArgs, zod_v4_core50.$ZodFunctionOut>;
+  processExecutor: zod_v4_core50.$InferInnerFunctionType<zod_v4_core50.$ZodFunctionArgs, zod_v4_core50.$ZodFunctionOut>;
+  aggregate: zod_v4_core50.$InferInnerFunctionType<zod_v4_core50.$ZodFunctionArgs, zod34.ZodAny>;
+  processTailorDBNamespace?: zod_v4_core50.$InferInnerFunctionType<zod_v4_core50.$ZodFunctionArgs, zod_v4_core50.$ZodFunctionOut> | undefined;
+  processResolverNamespace?: zod_v4_core50.$InferInnerFunctionType<zod_v4_core50.$ZodFunctionArgs, zod_v4_core50.$ZodFunctionOut> | undefined;
 })[];
 //#endregion
 //#region src/parser/service/executor/schema.d.ts

package/dist/utils/test/index.d.mts

@@ -1,7 +1,7 @@
 /// <reference path="./../../plugin-generated.d.ts" />
 
-import { TailorDBType, TailorField, TailorUser } from "../../types-BP7g8Bh3.mjs";
-import { output } from "../../index-Bwrm8M8p.mjs";
+import { TailorDBType, TailorField, TailorUser } from "../../types-CPcmGK_X.mjs";
+import { output } from "../../index-DHpKRtq3.mjs";
 import { StandardSchemaV1 } from "@standard-schema/spec";
 
 //#region src/utils/test/index.d.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tailor-platform/sdk",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "Tailor Platform SDK - The SDK to work with Tailor Platform",
   "license": "MIT",
   "main": "./dist/configure/index.mjs",