joist-codegen 2.4.0-next.5 → 2.4.0-next.50

package/build/docs/parsing.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.cts","names":[],"sources":["../../src/docs/parsing.ts"],"mappings":";;;KAKK,eAAe,WAAW,eAAe,WAAW,cAAc,WAAW,QAAQ,WAAW;EACnG;EACA;;KAGG,YAAY;EACf,WAAW;EACX;EACA;EACA,MAAM,WAAW;;KAGP;UAEK;EACf,MAAM;EACN;EACA;EACA,MAAM;;UAGS;EACf;EACA;EACA;;;iBAIc,kBAAkB;;;;;;;;;;;;iBAuDlB,eAAe,MAAM,WAAW,eAAe;;iBAW/C,WAAW,gBAAgB,OAAO;;iBAUlC,gBAAgB,cAAc;;iBAQ9B,aAAa"}
+{"version":3,"file":"parsing.d.cts","names":[],"sources":["../../src/docs/parsing.ts"],"mappings":";;;KAKK,eAAe,WAAW,eAAe,WAAW,cAAc,WAAW,QAAQ,WAAW;EACnG;EACA;;KAGG,YAAY;EACf,WAAW;EACX;EACA;EACA,MAAM,WAAW;;YAGP;iBAEK;EACf,MAAM;EACN;EACA;EACA,MAAM;;iBAGS;EACf;EACA;EACA;;;wBAIc,kBAAkB;;;;;;;;;;;;wBAuDlB,eAAe,MAAM,WAAW,eAAe;;wBAW/C,WAAW,gBAAgB,OAAO;;wBAUlC,gBAAgB,cAAc;;wBAQ9B,aAAa"}

package/build/docs/parsing.d.mts

@@ -11,20 +11,20 @@ type Commented = ASTNode & {
   end?: number;
   loc?: namedTypes.SourceLocation | null;
 };
-type MemberKind = "property" | "getter" | "setter" | "method";
-interface MemberInfo {
+export type MemberKind = "property" | "getter" | "setter" | "method";
+export interface MemberInfo {
   kind: MemberKind;
   name: string;
   doc: string | undefined;
   node: Commented;
 }
-interface SourceEdit {
+export interface SourceEdit {
   start: number;
   end: number;
   text: string;
 }
 /** Parse an entity .ts file and extract class + member JSDoc. */
-declare function parseEntityJSDocs(source: string): {
+export declare function parseEntityJSDocs(source: string): {
   classDoc: string | undefined;
   classNode: Commented | undefined;
   members: MemberInfo[];
@@ -36,13 +36,13 @@ declare function parseEntityJSDocs(source: string): {
  * (This is bizarre, but this `SourceEdit` + `applyEdits` leaves all existing formatting
  * alone better than doing a `node.toSource()` or other AST-based updates. :grimmacing:)
  */
-declare function buildJSDocEdit(node: Commented, text: string): SourceEdit;
+export declare function buildJSDocEdit(node: Commented, text: string): SourceEdit;
 /** Apply edits to source by splicing in reverse order. */
-declare function applyEdits(source: string, edits: SourceEdit[]): string;
+export declare function applyEdits(source: string, edits: SourceEdit[]): string;
 /** Build a JSDoc block comment string from plain text. */
-declare function buildJSDocBlock(text: string, indent: number): string;
+export declare function buildJSDocBlock(text: string, indent: number): string;
 /** The `@generated Entity.md` marker, i.e. so readers know a JSDoc is sourced from (and edited in) the `.md`. */
-declare function generatedTag(entityName: string): string;
+export declare function generatedTag(entityName: string): string;
 //#endregion
-export { MemberInfo, MemberKind, SourceEdit, applyEdits, buildJSDocBlock, buildJSDocEdit, generatedTag, parseEntityJSDocs };
+export {};
 //# sourceMappingURL=parsing.d.mts.map

package/build/docs/parsing.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"parsing.d.mts","names":[],"sources":["../../src/docs/parsing.ts"],"mappings":";;;KAKK,eAAe,WAAW,eAAe,WAAW,cAAc,WAAW,QAAQ,WAAW;EACnG;EACA;;KAGG,YAAY;EACf,WAAW;EACX;EACA;EACA,MAAM,WAAW;;KAGP;UAEK;EACf,MAAM;EACN;EACA;EACA,MAAM;;UAGS;EACf;EACA;EACA;;;iBAIc,kBAAkB;;;;;;;;;;;;iBAuDlB,eAAe,MAAM,WAAW,eAAe;;iBAW/C,WAAW,gBAAgB,OAAO;;iBAUlC,gBAAgB,cAAc;;iBAQ9B,aAAa"}
+{"version":3,"file":"parsing.d.mts","names":[],"sources":["../../src/docs/parsing.ts"],"mappings":";;;KAKK,eAAe,WAAW,eAAe,WAAW,cAAc,WAAW,QAAQ,WAAW;EACnG;EACA;;KAGG,YAAY;EACf,WAAW;EACX;EACA;EACA,MAAM,WAAW;;YAGP;iBAEK;EACf,MAAM;EACN;EACA;EACA,MAAM;;iBAGS;EACf;EACA;EACA;;;wBAIc,kBAAkB;;;;;;;;;;;;wBAuDlB,eAAe,MAAM,WAAW,eAAe;;wBAW/C,WAAW,gBAAgB,OAAO;;wBAUlC,gBAAgB,cAAc;;wBAQ9B,aAAa"}

package/build/findEntityScopes.d.cts

@@ -2,13 +2,12 @@ import { Config } from "./config.cjs";
 import { Entity } from "./EntityDbMetadata.cjs";
 //#region src/findEntityScopes.d.ts
 /** Each `static active = ...` scope in an entity. */
-interface ScopeMember {
+export interface ScopeMember {
   name: string;
   type: string;
 }
-type ScopeMembersByEntity = Record<string, ScopeMember[]>;
+export type ScopeMembersByEntity = Record<string, ScopeMember[]>;
 /** Finds static scope declarations for all entity files. */
-declare function findAllEntityScopes(config: Config, entities: Entity[]): Promise<ScopeMembersByEntity>;
+export declare function findAllEntityScopes(config: Config, entities: Entity[]): Promise<ScopeMembersByEntity>;
 //#endregion
-export { ScopeMember, ScopeMembersByEntity, findAllEntityScopes };
 //# sourceMappingURL=findEntityScopes.d.cts.map

package/build/findEntityScopes.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"findEntityScopes.d.cts","names":[],"sources":["../src/findEntityScopes.ts"],"mappings":";;;;UAiBiB;EAEf;EAEA;;KAGU,uBAAuB,eAAe;;iBAG5B,oBAAoB,QAAQ,QAAQ,UAAU,WAAW,QAAQ"}
+{"version":3,"file":"findEntityScopes.d.cts","names":[],"sources":["../src/findEntityScopes.ts"],"mappings":";;;;iBAiBiB;EAEf;EAEA;;YAGU,uBAAuB,eAAe;;wBAG5B,oBAAoB,QAAQ,QAAQ,UAAU,WAAW,QAAQ"}

package/build/findEntityScopes.d.mts

@@ -2,13 +2,12 @@ import { Config } from "./config.mjs";
 import { Entity } from "./EntityDbMetadata.mjs";
 //#region src/findEntityScopes.d.ts
 /** Each `static active = ...` scope in an entity. */
-interface ScopeMember {
+export interface ScopeMember {
   name: string;
   type: string;
 }
-type ScopeMembersByEntity = Record<string, ScopeMember[]>;
+export type ScopeMembersByEntity = Record<string, ScopeMember[]>;
 /** Finds static scope declarations for all entity files. */
-declare function findAllEntityScopes(config: Config, entities: Entity[]): Promise<ScopeMembersByEntity>;
+export declare function findAllEntityScopes(config: Config, entities: Entity[]): Promise<ScopeMembersByEntity>;
 //#endregion
-export { ScopeMember, ScopeMembersByEntity, findAllEntityScopes };
 //# sourceMappingURL=findEntityScopes.d.mts.map

package/build/findEntityScopes.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"findEntityScopes.d.mts","names":[],"sources":["../src/findEntityScopes.ts"],"mappings":";;;;UAiBiB;EAEf;EAEA;;KAGU,uBAAuB,eAAe;;iBAG5B,oBAAoB,QAAQ,QAAQ,UAAU,WAAW,QAAQ"}
+{"version":3,"file":"findEntityScopes.d.mts","names":[],"sources":["../src/findEntityScopes.ts"],"mappings":";;;;iBAiBiB;EAEf;EAEA;;YAGU,uBAAuB,eAAe;;wBAG5B,oBAAoB,QAAQ,QAAQ,UAAU,WAAW,QAAQ"}

package/build/foreignKeyOrdering.d.cts

@@ -2,7 +2,6 @@ import { Config } from "./config.cjs";
 import "./index.cjs";
 import { EntityDbMetadata } from "./EntityDbMetadata.cjs";
 //#region src/foreignKeyOrdering.d.ts
-declare function maybeSetForeignKeyOrdering(config: Config, entities: EntityDbMetadata[]): Promise<void>;
+export declare function maybeSetForeignKeyOrdering(config: Config, entities: EntityDbMetadata[]): Promise<void>;
 //#endregion
-export { maybeSetForeignKeyOrdering };
 //# sourceMappingURL=foreignKeyOrdering.d.cts.map

package/build/foreignKeyOrdering.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"foreignKeyOrdering.d.cts","names":[],"sources":["../src/foreignKeyOrdering.ts"],"mappings":";;;;iBAQsB,2BAA2B,QAAQ,QAAQ,UAAU,qBAAqB"}
+{"version":3,"file":"foreignKeyOrdering.d.cts","names":[],"sources":["../src/foreignKeyOrdering.ts"],"mappings":";;;;wBAQsB,2BAA2B,QAAQ,QAAQ,UAAU,qBAAqB"}

package/build/foreignKeyOrdering.d.mts

@@ -2,7 +2,6 @@ import { Config } from "./config.mjs";
 import "./index.mjs";
 import { EntityDbMetadata } from "./EntityDbMetadata.mjs";
 //#region src/foreignKeyOrdering.d.ts
-declare function maybeSetForeignKeyOrdering(config: Config, entities: EntityDbMetadata[]): Promise<void>;
+export declare function maybeSetForeignKeyOrdering(config: Config, entities: EntityDbMetadata[]): Promise<void>;
 //#endregion
-export { maybeSetForeignKeyOrdering };
 //# sourceMappingURL=foreignKeyOrdering.d.mts.map

package/build/foreignKeyOrdering.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"foreignKeyOrdering.d.mts","names":[],"sources":["../src/foreignKeyOrdering.ts"],"mappings":";;;;iBAQsB,2BAA2B,QAAQ,QAAQ,UAAU,qBAAqB"}
+{"version":3,"file":"foreignKeyOrdering.d.mts","names":[],"sources":["../src/foreignKeyOrdering.ts"],"mappings":";;;;wBAQsB,2BAA2B,QAAQ,QAAQ,UAAU,qBAAqB"}

package/build/generate.d.cts

@@ -3,15 +3,14 @@ import "./index.cjs";
 import { DbMetadata } from "./EntityDbMetadata.cjs";
 import { CodegenFile } from "ts-poet";
 //#region src/generate.d.ts
-type DPrintOptions = Record<string, unknown>;
+export type DPrintOptions = Record<string, unknown>;
 /**
  * Provides an API for hooking into the codegen build step.
  */
-interface CodegenPlugin {
+export interface CodegenPlugin {
   run(config: Config, dbMeta: DbMetadata): Promise<CodegenFile>;
 }
 /** Generates our `${Entity}` and `${Entity}Codegen` files based on the `db` schema. */
-declare function generateFiles(config: Config, dbMeta: DbMetadata): Promise<CodegenFile[]>;
+export declare function generateFiles(config: Config, dbMeta: DbMetadata): Promise<CodegenFile[]>;
 //#endregion
-export { CodegenPlugin, DPrintOptions, generateFiles };
 //# sourceMappingURL=generate.d.cts.map

package/build/generate.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.cts","names":[],"sources":["../src/generate.ts"],"mappings":";;;;;KAqBY,gBAAgB;;;;UAKX;EACf,IAAI,QAAQ,QAAQ,QAAQ,aAAa,QAAQ;;;iBAI7B,cAAc,QAAQ,QAAQ,QAAQ,aAAa,QAAQ"}
+{"version":3,"file":"generate.d.cts","names":[],"sources":["../src/generate.ts"],"mappings":";;;;;YAqBY,gBAAgB;;;;iBAKX;EACf,IAAI,QAAQ,QAAQ,QAAQ,aAAa,QAAQ;;;wBAI7B,cAAc,QAAQ,QAAQ,QAAQ,aAAa,QAAQ"}

package/build/generate.d.mts

@@ -3,15 +3,14 @@ import "./index.mjs";
 import { DbMetadata } from "./EntityDbMetadata.mjs";
 import { CodegenFile } from "ts-poet";
 //#region src/generate.d.ts
-type DPrintOptions = Record<string, unknown>;
+export type DPrintOptions = Record<string, unknown>;
 /**
  * Provides an API for hooking into the codegen build step.
  */
-interface CodegenPlugin {
+export interface CodegenPlugin {
   run(config: Config, dbMeta: DbMetadata): Promise<CodegenFile>;
 }
 /** Generates our `${Entity}` and `${Entity}Codegen` files based on the `db` schema. */
-declare function generateFiles(config: Config, dbMeta: DbMetadata): Promise<CodegenFile[]>;
+export declare function generateFiles(config: Config, dbMeta: DbMetadata): Promise<CodegenFile[]>;
 //#endregion
-export { CodegenPlugin, DPrintOptions, generateFiles };
 //# sourceMappingURL=generate.d.mts.map

package/build/generate.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.mts","names":[],"sources":["../src/generate.ts"],"mappings":";;;;;KAqBY,gBAAgB;;;;UAKX;EACf,IAAI,QAAQ,QAAQ,QAAQ,aAAa,QAAQ;;;iBAI7B,cAAc,QAAQ,QAAQ,QAAQ,aAAa,QAAQ"}
+{"version":3,"file":"generate.d.mts","names":[],"sources":["../src/generate.ts"],"mappings":";;;;;YAqBY,gBAAgB;;;;iBAKX;EACf,IAAI,QAAQ,QAAQ,QAAQ,aAAa,QAAQ;;;wBAI7B,cAAc,QAAQ,QAAQ,QAAQ,aAAa,QAAQ"}

package/build/generateEntitiesFile.d.cts

@@ -5,7 +5,6 @@ import { PgEnumData } from "./loadMetadata.cjs";
 import { EntityDbMetadata } from "./EntityDbMetadata.cjs";
 import { Code } from "ts-poet";
 //#region src/generateEntitiesFile.d.ts
-declare function generateEntitiesFile(config: Config, entities: EntityDbMetadata[], enums: Table[], pgEnums: PgEnumData[]): Code;
+export declare function generateEntitiesFile(config: Config, entities: EntityDbMetadata[], enums: Table[], pgEnums: PgEnumData[]): Code;
 //#endregion
-export { generateEntitiesFile };
 //# sourceMappingURL=generateEntitiesFile.d.cts.map

package/build/generateEntitiesFile.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"generateEntitiesFile.d.cts","names":[],"sources":["../src/generateEntitiesFile.ts"],"mappings":";;;;;;;iBAQgB,qBACd,QAAQ,QACR,UAAU,oBACV,OAAO,SACP,SAAS,eACR"}
+{"version":3,"file":"generateEntitiesFile.d.cts","names":[],"sources":["../src/generateEntitiesFile.ts"],"mappings":";;;;;;;wBAQgB,qBACd,QAAQ,QACR,UAAU,oBACV,OAAO,SACP,SAAS,eACR"}

package/build/generateEntitiesFile.d.mts

@@ -5,7 +5,6 @@ import { PgEnumData } from "./loadMetadata.mjs";
 import { EntityDbMetadata } from "./EntityDbMetadata.mjs";
 import { Code } from "ts-poet";
 //#region src/generateEntitiesFile.d.ts
-declare function generateEntitiesFile(config: Config, entities: EntityDbMetadata[], enums: Table[], pgEnums: PgEnumData[]): Code;
+export declare function generateEntitiesFile(config: Config, entities: EntityDbMetadata[], enums: Table[], pgEnums: PgEnumData[]): Code;
 //#endregion
-export { generateEntitiesFile };
 //# sourceMappingURL=generateEntitiesFile.d.mts.map

package/build/generateEntitiesFile.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"generateEntitiesFile.d.mts","names":[],"sources":["../src/generateEntitiesFile.ts"],"mappings":";;;;;;;iBAQgB,qBACd,QAAQ,QACR,UAAU,oBACV,OAAO,SACP,SAAS,eACR"}
+{"version":3,"file":"generateEntitiesFile.d.mts","names":[],"sources":["../src/generateEntitiesFile.ts"],"mappings":";;;;;;;wBAQgB,qBACd,QAAQ,QACR,UAAU,oBACV,OAAO,SACP,SAAS,eACR"}

package/build/generateEntityCodegenFile.cjs

@@ -68,6 +68,7 @@ function generateEntityCodegenFile(config, dbMeta, meta, scopeMembers = [], docs
 	const maybeBaseFilter = baseEntity ? ts_poet.code`extends ${(0, ts_poet.imp)("t:" + baseEntity.entity.filterName + "@./entities.ts")}` : "";
 	const maybeBaseGqlFilter = baseEntity ? ts_poet.code`extends ${(0, ts_poet.imp)("t:" + baseEntity.entity.graphqlFilterName + "@./entities.ts")}` : "";
 	const maybeBaseOrder = baseEntity ? ts_poet.code`extends ${baseEntity.entity.orderType}` : "";
+	const maybeBaseFactoryExtras = baseEntity ? ts_poet.code`extends ${(0, ts_poet.imp)("t:" + baseEntity.entity.factoryExtrasName + "@./entities.ts")}` : "";
 	meta.abstract && ts_poet.code`
     if (this.constructor === ${entity.type} && !(em as any).fakeInstance) {
       throw new Error(\`${entity.type} must be instantiated via a subtype\`);
@@ -111,7 +112,7 @@ function generateEntityCodegenFile(config, dbMeta, meta, scopeMembers = [], docs
       ${generateOrderFields(meta)}
     }
 
-    export interface ${entity.factoryExtrasName} {
+    export interface ${entity.factoryExtrasName} ${maybeBaseFactoryExtras} {
       ${generateFactoryExtrasType(meta)}
     }
 
@@ -355,8 +356,9 @@ function generateFieldsType(meta, idType) {
 		return ts_poet.code`${fieldName}: { kind: "primitive"; type: ${fieldType}; unique: ${unique}; nullable: ${undefinedOrNever(notNull)}, derived: ${derived !== false}; };`;
 	});
 	const enums = meta.enums.map((field) => {
-		const { fieldName, enumType, notNull, isArray } = field;
+		const { fieldName, enumType, notNull, isArray, hasTransitions } = field;
 		if (isArray) return ts_poet.code`${fieldName}: { kind: "enum"; type: ${enumType}[]; nullable: never; };`;
+		else if (hasTransitions) return ts_poet.code`${fieldName}: { kind: "enum"; type: ${enumType}; nullable: ${undefinedOrNever(notNull)}; accessors: keyof typeof ${enumType}; };`;
 		else return ts_poet.code`${fieldName}: { kind: "enum"; type: ${enumType}; nullable: ${undefinedOrNever(notNull)}; };`;
 	});
 	const pgEnums = meta.pgEnums.map((field) => {
@@ -599,7 +601,7 @@ function generateFactoryExtrasType(meta) {
 		const { fieldName, fieldType, notNull } = field;
 		return ts_poet.code`${withName(fieldName)}?: ${fieldType}${maybeUnionNull(notNull)};`;
 	});
-	const enums = meta.enums.filter((f) => f.derived === "async").map((field) => {
+	const enums = meta.enums.filter((f) => f.derived === "async" || f.hasTransitions).map((field) => {
 		const { fieldName, enumType, notNull, isArray } = field;
 		if (isArray) return ts_poet.code`${withName(fieldName)}?: ${enumType}[];`;
 		else return ts_poet.code`${withName(fieldName)}?: ${enumType}${maybeUnionNull(notNull)};`;