joist-codegen 2.3.0-next.111 → 2.3.0-next.113

package/build/index.cjs

@@ -92,7 +92,7 @@ async function loadSchemaMetadata(config, client) {
 	const entities = db.tables.filter((t) => require_utils.isEntityTable(config, t)).sortBy("name").map((table) => new require_EntityDbMetadata.EntityDbMetadata(config, table, enums));
 	const totalTables = db.tables.length;
 	const joinTables = db.tables.filter((t) => require_utils.isJoinTable(config, t)).map((t) => t.name);
-	const otherTables = db.tables.filter((t) => !require_utils.isEntityTable(config, t) && !require_utils.isEnumTable(config, t) && !require_utils.isJoinTable(config, t)).map((t) => t.name);
+	const otherTables = db.tables.filter((t) => require_utils.shouldIncludeSchema(config, t) && !require_utils.isEntityTable(config, t) && !require_utils.isEnumTable(config, t) && !require_utils.isJoinTable(config, t)).map((t) => t.name);
 	return {
 		entities,
 		entitiesByName: Object.fromEntries(entities.map((e) => [e.name, e])),

package/build/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":["pgStructureModule","loadConfig","process","newPgConnectionConfig","Client","scanEntityFiles","maybeSetForeignKeyOrdering","maybeRunTransforms","installSkills","writeConfig","generateFiles","saveFiles","createFlushFunction","loadEnumMetadata","loadPgEnumMetadata","isEntityTable","EntityDbMetadata","isJoinTable","isEnumTable","loggerMaxWarningLevelHit","LOG_LEVELS"],"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport process from \"node:process\";\n\nimport { type ConnectionConfig, newPgConnectionConfig } from \"joist-utils\";\nimport { Client } from \"pg\";\nimport pgStructureModule from \"pg-structure\";\nimport { saveFiles } from \"ts-poet\";\n\nimport { assignTags } from \"./assignTags.ts\";\nimport { maybeRunTransforms } from \"./codemods/index.ts\";\nimport { type Config, loadConfig, stripStiPlaceholders, warnInvalidConfigEntries, writeConfig } from \"./config.ts\";\nimport {\n  type DbMetadata,\n  EntityDbMetadata,\n  failIfOverlappingFieldNames,\n  resolveNameConflicts,\n} from \"./EntityDbMetadata.ts\";\nimport { maybeSetForeignKeyOrdering } from \"./foreignKeyOrdering.ts\";\nimport { generateFiles } from \"./generate.ts\";\nimport { createFlushFunction } from \"./generateFlushFunction.ts\";\nimport { applyInheritanceUpdates } from \"./inheritance.ts\";\nimport { installSkills } from \"./installSkills.ts\";\nimport { loadEnumMetadata, loadPgEnumMetadata } from \"./loadMetadata.ts\";\nimport { LOG_LEVELS, loggerMaxWarningLevelHit } from \"./logger.ts\";\nimport { scanEntityFiles } from \"./scanEntityFiles.ts\";\nimport { isEntityTable, isEnumTable, isJoinTable, mapSimpleDbTypeToTypescriptType } from \"./utils.ts\";\n\nconst { default: pgStructure } = pgStructureModule;\n\nexport {\n  type DbMetadata,\n  type EnumField,\n  makeEntity,\n  type ManyToManyField,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  type PolymorphicField,\n  type PrimitiveField,\n  type PrimitiveTypescriptType,\n} from \"./EntityDbMetadata.ts\";\nexport type { EnumMetadata, EnumRow, EnumTableData, PgEnumData, PgEnumMetadata } from \"./loadMetadata.ts\";\nexport { dateCode, plainDateCode, plainDateTimeCode, zonedDateTimeCode } from \"./utils.ts\";\nexport { type Config, EntityDbMetadata, mapSimpleDbTypeToTypescriptType };\n\nexport async function joistCodegen() {\n  const config = await loadConfig();\n\n  maybeSetDatabaseUrl(config);\n  if (!process.env.DATABASE_URL && !process.env.DB_USER) {\n    console.log(`Database connection information not found, please set either:`);\n    console.log(`  - the DATABASE_URL env variable (i.e. using .env and dotenv), or`);\n    console.log(`  - the databaseUrl key in joist-config.json`);\n    return;\n  }\n  const pgConfig = newPgConnectionConfig();\n\n  const client = new Client(pgConfig);\n  await client.connect();\n\n  const dbMetadata = await loadSchemaMetadata(config, client);\n  const { entities, enums, totalTables } = dbMetadata;\n  console.log(\n    `Found ${totalTables} total tables, ${entities.length} entity tables, ${Object.entries(enums).length} enum tables`,\n  );\n  console.log(\"\");\n\n  // Look for STI tables to synthesize separate metas\n  applyInheritanceUpdates(config, dbMetadata);\n\n  // Now that all entities (incl. STI subtypes) are known, fix up any colliding codegen'd type names\n  resolveNameConflicts(config, dbMetadata);\n\n  // Assign any new tags and write them back to the config file\n  assignTags(config, dbMetadata);\n  validateTagDelimiter(config, entities);\n\n  // Scan `*.ts` files after we've expanded `Task` -> `TaskOld.ts`\n  await scanEntityFiles(config, dbMetadata);\n\n  // If we're not using deferred FKs, determine our DAG insert order\n  await maybeSetForeignKeyOrdering(config, dbMetadata.entities);\n\n  // Generate the flush function for tests\n  await maybeGenerateFlushFunctions(config, client, pgConfig, dbMetadata);\n\n  await client.end();\n\n  // Apply any codemods to the user's codebase, if we have them\n  await maybeRunTransforms(config);\n\n  // Do some warnings\n  for (const entity of entities) failIfOverlappingFieldNames(entity);\n  warnInvalidConfigEntries(config, dbMetadata);\n\n  // Finally actually generate the files (even if we found a fatal error)\n  await generateAndSaveFiles(config, dbMetadata);\n\n  // Install our bundled Agent Skills so coding agents can find them, unless explicitly disabled\n  if (config.skills !== false) await installSkills();\n\n  stripStiPlaceholders(config, entities);\n  await writeConfig(config);\n}\n\n/** Uses entities and enums from the `db` schema and saves them into our entities directory. */\nexport async function generateAndSaveFiles(config: Config, dbMeta: DbMetadata): Promise<void> {\n  const files = await generateFiles(config, dbMeta);\n  const esmExt = config.esm ? (config.allowImportingTsExtensions ? \"ts\" : \"js\") : \"\";\n  await saveFiles({\n    toolName: \"joist-codegen\",\n    directory: config.entitiesDirectory,\n    files,\n    toStringOpts: { importExtensions: esmExt || false },\n  });\n}\n\nasync function maybeGenerateFlushFunctions(config: Config, client: Client, pgConfig: ConnectionConfig, db: DbMetadata) {\n  // In graphql-service we have our own custom flush function, so allow skipping this\n  if (config.createFlushFunction !== false) {\n    // Look for multiple test databases\n    if (Array.isArray(config.createFlushFunction)) {\n      console.log(\"Creating flush_database functions\");\n      await Promise.all(\n        config.createFlushFunction.map(async (dbName) => {\n          const client = new Client({ ...pgConfig, database: dbName });\n          await client.connect();\n          await createFlushFunction(client, db);\n          await client.end();\n        }),\n      );\n    } else {\n      console.log(\"Creating flush_database function\");\n      await createFlushFunction(client, db);\n    }\n  }\n}\n\nasync function loadSchemaMetadata(config: Config, client: Client): Promise<DbMetadata> {\n  // Here we load all schemas, to avoid pg-structure failing on cross-schema foreign keys\n  // like our cyanaudit triggers (https://github.com/ozum/pg-structure/issues/85), and then\n  // later filter them non-public schema tables out.\n  const db = await pgStructure(client);\n  const enums = await loadEnumMetadata(db, client, config);\n  const pgEnums = await loadPgEnumMetadata(db, client, config);\n  const entities = db.tables\n    .filter((t) => isEntityTable(config, t))\n    .sortBy(\"name\")\n    .map((table) => new EntityDbMetadata(config, table, enums));\n  const totalTables = db.tables.length;\n  const joinTables = db.tables.filter((t) => isJoinTable(config, t)).map((t) => t.name);\n  const otherTables = db.tables\n    .filter((t) => !isEntityTable(config, t) && !isEnumTable(config, t) && !isJoinTable(config, t))\n    .map((t) => t.name);\n  const entitiesByName = Object.fromEntries(entities.map((e) => [e.name, e]));\n  return { entities, entitiesByName, enums, pgEnums, totalTables, joinTables, otherTables };\n}\n\nfunction maybeSetDatabaseUrl(config: Config): void {\n  if (!process.env.DATABASE_URL && config.databaseUrl) {\n    process.env.DATABASE_URL = config.databaseUrl;\n  }\n}\n\nexport function maybeSetExitCode(): void {\n  if (\n    !process.argv.includes(\"--always-exit-code-zero\") &&\n    // strict mode + warnings or greater\n    ((process.argv.includes(\"--strict\") && loggerMaxWarningLevelHit >= LOG_LEVELS.warn) ||\n      // otherwise errors or greater\n      loggerMaxWarningLevelHit >= LOG_LEVELS.error)\n  ) {\n    process.exitCode = 1;\n  }\n}\n\n/** Validates that tags can be parsed unambiguously with the configured delimiter. */\nfunction validateTagDelimiter(config: Config, entities: EntityDbMetadata[]): void {\n  const tagDelimiter = config.tagDelimiter ?? \":\";\n  for (const entity of entities) {\n    if (tagDelimiter !== \"\" && `${entity.tagName}${tagDelimiter}`.indexOf(tagDelimiter) !== entity.tagName.length) {\n      throw new Error(\n        `Tagged id delimiter '${tagDelimiter}' cannot occur in or overlap tag '${entity.tagName}' for ${entity.name}`,\n      );\n    } else if (tagDelimiter === \"\" && !/^[a-z]+$/i.test(entity.tagName)) {\n      throw new Error(`Delimiterless ids require an alphabetic tag, got '${entity.tagName}' for ${entity.name}`);\n    } else if (\n      tagDelimiter === \"\" &&\n      entity.primaryKey.columnType !== \"int\" &&\n      entity.primaryKey.columnType !== \"bigint\"\n    ) {\n      throw new Error(\n        `Delimiterless ids require an int or bigint primary key, got '${entity.primaryKey.columnType}' for ${entity.name}`,\n      );\n    }\n  }\n}\n\nif (typeof module !== \"undefined\" && require.main === module) {\n  joistCodegen()\n    .then(() => maybeSetExitCode())\n    .catch((err) => {\n      console.error(err);\n      process.exit(1);\n    });\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.cjs","names":["pgStructureModule","loadConfig","process","newPgConnectionConfig","Client","scanEntityFiles","maybeSetForeignKeyOrdering","maybeRunTransforms","installSkills","writeConfig","generateFiles","saveFiles","createFlushFunction","loadEnumMetadata","loadPgEnumMetadata","isEntityTable","EntityDbMetadata","isJoinTable","shouldIncludeSchema","isEnumTable","loggerMaxWarningLevelHit","LOG_LEVELS"],"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport process from \"node:process\";\n\nimport { type ConnectionConfig, newPgConnectionConfig } from \"joist-utils\";\nimport { Client } from \"pg\";\nimport pgStructureModule from \"pg-structure\";\nimport { saveFiles } from \"ts-poet\";\n\nimport { assignTags } from \"./assignTags.ts\";\nimport { maybeRunTransforms } from \"./codemods/index.ts\";\nimport { type Config, loadConfig, stripStiPlaceholders, warnInvalidConfigEntries, writeConfig } from \"./config.ts\";\nimport {\n  type DbMetadata,\n  EntityDbMetadata,\n  failIfOverlappingFieldNames,\n  resolveNameConflicts,\n} from \"./EntityDbMetadata.ts\";\nimport { maybeSetForeignKeyOrdering } from \"./foreignKeyOrdering.ts\";\nimport { generateFiles } from \"./generate.ts\";\nimport { createFlushFunction } from \"./generateFlushFunction.ts\";\nimport { applyInheritanceUpdates } from \"./inheritance.ts\";\nimport { installSkills } from \"./installSkills.ts\";\nimport { loadEnumMetadata, loadPgEnumMetadata } from \"./loadMetadata.ts\";\nimport { LOG_LEVELS, loggerMaxWarningLevelHit } from \"./logger.ts\";\nimport { scanEntityFiles } from \"./scanEntityFiles.ts\";\nimport {\n  isEntityTable,\n  isEnumTable,\n  isJoinTable,\n  mapSimpleDbTypeToTypescriptType,\n  shouldIncludeSchema,\n} from \"./utils.ts\";\n\nconst { default: pgStructure } = pgStructureModule;\n\nexport {\n  type DbMetadata,\n  type EnumField,\n  makeEntity,\n  type ManyToManyField,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  type PolymorphicField,\n  type PrimitiveField,\n  type PrimitiveTypescriptType,\n} from \"./EntityDbMetadata.ts\";\nexport type { EnumMetadata, EnumRow, EnumTableData, PgEnumData, PgEnumMetadata } from \"./loadMetadata.ts\";\nexport { dateCode, plainDateCode, plainDateTimeCode, zonedDateTimeCode } from \"./utils.ts\";\nexport { type Config, EntityDbMetadata, mapSimpleDbTypeToTypescriptType };\n\nexport async function joistCodegen() {\n  const config = await loadConfig();\n\n  maybeSetDatabaseUrl(config);\n  if (!process.env.DATABASE_URL && !process.env.DB_USER) {\n    console.log(`Database connection information not found, please set either:`);\n    console.log(`  - the DATABASE_URL env variable (i.e. using .env and dotenv), or`);\n    console.log(`  - the databaseUrl key in joist-config.json`);\n    return;\n  }\n  const pgConfig = newPgConnectionConfig();\n\n  const client = new Client(pgConfig);\n  await client.connect();\n\n  const dbMetadata = await loadSchemaMetadata(config, client);\n  const { entities, enums, totalTables } = dbMetadata;\n  console.log(\n    `Found ${totalTables} total tables, ${entities.length} entity tables, ${Object.entries(enums).length} enum tables`,\n  );\n  console.log(\"\");\n\n  // Look for STI tables to synthesize separate metas\n  applyInheritanceUpdates(config, dbMetadata);\n\n  // Now that all entities (incl. STI subtypes) are known, fix up any colliding codegen'd type names\n  resolveNameConflicts(config, dbMetadata);\n\n  // Assign any new tags and write them back to the config file\n  assignTags(config, dbMetadata);\n  validateTagDelimiter(config, entities);\n\n  // Scan `*.ts` files after we've expanded `Task` -> `TaskOld.ts`\n  await scanEntityFiles(config, dbMetadata);\n\n  // If we're not using deferred FKs, determine our DAG insert order\n  await maybeSetForeignKeyOrdering(config, dbMetadata.entities);\n\n  // Generate the flush function for tests\n  await maybeGenerateFlushFunctions(config, client, pgConfig, dbMetadata);\n\n  await client.end();\n\n  // Apply any codemods to the user's codebase, if we have them\n  await maybeRunTransforms(config);\n\n  // Do some warnings\n  for (const entity of entities) failIfOverlappingFieldNames(entity);\n  warnInvalidConfigEntries(config, dbMetadata);\n\n  // Finally actually generate the files (even if we found a fatal error)\n  await generateAndSaveFiles(config, dbMetadata);\n\n  // Install our bundled Agent Skills so coding agents can find them, unless explicitly disabled\n  if (config.skills !== false) await installSkills();\n\n  stripStiPlaceholders(config, entities);\n  await writeConfig(config);\n}\n\n/** Uses entities and enums from the `db` schema and saves them into our entities directory. */\nexport async function generateAndSaveFiles(config: Config, dbMeta: DbMetadata): Promise<void> {\n  const files = await generateFiles(config, dbMeta);\n  const esmExt = config.esm ? (config.allowImportingTsExtensions ? \"ts\" : \"js\") : \"\";\n  await saveFiles({\n    toolName: \"joist-codegen\",\n    directory: config.entitiesDirectory,\n    files,\n    toStringOpts: { importExtensions: esmExt || false },\n  });\n}\n\nasync function maybeGenerateFlushFunctions(config: Config, client: Client, pgConfig: ConnectionConfig, db: DbMetadata) {\n  // In graphql-service we have our own custom flush function, so allow skipping this\n  if (config.createFlushFunction !== false) {\n    // Look for multiple test databases\n    if (Array.isArray(config.createFlushFunction)) {\n      console.log(\"Creating flush_database functions\");\n      await Promise.all(\n        config.createFlushFunction.map(async (dbName) => {\n          const client = new Client({ ...pgConfig, database: dbName });\n          await client.connect();\n          await createFlushFunction(client, db);\n          await client.end();\n        }),\n      );\n    } else {\n      console.log(\"Creating flush_database function\");\n      await createFlushFunction(client, db);\n    }\n  }\n}\n\nasync function loadSchemaMetadata(config: Config, client: Client): Promise<DbMetadata> {\n  // Here we load all schemas, to avoid pg-structure failing on cross-schema foreign keys\n  // like our cyanaudit triggers (https://github.com/ozum/pg-structure/issues/85), and then\n  // later filter them non-public schema tables out.\n  const db = await pgStructure(client);\n  const enums = await loadEnumMetadata(db, client, config);\n  const pgEnums = await loadPgEnumMetadata(db, client, config);\n  const entities = db.tables\n    .filter((t) => isEntityTable(config, t))\n    .sortBy(\"name\")\n    .map((table) => new EntityDbMetadata(config, table, enums));\n  const totalTables = db.tables.length;\n  const joinTables = db.tables.filter((t) => isJoinTable(config, t)).map((t) => t.name);\n  const otherTables = db.tables\n    .filter(\n      (t) =>\n        shouldIncludeSchema(config, t) &&\n        !isEntityTable(config, t) &&\n        !isEnumTable(config, t) &&\n        !isJoinTable(config, t),\n    )\n    .map((t) => t.name);\n  const entitiesByName = Object.fromEntries(entities.map((e) => [e.name, e]));\n  return { entities, entitiesByName, enums, pgEnums, totalTables, joinTables, otherTables };\n}\n\nfunction maybeSetDatabaseUrl(config: Config): void {\n  if (!process.env.DATABASE_URL && config.databaseUrl) {\n    process.env.DATABASE_URL = config.databaseUrl;\n  }\n}\n\nexport function maybeSetExitCode(): void {\n  if (\n    !process.argv.includes(\"--always-exit-code-zero\") &&\n    // strict mode + warnings or greater\n    ((process.argv.includes(\"--strict\") && loggerMaxWarningLevelHit >= LOG_LEVELS.warn) ||\n      // otherwise errors or greater\n      loggerMaxWarningLevelHit >= LOG_LEVELS.error)\n  ) {\n    process.exitCode = 1;\n  }\n}\n\n/** Validates that tags can be parsed unambiguously with the configured delimiter. */\nfunction validateTagDelimiter(config: Config, entities: EntityDbMetadata[]): void {\n  const tagDelimiter = config.tagDelimiter ?? \":\";\n  for (const entity of entities) {\n    if (tagDelimiter !== \"\" && `${entity.tagName}${tagDelimiter}`.indexOf(tagDelimiter) !== entity.tagName.length) {\n      throw new Error(\n        `Tagged id delimiter '${tagDelimiter}' cannot occur in or overlap tag '${entity.tagName}' for ${entity.name}`,\n      );\n    } else if (tagDelimiter === \"\" && !/^[a-z]+$/i.test(entity.tagName)) {\n      throw new Error(`Delimiterless ids require an alphabetic tag, got '${entity.tagName}' for ${entity.name}`);\n    } else if (\n      tagDelimiter === \"\" &&\n      entity.primaryKey.columnType !== \"int\" &&\n      entity.primaryKey.columnType !== \"bigint\"\n    ) {\n      throw new Error(\n        `Delimiterless ids require an int or bigint primary key, got '${entity.primaryKey.columnType}' for ${entity.name}`,\n      );\n    }\n  }\n}\n\nif (typeof module !== \"undefined\" && require.main === module) {\n  joistCodegen()\n    .then(() => maybeSetExitCode())\n    .catch((err) => {\n      console.error(err);\n      process.exit(1);\n    });\n}\n"],"mappings":"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"}

package/build/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../src/index.ts"],"mappings":";;;;;iBA8CsB,gBAAY;;iBA6DZ,qBAAqB,QAAQ,QAAQ,QAAQ,aAAa;iBA0DhE"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/index.ts"],"mappings":";;;;;iBAoDsB,gBAAY;;iBA6DZ,qBAAqB,QAAQ,QAAQ,QAAQ,aAAa;iBAgEhE"}

package/build/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/index.ts"],"mappings":";;;;;iBA8CsB,gBAAY;;iBA6DZ,qBAAqB,QAAQ,QAAQ,QAAQ,aAAa;iBA0DhE"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/index.ts"],"mappings":";;;;;iBAoDsB,gBAAY;;iBA6DZ,qBAAqB,QAAQ,QAAQ,QAAQ,aAAa;iBAgEhE"}

package/build/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { __require } from "./_virtual/_rolldown/runtime.js";
 import { maybeRunTransforms } from "./codemods/index.js";
-import { dateCode, isEntityTable, isEnumTable, isJoinTable, mapSimpleDbTypeToTypescriptType, plainDateCode, plainDateTimeCode, zonedDateTimeCode } from "./utils.js";
+import { dateCode, isEntityTable, isEnumTable, isJoinTable, mapSimpleDbTypeToTypescriptType, plainDateCode, plainDateTimeCode, shouldIncludeSchema, zonedDateTimeCode } from "./utils.js";
 import { applyInheritanceUpdates } from "./inheritance.js";
 import { LOG_LEVELS, loggerMaxWarningLevelHit } from "./logger.js";
 import { loadConfig, stripStiPlaceholders, warnInvalidConfigEntries, writeConfig } from "./config.js";
@@ -89,7 +89,7 @@ async function loadSchemaMetadata(config, client) {
 	const entities = db.tables.filter((t) => isEntityTable(config, t)).sortBy("name").map((table) => new EntityDbMetadata(config, table, enums));
 	const totalTables = db.tables.length;
 	const joinTables = db.tables.filter((t) => isJoinTable(config, t)).map((t) => t.name);
-	const otherTables = db.tables.filter((t) => !isEntityTable(config, t) && !isEnumTable(config, t) && !isJoinTable(config, t)).map((t) => t.name);
+	const otherTables = db.tables.filter((t) => shouldIncludeSchema(config, t) && !isEntityTable(config, t) && !isEnumTable(config, t) && !isJoinTable(config, t)).map((t) => t.name);
 	return {
 		entities,
 		entitiesByName: Object.fromEntries(entities.map((e) => [e.name, e])),

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport process from \"node:process\";\n\nimport { type ConnectionConfig, newPgConnectionConfig } from \"joist-utils\";\nimport { Client } from \"pg\";\nimport pgStructureModule from \"pg-structure\";\nimport { saveFiles } from \"ts-poet\";\n\nimport { assignTags } from \"./assignTags.ts\";\nimport { maybeRunTransforms } from \"./codemods/index.ts\";\nimport { type Config, loadConfig, stripStiPlaceholders, warnInvalidConfigEntries, writeConfig } from \"./config.ts\";\nimport {\n  type DbMetadata,\n  EntityDbMetadata,\n  failIfOverlappingFieldNames,\n  resolveNameConflicts,\n} from \"./EntityDbMetadata.ts\";\nimport { maybeSetForeignKeyOrdering } from \"./foreignKeyOrdering.ts\";\nimport { generateFiles } from \"./generate.ts\";\nimport { createFlushFunction } from \"./generateFlushFunction.ts\";\nimport { applyInheritanceUpdates } from \"./inheritance.ts\";\nimport { installSkills } from \"./installSkills.ts\";\nimport { loadEnumMetadata, loadPgEnumMetadata } from \"./loadMetadata.ts\";\nimport { LOG_LEVELS, loggerMaxWarningLevelHit } from \"./logger.ts\";\nimport { scanEntityFiles } from \"./scanEntityFiles.ts\";\nimport { isEntityTable, isEnumTable, isJoinTable, mapSimpleDbTypeToTypescriptType } from \"./utils.ts\";\n\nconst { default: pgStructure } = pgStructureModule;\n\nexport {\n  type DbMetadata,\n  type EnumField,\n  makeEntity,\n  type ManyToManyField,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  type PolymorphicField,\n  type PrimitiveField,\n  type PrimitiveTypescriptType,\n} from \"./EntityDbMetadata.ts\";\nexport type { EnumMetadata, EnumRow, EnumTableData, PgEnumData, PgEnumMetadata } from \"./loadMetadata.ts\";\nexport { dateCode, plainDateCode, plainDateTimeCode, zonedDateTimeCode } from \"./utils.ts\";\nexport { type Config, EntityDbMetadata, mapSimpleDbTypeToTypescriptType };\n\nexport async function joistCodegen() {\n  const config = await loadConfig();\n\n  maybeSetDatabaseUrl(config);\n  if (!process.env.DATABASE_URL && !process.env.DB_USER) {\n    console.log(`Database connection information not found, please set either:`);\n    console.log(`  - the DATABASE_URL env variable (i.e. using .env and dotenv), or`);\n    console.log(`  - the databaseUrl key in joist-config.json`);\n    return;\n  }\n  const pgConfig = newPgConnectionConfig();\n\n  const client = new Client(pgConfig);\n  await client.connect();\n\n  const dbMetadata = await loadSchemaMetadata(config, client);\n  const { entities, enums, totalTables } = dbMetadata;\n  console.log(\n    `Found ${totalTables} total tables, ${entities.length} entity tables, ${Object.entries(enums).length} enum tables`,\n  );\n  console.log(\"\");\n\n  // Look for STI tables to synthesize separate metas\n  applyInheritanceUpdates(config, dbMetadata);\n\n  // Now that all entities (incl. STI subtypes) are known, fix up any colliding codegen'd type names\n  resolveNameConflicts(config, dbMetadata);\n\n  // Assign any new tags and write them back to the config file\n  assignTags(config, dbMetadata);\n  validateTagDelimiter(config, entities);\n\n  // Scan `*.ts` files after we've expanded `Task` -> `TaskOld.ts`\n  await scanEntityFiles(config, dbMetadata);\n\n  // If we're not using deferred FKs, determine our DAG insert order\n  await maybeSetForeignKeyOrdering(config, dbMetadata.entities);\n\n  // Generate the flush function for tests\n  await maybeGenerateFlushFunctions(config, client, pgConfig, dbMetadata);\n\n  await client.end();\n\n  // Apply any codemods to the user's codebase, if we have them\n  await maybeRunTransforms(config);\n\n  // Do some warnings\n  for (const entity of entities) failIfOverlappingFieldNames(entity);\n  warnInvalidConfigEntries(config, dbMetadata);\n\n  // Finally actually generate the files (even if we found a fatal error)\n  await generateAndSaveFiles(config, dbMetadata);\n\n  // Install our bundled Agent Skills so coding agents can find them, unless explicitly disabled\n  if (config.skills !== false) await installSkills();\n\n  stripStiPlaceholders(config, entities);\n  await writeConfig(config);\n}\n\n/** Uses entities and enums from the `db` schema and saves them into our entities directory. */\nexport async function generateAndSaveFiles(config: Config, dbMeta: DbMetadata): Promise<void> {\n  const files = await generateFiles(config, dbMeta);\n  const esmExt = config.esm ? (config.allowImportingTsExtensions ? \"ts\" : \"js\") : \"\";\n  await saveFiles({\n    toolName: \"joist-codegen\",\n    directory: config.entitiesDirectory,\n    files,\n    toStringOpts: { importExtensions: esmExt || false },\n  });\n}\n\nasync function maybeGenerateFlushFunctions(config: Config, client: Client, pgConfig: ConnectionConfig, db: DbMetadata) {\n  // In graphql-service we have our own custom flush function, so allow skipping this\n  if (config.createFlushFunction !== false) {\n    // Look for multiple test databases\n    if (Array.isArray(config.createFlushFunction)) {\n      console.log(\"Creating flush_database functions\");\n      await Promise.all(\n        config.createFlushFunction.map(async (dbName) => {\n          const client = new Client({ ...pgConfig, database: dbName });\n          await client.connect();\n          await createFlushFunction(client, db);\n          await client.end();\n        }),\n      );\n    } else {\n      console.log(\"Creating flush_database function\");\n      await createFlushFunction(client, db);\n    }\n  }\n}\n\nasync function loadSchemaMetadata(config: Config, client: Client): Promise<DbMetadata> {\n  // Here we load all schemas, to avoid pg-structure failing on cross-schema foreign keys\n  // like our cyanaudit triggers (https://github.com/ozum/pg-structure/issues/85), and then\n  // later filter them non-public schema tables out.\n  const db = await pgStructure(client);\n  const enums = await loadEnumMetadata(db, client, config);\n  const pgEnums = await loadPgEnumMetadata(db, client, config);\n  const entities = db.tables\n    .filter((t) => isEntityTable(config, t))\n    .sortBy(\"name\")\n    .map((table) => new EntityDbMetadata(config, table, enums));\n  const totalTables = db.tables.length;\n  const joinTables = db.tables.filter((t) => isJoinTable(config, t)).map((t) => t.name);\n  const otherTables = db.tables\n    .filter((t) => !isEntityTable(config, t) && !isEnumTable(config, t) && !isJoinTable(config, t))\n    .map((t) => t.name);\n  const entitiesByName = Object.fromEntries(entities.map((e) => [e.name, e]));\n  return { entities, entitiesByName, enums, pgEnums, totalTables, joinTables, otherTables };\n}\n\nfunction maybeSetDatabaseUrl(config: Config): void {\n  if (!process.env.DATABASE_URL && config.databaseUrl) {\n    process.env.DATABASE_URL = config.databaseUrl;\n  }\n}\n\nexport function maybeSetExitCode(): void {\n  if (\n    !process.argv.includes(\"--always-exit-code-zero\") &&\n    // strict mode + warnings or greater\n    ((process.argv.includes(\"--strict\") && loggerMaxWarningLevelHit >= LOG_LEVELS.warn) ||\n      // otherwise errors or greater\n      loggerMaxWarningLevelHit >= LOG_LEVELS.error)\n  ) {\n    process.exitCode = 1;\n  }\n}\n\n/** Validates that tags can be parsed unambiguously with the configured delimiter. */\nfunction validateTagDelimiter(config: Config, entities: EntityDbMetadata[]): void {\n  const tagDelimiter = config.tagDelimiter ?? \":\";\n  for (const entity of entities) {\n    if (tagDelimiter !== \"\" && `${entity.tagName}${tagDelimiter}`.indexOf(tagDelimiter) !== entity.tagName.length) {\n      throw new Error(\n        `Tagged id delimiter '${tagDelimiter}' cannot occur in or overlap tag '${entity.tagName}' for ${entity.name}`,\n      );\n    } else if (tagDelimiter === \"\" && !/^[a-z]+$/i.test(entity.tagName)) {\n      throw new Error(`Delimiterless ids require an alphabetic tag, got '${entity.tagName}' for ${entity.name}`);\n    } else if (\n      tagDelimiter === \"\" &&\n      entity.primaryKey.columnType !== \"int\" &&\n      entity.primaryKey.columnType !== \"bigint\"\n    ) {\n      throw new Error(\n        `Delimiterless ids require an int or bigint primary key, got '${entity.primaryKey.columnType}' for ${entity.name}`,\n      );\n    }\n  }\n}\n\nif (typeof module !== \"undefined\" && require.main === module) {\n  joistCodegen()\n    .then(() => maybeSetExitCode())\n    .catch((err) => {\n      console.error(err);\n      process.exit(1);\n    });\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/index.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport process from \"node:process\";\n\nimport { type ConnectionConfig, newPgConnectionConfig } from \"joist-utils\";\nimport { Client } from \"pg\";\nimport pgStructureModule from \"pg-structure\";\nimport { saveFiles } from \"ts-poet\";\n\nimport { assignTags } from \"./assignTags.ts\";\nimport { maybeRunTransforms } from \"./codemods/index.ts\";\nimport { type Config, loadConfig, stripStiPlaceholders, warnInvalidConfigEntries, writeConfig } from \"./config.ts\";\nimport {\n  type DbMetadata,\n  EntityDbMetadata,\n  failIfOverlappingFieldNames,\n  resolveNameConflicts,\n} from \"./EntityDbMetadata.ts\";\nimport { maybeSetForeignKeyOrdering } from \"./foreignKeyOrdering.ts\";\nimport { generateFiles } from \"./generate.ts\";\nimport { createFlushFunction } from \"./generateFlushFunction.ts\";\nimport { applyInheritanceUpdates } from \"./inheritance.ts\";\nimport { installSkills } from \"./installSkills.ts\";\nimport { loadEnumMetadata, loadPgEnumMetadata } from \"./loadMetadata.ts\";\nimport { LOG_LEVELS, loggerMaxWarningLevelHit } from \"./logger.ts\";\nimport { scanEntityFiles } from \"./scanEntityFiles.ts\";\nimport {\n  isEntityTable,\n  isEnumTable,\n  isJoinTable,\n  mapSimpleDbTypeToTypescriptType,\n  shouldIncludeSchema,\n} from \"./utils.ts\";\n\nconst { default: pgStructure } = pgStructureModule;\n\nexport {\n  type DbMetadata,\n  type EnumField,\n  makeEntity,\n  type ManyToManyField,\n  type ManyToOneField,\n  type OneToManyField,\n  type OneToOneField,\n  type PolymorphicField,\n  type PrimitiveField,\n  type PrimitiveTypescriptType,\n} from \"./EntityDbMetadata.ts\";\nexport type { EnumMetadata, EnumRow, EnumTableData, PgEnumData, PgEnumMetadata } from \"./loadMetadata.ts\";\nexport { dateCode, plainDateCode, plainDateTimeCode, zonedDateTimeCode } from \"./utils.ts\";\nexport { type Config, EntityDbMetadata, mapSimpleDbTypeToTypescriptType };\n\nexport async function joistCodegen() {\n  const config = await loadConfig();\n\n  maybeSetDatabaseUrl(config);\n  if (!process.env.DATABASE_URL && !process.env.DB_USER) {\n    console.log(`Database connection information not found, please set either:`);\n    console.log(`  - the DATABASE_URL env variable (i.e. using .env and dotenv), or`);\n    console.log(`  - the databaseUrl key in joist-config.json`);\n    return;\n  }\n  const pgConfig = newPgConnectionConfig();\n\n  const client = new Client(pgConfig);\n  await client.connect();\n\n  const dbMetadata = await loadSchemaMetadata(config, client);\n  const { entities, enums, totalTables } = dbMetadata;\n  console.log(\n    `Found ${totalTables} total tables, ${entities.length} entity tables, ${Object.entries(enums).length} enum tables`,\n  );\n  console.log(\"\");\n\n  // Look for STI tables to synthesize separate metas\n  applyInheritanceUpdates(config, dbMetadata);\n\n  // Now that all entities (incl. STI subtypes) are known, fix up any colliding codegen'd type names\n  resolveNameConflicts(config, dbMetadata);\n\n  // Assign any new tags and write them back to the config file\n  assignTags(config, dbMetadata);\n  validateTagDelimiter(config, entities);\n\n  // Scan `*.ts` files after we've expanded `Task` -> `TaskOld.ts`\n  await scanEntityFiles(config, dbMetadata);\n\n  // If we're not using deferred FKs, determine our DAG insert order\n  await maybeSetForeignKeyOrdering(config, dbMetadata.entities);\n\n  // Generate the flush function for tests\n  await maybeGenerateFlushFunctions(config, client, pgConfig, dbMetadata);\n\n  await client.end();\n\n  // Apply any codemods to the user's codebase, if we have them\n  await maybeRunTransforms(config);\n\n  // Do some warnings\n  for (const entity of entities) failIfOverlappingFieldNames(entity);\n  warnInvalidConfigEntries(config, dbMetadata);\n\n  // Finally actually generate the files (even if we found a fatal error)\n  await generateAndSaveFiles(config, dbMetadata);\n\n  // Install our bundled Agent Skills so coding agents can find them, unless explicitly disabled\n  if (config.skills !== false) await installSkills();\n\n  stripStiPlaceholders(config, entities);\n  await writeConfig(config);\n}\n\n/** Uses entities and enums from the `db` schema and saves them into our entities directory. */\nexport async function generateAndSaveFiles(config: Config, dbMeta: DbMetadata): Promise<void> {\n  const files = await generateFiles(config, dbMeta);\n  const esmExt = config.esm ? (config.allowImportingTsExtensions ? \"ts\" : \"js\") : \"\";\n  await saveFiles({\n    toolName: \"joist-codegen\",\n    directory: config.entitiesDirectory,\n    files,\n    toStringOpts: { importExtensions: esmExt || false },\n  });\n}\n\nasync function maybeGenerateFlushFunctions(config: Config, client: Client, pgConfig: ConnectionConfig, db: DbMetadata) {\n  // In graphql-service we have our own custom flush function, so allow skipping this\n  if (config.createFlushFunction !== false) {\n    // Look for multiple test databases\n    if (Array.isArray(config.createFlushFunction)) {\n      console.log(\"Creating flush_database functions\");\n      await Promise.all(\n        config.createFlushFunction.map(async (dbName) => {\n          const client = new Client({ ...pgConfig, database: dbName });\n          await client.connect();\n          await createFlushFunction(client, db);\n          await client.end();\n        }),\n      );\n    } else {\n      console.log(\"Creating flush_database function\");\n      await createFlushFunction(client, db);\n    }\n  }\n}\n\nasync function loadSchemaMetadata(config: Config, client: Client): Promise<DbMetadata> {\n  // Here we load all schemas, to avoid pg-structure failing on cross-schema foreign keys\n  // like our cyanaudit triggers (https://github.com/ozum/pg-structure/issues/85), and then\n  // later filter them non-public schema tables out.\n  const db = await pgStructure(client);\n  const enums = await loadEnumMetadata(db, client, config);\n  const pgEnums = await loadPgEnumMetadata(db, client, config);\n  const entities = db.tables\n    .filter((t) => isEntityTable(config, t))\n    .sortBy(\"name\")\n    .map((table) => new EntityDbMetadata(config, table, enums));\n  const totalTables = db.tables.length;\n  const joinTables = db.tables.filter((t) => isJoinTable(config, t)).map((t) => t.name);\n  const otherTables = db.tables\n    .filter(\n      (t) =>\n        shouldIncludeSchema(config, t) &&\n        !isEntityTable(config, t) &&\n        !isEnumTable(config, t) &&\n        !isJoinTable(config, t),\n    )\n    .map((t) => t.name);\n  const entitiesByName = Object.fromEntries(entities.map((e) => [e.name, e]));\n  return { entities, entitiesByName, enums, pgEnums, totalTables, joinTables, otherTables };\n}\n\nfunction maybeSetDatabaseUrl(config: Config): void {\n  if (!process.env.DATABASE_URL && config.databaseUrl) {\n    process.env.DATABASE_URL = config.databaseUrl;\n  }\n}\n\nexport function maybeSetExitCode(): void {\n  if (\n    !process.argv.includes(\"--always-exit-code-zero\") &&\n    // strict mode + warnings or greater\n    ((process.argv.includes(\"--strict\") && loggerMaxWarningLevelHit >= LOG_LEVELS.warn) ||\n      // otherwise errors or greater\n      loggerMaxWarningLevelHit >= LOG_LEVELS.error)\n  ) {\n    process.exitCode = 1;\n  }\n}\n\n/** Validates that tags can be parsed unambiguously with the configured delimiter. */\nfunction validateTagDelimiter(config: Config, entities: EntityDbMetadata[]): void {\n  const tagDelimiter = config.tagDelimiter ?? \":\";\n  for (const entity of entities) {\n    if (tagDelimiter !== \"\" && `${entity.tagName}${tagDelimiter}`.indexOf(tagDelimiter) !== entity.tagName.length) {\n      throw new Error(\n        `Tagged id delimiter '${tagDelimiter}' cannot occur in or overlap tag '${entity.tagName}' for ${entity.name}`,\n      );\n    } else if (tagDelimiter === \"\" && !/^[a-z]+$/i.test(entity.tagName)) {\n      throw new Error(`Delimiterless ids require an alphabetic tag, got '${entity.tagName}' for ${entity.name}`);\n    } else if (\n      tagDelimiter === \"\" &&\n      entity.primaryKey.columnType !== \"int\" &&\n      entity.primaryKey.columnType !== \"bigint\"\n    ) {\n      throw new Error(\n        `Delimiterless ids require an int or bigint primary key, got '${entity.primaryKey.columnType}' for ${entity.name}`,\n      );\n    }\n  }\n}\n\nif (typeof module !== \"undefined\" && require.main === module) {\n  joistCodegen()\n    .then(() => maybeSetExitCode())\n    .catch((err) => {\n      console.error(err);\n      process.exit(1);\n    });\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAkCA,MAAM,EAAE,SAAS,gBAAgB;AAkBjC,eAAsB,eAAe;CACnC,MAAM,SAAS,MAAM,WAAW;CAEhC,oBAAoB,MAAM;CAC1B,IAAI,CAAC,QAAQ,IAAI,gBAAgB,CAAC,QAAQ,IAAI,SAAS;EACrD,QAAQ,IAAI,+DAA+D;EAC3E,QAAQ,IAAI,oEAAoE;EAChF,QAAQ,IAAI,8CAA8C;EAC1D;CACF;CACA,MAAM,WAAW,sBAAsB;CAEvC,MAAM,SAAS,IAAI,OAAO,QAAQ;CAClC,MAAM,OAAO,QAAQ;CAErB,MAAM,aAAa,MAAM,mBAAmB,QAAQ,MAAM;CAC1D,MAAM,EAAE,UAAU,OAAO,gBAAgB;CACzC,QAAQ,IACN,SAAS,YAAY,iBAAiB,SAAS,OAAO,kBAAkB,OAAO,QAAQ,KAAK,CAAC,CAAC,OAAO,aACvG;CACA,QAAQ,IAAI,EAAE;CAGd,wBAAwB,QAAQ,UAAU;CAG1C,qBAAqB,QAAQ,UAAU;CAGvC,WAAW,QAAQ,UAAU;CAC7B,qBAAqB,QAAQ,QAAQ;CAGrC,MAAM,gBAAgB,QAAQ,UAAU;CAGxC,MAAM,2BAA2B,QAAQ,WAAW,QAAQ;CAG5D,MAAM,4BAA4B,QAAQ,QAAQ,UAAU,UAAU;CAEtE,MAAM,OAAO,IAAI;CAGjB,MAAM,mBAAmB,MAAM;CAG/B,KAAK,MAAM,UAAU,UAAU,4BAA4B,MAAM;CACjE,yBAAyB,QAAQ,UAAU;CAG3C,MAAM,qBAAqB,QAAQ,UAAU;CAG7C,IAAI,OAAO,WAAW,OAAO,MAAM,cAAc;CAEjD,qBAAqB,QAAQ,QAAQ;CACrC,MAAM,YAAY,MAAM;AAC1B;;AAGA,eAAsB,qBAAqB,QAAgB,QAAmC;CAC5F,MAAM,QAAQ,MAAM,cAAc,QAAQ,MAAM;CAChD,MAAM,SAAS,OAAO,MAAO,OAAO,6BAA6B,OAAO,OAAQ;CAChF,MAAM,UAAU;EACd,UAAU;EACV,WAAW,OAAO;EAClB;EACA,cAAc,EAAE,kBAAkB,UAAU,MAAM;CACpD,CAAC;AACH;AAEA,eAAe,4BAA4B,QAAgB,QAAgB,UAA4B,IAAgB;CAErH,IAAI,OAAO,wBAAwB,OAAO;EAExC,IAAI,MAAM,QAAQ,OAAO,mBAAmB,GAAG;GAC7C,QAAQ,IAAI,mCAAmC;GAC/C,MAAM,QAAQ,IACZ,OAAO,oBAAoB,IAAI,OAAO,WAAW;IAC/C,MAAM,SAAS,IAAI,OAAO;KAAE,GAAG;KAAU,UAAU;IAAO,CAAC;IAC3D,MAAM,OAAO,QAAQ;IACrB,MAAM,oBAAoB,QAAQ,EAAE;IACpC,MAAM,OAAO,IAAI;GACnB,CAAC,CACH;EACF,OAAO;GACL,QAAQ,IAAI,kCAAkC;GAC9C,MAAM,oBAAoB,QAAQ,EAAE;EACtC;CACF;AACF;AAEA,eAAe,mBAAmB,QAAgB,QAAqC;CAIrF,MAAM,KAAK,MAAM,YAAY,MAAM;CACnC,MAAM,QAAQ,MAAM,iBAAiB,IAAI,QAAQ,MAAM;CACvD,MAAM,UAAU,MAAM,mBAAmB,IAAI,QAAQ,MAAM;CAC3D,MAAM,WAAW,GAAG,OACjB,QAAQ,MAAM,cAAc,QAAQ,CAAC,CAAC,CAAC,CACvC,OAAO,MAAM,CAAC,CACd,KAAK,UAAU,IAAI,iBAAiB,QAAQ,OAAO,KAAK,CAAC;CAC5D,MAAM,cAAc,GAAG,OAAO;CAC9B,MAAM,aAAa,GAAG,OAAO,QAAQ,MAAM,YAAY,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,IAAI;CACpF,MAAM,cAAc,GAAG,OACpB,QACE,MACC,oBAAoB,QAAQ,CAAC,KAC7B,CAAC,cAAc,QAAQ,CAAC,KACxB,CAAC,YAAY,QAAQ,CAAC,KACtB,CAAC,YAAY,QAAQ,CAAC,CAC1B,CAAC,CACA,KAAK,MAAM,EAAE,IAAI;CAEpB,OAAO;EAAE;EAAU,gBADI,OAAO,YAAY,SAAS,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CACzC;EAAG;EAAO;EAAS;EAAa;EAAY;CAAY;AAC1F;AAEA,SAAS,oBAAoB,QAAsB;CACjD,IAAI,CAAC,QAAQ,IAAI,gBAAgB,OAAO,aACtC,QAAQ,IAAI,eAAe,OAAO;AAEtC;AAEA,SAAgB,mBAAyB;CACvC,IACE,CAAC,QAAQ,KAAK,SAAS,yBAAyB,MAE9C,QAAQ,KAAK,SAAS,UAAU,KAAK,4BAA4B,WAAW,QAE5E,4BAA4B,WAAW,QAEzC,QAAQ,WAAW;AAEvB;;AAGA,SAAS,qBAAqB,QAAgB,UAAoC;CAChF,MAAM,eAAe,OAAO,gBAAgB;CAC5C,KAAK,MAAM,UAAU,UACnB,IAAI,iBAAiB,MAAM,GAAG,OAAO,UAAU,eAAe,QAAQ,YAAY,MAAM,OAAO,QAAQ,QACrG,MAAM,IAAI,MACR,wBAAwB,aAAa,oCAAoC,OAAO,QAAQ,QAAQ,OAAO,MACzG;MACK,IAAI,iBAAiB,MAAM,CAAC,YAAY,KAAK,OAAO,OAAO,GAChE,MAAM,IAAI,MAAM,qDAAqD,OAAO,QAAQ,QAAQ,OAAO,MAAM;MACpG,IACL,iBAAiB,MACjB,OAAO,WAAW,eAAe,SACjC,OAAO,WAAW,eAAe,UAEjC,MAAM,IAAI,MACR,gEAAgE,OAAO,WAAW,WAAW,QAAQ,OAAO,MAC9G;AAGN;AAEA,IAAI,OAAO,WAAW,eAAA,UAAuB,SAAS,QACpD,aAAa,CAAC,CACX,WAAW,iBAAiB,CAAC,CAAC,CAC9B,OAAO,QAAQ;CACd,QAAQ,MAAM,GAAG;CACjB,QAAQ,KAAK,CAAC;AAChB,CAAC"}

package/build/utils.cjs

@@ -145,6 +145,7 @@ function uncapitalize(s) {
 function isIgnored(config, t) {
 	return (config.ignoredTables || ["migrations", "pgmigrations"]).includes(t.name) || !shouldIncludeSchema(config, t);
 }
+/** Uses the same schema selection for metadata and test database cleanup. */
 function shouldIncludeSchema(config, t) {
 	return config.schemas ? config.schemas.includes(t.schema.name) : t.schema.name === "public";
 }
@@ -164,6 +165,7 @@ exports.plainDateCode = plainDateCode;
 exports.plainDateTimeCode = plainDateTimeCode;
 exports.plainTimeCode = plainTimeCode;
 exports.q = q;
+exports.shouldIncludeSchema = shouldIncludeSchema;
 exports.sortKeys = sortKeys;
 exports.tableToEntityName = tableToEntityName;
 exports.trueIfResolved = trueIfResolved;

package/build/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","names":["getTimestampConfig","pascalCase","imp","isPlainObject"],"sources":["../src/utils.ts"],"sourcesContent":["import { pascalCase } from \"change-case\";\nimport { isPlainObject } from \"joist-utils\";\nimport { type Table } from \"pg-structure\";\nimport pluralize from \"pluralize\";\nimport { code, imp } from \"ts-poet\";\n\nimport { type Config, getTimestampConfig } from \"./config.ts\";\nimport { type DatabaseColumnType, type PrimitiveTypescriptType } from \"./EntityDbMetadata.ts\";\n\nexport function assertNever(x: never): never {\n  throw new Error(\"Unexpected object: \" + x);\n}\n\nexport function isEntityTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t) || isJoinTable(config, t)) {\n    return false;\n  }\n\n  // Depending on the config settings, we may/may not require the presence of timestamp\n  // fields to determine whether a table is an entity.\n  const columnNames = t.columns.map((c) => c.name);\n  const { updatedAtConf, createdAtConf } = getTimestampConfig(config);\n  const hasCreatedAt = createdAtConf.names.some((c) => columnNames.includes(c));\n  const hasUpdatedAt = updatedAtConf.names.some((c) => columnNames.includes(c));\n\n  // Entities always require an id column\n  const hasIdColumn = columnNames.includes(\"id\");\n  if (!hasIdColumn) return false;\n\n  // If we have no timestamp columns, but do have `name` and `code`, we're probably an enum.\n  if (hasIdColumn && !hasCreatedAt && !hasUpdatedAt) {\n    if ([\"name\", \"code\"].every((c) => columnNames.includes(c))) {\n      return false;\n    }\n  }\n\n  // If the ID column is a FK then we're a subclass\n  if (isSubClassTable(t)) return true;\n\n  // Otherwise respect the created_at/updated_at required rules\n  return hasIdColumn && (hasCreatedAt || !createdAtConf.required) && (hasUpdatedAt || !updatedAtConf.required);\n}\n\nexport function isSubClassTable(t: Table): boolean {\n  // Note that `.get(\"id\")` will blow up if there is no id column\n  return t.columns.get(\"id\").foreignKeys.length === 1;\n}\n\nexport function isEnumTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  const columnNames = t.columns.map((c) => c.name);\n  return [\"id\", \"code\", \"name\"].every((c) => columnNames.includes(c)) && !isEntityTable(config, t);\n}\n\n// Oddly enough isJoinTable showed up as a hot spot, so cache its calculation.\nconst joinTables: Map<string, boolean> = new Map();\n\nexport function isJoinTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  return getOrElse(joinTables, t.name, () => {\n    const { columns } = t;\n    const fks = columns.filter((c) => c.isForeignKey);\n    const pks = columns.filter((c) => c.isPrimaryKey);\n    // Every join table is two FKs, plus either a surrogate `id` PK (\"id-ful\") or no surrogate\n    // at all, in which case the two FKs are themselves the composite PK (\"id-less\").\n    if (fks.length !== 2) return false;\n    if (!joinTableHasId(t) && !(pks.length === 2 && pks.every((c) => c.isForeignKey))) return false;\n    // Any column beyond the two FKs and the optional `id` PK must be a single created_at.\n    const others = columns.length - fks.length - (joinTableHasId(t) ? 1 : 0);\n    const createdAts = columns.filter((c) => c.name === \"created_at\" || c.name === \"createdAt\").length;\n    return others === 0 || (others === 1 && createdAts === 1);\n  });\n}\n\n/** Whether a join table has a surrogate `id` primary key (vs. an id-less FK-pair composite PK). */\nexport function joinTableHasId(t: Table): boolean {\n  const pks = t.columns.filter((c) => c.isPrimaryKey);\n  return pks.length === 1 && !pks[0].isForeignKey;\n}\n\nfunction getOrElse<K, V>(map: Map<K, V>, key: K, fn: () => V): V {\n  let value = map.get(key);\n  if (value === undefined) {\n    value = fn();\n    map.set(key, value);\n  }\n  return value;\n}\n\n/** Converts `projects` to `Project`. */\nexport function tableToEntityName(config: Config, table: Table): string {\n  let entityName = config.__tableToEntityName?.[table.name];\n  if (!entityName) {\n    const configEntityName = Object.entries(config.entities)\n      .filter(([, conf]) => conf.tableName === table.name)\n      .map(([entityName]) => entityName)[0];\n    entityName = configEntityName || pascalCase(pluralize.singular(table.name));\n    (config.__tableToEntityName ??= {})[table.name] = entityName;\n  }\n  return entityName;\n}\n\nexport const dateCode = code`Date`;\nexport const plainDateCode = code`${imp(\"Temporal@joist-orm\")}.PlainDate`;\nexport const plainTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainTime`;\nexport const plainDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainDateTime`;\nexport const zonedDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.ZonedDateTime`;\n\n/** Maps db types, i.e. `int`, to JS types, i.e. `number`. */\nexport function mapSimpleDbTypeToTypescriptType(config: Config, dbType: DatabaseColumnType): PrimitiveTypescriptType {\n  switch (dbType) {\n    case \"boolean\":\n      return \"boolean\";\n    case \"int\":\n    case \"numeric\":\n    case \"smallint\":\n    case \"integer\":\n    case \"decimal\":\n    case \"real\":\n    case \"smallserial\":\n    case \"serial\":\n    case \"double precision\":\n      return \"number\";\n    case \"bigserial\":\n    case \"bigint\":\n      return \"bigint\";\n    case \"text\":\n    case \"citext\":\n    case \"character varying\":\n    case \"varchar\":\n    case \"uuid\":\n    case \"tsvector\":\n    case \"tstzrange\":\n      return \"string\";\n    case \"time without time zone\":\n      return config.temporal\n        ? plainTimeCode\n        : fail(\"Joist doesn't support 'time without time zone' unless temporal is enabled\");\n    case \"timestamp with time zone\":\n      return config.temporal ? zonedDateTimeCode : dateCode;\n    case \"timestamp without time zone\":\n      return config.temporal ? plainDateTimeCode : dateCode;\n    case \"date\":\n      return config.temporal ? plainDateCode : dateCode;\n    case \"jsonb\":\n      return \"Object\";\n    case \"bytea\":\n      return \"Uint8Array\";\n    default:\n      assertNever(dbType);\n  }\n}\n\nexport function merge<T>(a: T[], b: T[]): T[] {\n  return [...a, ...b];\n}\n\n/** Returns true if `p` is resolved, otherwise false if it is rejected. */\nexport async function trueIfResolved(p: Promise<unknown>): Promise<boolean> {\n  return p.then(\n    () => true,\n    () => false,\n  );\n}\n\nexport function fail(message?: string): never {\n  throw new Error(message || \"Failed\");\n}\n\nexport function sortKeys<T extends object>(o: T): T {\n  return Object.keys(o)\n    .sort()\n    .reduce(\n      (acc, key) => {\n        const value = o[key as keyof T];\n        const newValue = typeof value === \"object\" && isPlainObject(value) ? sortKeys(value as any as object) : value;\n        acc[key as keyof T] = newValue as any;\n        return acc;\n      },\n      {} as any as T,\n    );\n}\n\nexport function parseOrder(order: string | undefined): { field: string; direction: \"ASC\" | \"DESC\" } | undefined {\n  if (!order) {\n    return undefined;\n  }\n  const [field, direction = \"ASC\"] = order.split(\" \");\n  if (direction !== \"ASC\" && direction !== \"DESC\") {\n    throw new Error(`Invalid direction: ${direction} (must be \"ASC\" or \"DESC\")`);\n  }\n  return { field, direction };\n}\n\nexport function q(s: string | undefined): string {\n  return s === undefined ? \"undefined\" : `\"${s}\"`;\n}\n\nexport function uncapitalize(s: string): string {\n  return s.charAt(0).toLowerCase() + s.slice(1);\n}\n\nfunction isIgnored(config: Config, t: Table): boolean {\n  return (config.ignoredTables || [\"migrations\", \"pgmigrations\"]).includes(t.name) || !shouldIncludeSchema(config, t);\n}\n\nfunction shouldIncludeSchema(config: Config, t: Table): boolean {\n  return config.schemas ? config.schemas.includes(t.schema.name) : t.schema.name === \"public\";\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.cjs","names":["getTimestampConfig","pascalCase","imp","isPlainObject"],"sources":["../src/utils.ts"],"sourcesContent":["import { pascalCase } from \"change-case\";\nimport { isPlainObject } from \"joist-utils\";\nimport { type Table } from \"pg-structure\";\nimport pluralize from \"pluralize\";\nimport { code, imp } from \"ts-poet\";\n\nimport { type Config, getTimestampConfig } from \"./config.ts\";\nimport { type DatabaseColumnType, type PrimitiveTypescriptType } from \"./EntityDbMetadata.ts\";\n\nexport function assertNever(x: never): never {\n  throw new Error(\"Unexpected object: \" + x);\n}\n\nexport function isEntityTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t) || isJoinTable(config, t)) {\n    return false;\n  }\n\n  // Depending on the config settings, we may/may not require the presence of timestamp\n  // fields to determine whether a table is an entity.\n  const columnNames = t.columns.map((c) => c.name);\n  const { updatedAtConf, createdAtConf } = getTimestampConfig(config);\n  const hasCreatedAt = createdAtConf.names.some((c) => columnNames.includes(c));\n  const hasUpdatedAt = updatedAtConf.names.some((c) => columnNames.includes(c));\n\n  // Entities always require an id column\n  const hasIdColumn = columnNames.includes(\"id\");\n  if (!hasIdColumn) return false;\n\n  // If we have no timestamp columns, but do have `name` and `code`, we're probably an enum.\n  if (hasIdColumn && !hasCreatedAt && !hasUpdatedAt) {\n    if ([\"name\", \"code\"].every((c) => columnNames.includes(c))) {\n      return false;\n    }\n  }\n\n  // If the ID column is a FK then we're a subclass\n  if (isSubClassTable(t)) return true;\n\n  // Otherwise respect the created_at/updated_at required rules\n  return hasIdColumn && (hasCreatedAt || !createdAtConf.required) && (hasUpdatedAt || !updatedAtConf.required);\n}\n\nexport function isSubClassTable(t: Table): boolean {\n  // Note that `.get(\"id\")` will blow up if there is no id column\n  return t.columns.get(\"id\").foreignKeys.length === 1;\n}\n\nexport function isEnumTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  const columnNames = t.columns.map((c) => c.name);\n  return [\"id\", \"code\", \"name\"].every((c) => columnNames.includes(c)) && !isEntityTable(config, t);\n}\n\n// Oddly enough isJoinTable showed up as a hot spot, so cache its calculation.\nconst joinTables: Map<string, boolean> = new Map();\n\nexport function isJoinTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  return getOrElse(joinTables, t.name, () => {\n    const { columns } = t;\n    const fks = columns.filter((c) => c.isForeignKey);\n    const pks = columns.filter((c) => c.isPrimaryKey);\n    // Every join table is two FKs, plus either a surrogate `id` PK (\"id-ful\") or no surrogate\n    // at all, in which case the two FKs are themselves the composite PK (\"id-less\").\n    if (fks.length !== 2) return false;\n    if (!joinTableHasId(t) && !(pks.length === 2 && pks.every((c) => c.isForeignKey))) return false;\n    // Any column beyond the two FKs and the optional `id` PK must be a single created_at.\n    const others = columns.length - fks.length - (joinTableHasId(t) ? 1 : 0);\n    const createdAts = columns.filter((c) => c.name === \"created_at\" || c.name === \"createdAt\").length;\n    return others === 0 || (others === 1 && createdAts === 1);\n  });\n}\n\n/** Whether a join table has a surrogate `id` primary key (vs. an id-less FK-pair composite PK). */\nexport function joinTableHasId(t: Table): boolean {\n  const pks = t.columns.filter((c) => c.isPrimaryKey);\n  return pks.length === 1 && !pks[0].isForeignKey;\n}\n\nfunction getOrElse<K, V>(map: Map<K, V>, key: K, fn: () => V): V {\n  let value = map.get(key);\n  if (value === undefined) {\n    value = fn();\n    map.set(key, value);\n  }\n  return value;\n}\n\n/** Converts `projects` to `Project`. */\nexport function tableToEntityName(config: Config, table: Table): string {\n  let entityName = config.__tableToEntityName?.[table.name];\n  if (!entityName) {\n    const configEntityName = Object.entries(config.entities)\n      .filter(([, conf]) => conf.tableName === table.name)\n      .map(([entityName]) => entityName)[0];\n    entityName = configEntityName || pascalCase(pluralize.singular(table.name));\n    (config.__tableToEntityName ??= {})[table.name] = entityName;\n  }\n  return entityName;\n}\n\nexport const dateCode = code`Date`;\nexport const plainDateCode = code`${imp(\"Temporal@joist-orm\")}.PlainDate`;\nexport const plainTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainTime`;\nexport const plainDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainDateTime`;\nexport const zonedDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.ZonedDateTime`;\n\n/** Maps db types, i.e. `int`, to JS types, i.e. `number`. */\nexport function mapSimpleDbTypeToTypescriptType(config: Config, dbType: DatabaseColumnType): PrimitiveTypescriptType {\n  switch (dbType) {\n    case \"boolean\":\n      return \"boolean\";\n    case \"int\":\n    case \"numeric\":\n    case \"smallint\":\n    case \"integer\":\n    case \"decimal\":\n    case \"real\":\n    case \"smallserial\":\n    case \"serial\":\n    case \"double precision\":\n      return \"number\";\n    case \"bigserial\":\n    case \"bigint\":\n      return \"bigint\";\n    case \"text\":\n    case \"citext\":\n    case \"character varying\":\n    case \"varchar\":\n    case \"uuid\":\n    case \"tsvector\":\n    case \"tstzrange\":\n      return \"string\";\n    case \"time without time zone\":\n      return config.temporal\n        ? plainTimeCode\n        : fail(\"Joist doesn't support 'time without time zone' unless temporal is enabled\");\n    case \"timestamp with time zone\":\n      return config.temporal ? zonedDateTimeCode : dateCode;\n    case \"timestamp without time zone\":\n      return config.temporal ? plainDateTimeCode : dateCode;\n    case \"date\":\n      return config.temporal ? plainDateCode : dateCode;\n    case \"jsonb\":\n      return \"Object\";\n    case \"bytea\":\n      return \"Uint8Array\";\n    default:\n      assertNever(dbType);\n  }\n}\n\nexport function merge<T>(a: T[], b: T[]): T[] {\n  return [...a, ...b];\n}\n\n/** Returns true if `p` is resolved, otherwise false if it is rejected. */\nexport async function trueIfResolved(p: Promise<unknown>): Promise<boolean> {\n  return p.then(\n    () => true,\n    () => false,\n  );\n}\n\nexport function fail(message?: string): never {\n  throw new Error(message || \"Failed\");\n}\n\nexport function sortKeys<T extends object>(o: T): T {\n  return Object.keys(o)\n    .sort()\n    .reduce(\n      (acc, key) => {\n        const value = o[key as keyof T];\n        const newValue = typeof value === \"object\" && isPlainObject(value) ? sortKeys(value as any as object) : value;\n        acc[key as keyof T] = newValue as any;\n        return acc;\n      },\n      {} as any as T,\n    );\n}\n\nexport function parseOrder(order: string | undefined): { field: string; direction: \"ASC\" | \"DESC\" } | undefined {\n  if (!order) {\n    return undefined;\n  }\n  const [field, direction = \"ASC\"] = order.split(\" \");\n  if (direction !== \"ASC\" && direction !== \"DESC\") {\n    throw new Error(`Invalid direction: ${direction} (must be \"ASC\" or \"DESC\")`);\n  }\n  return { field, direction };\n}\n\nexport function q(s: string | undefined): string {\n  return s === undefined ? \"undefined\" : `\"${s}\"`;\n}\n\nexport function uncapitalize(s: string): string {\n  return s.charAt(0).toLowerCase() + s.slice(1);\n}\n\nfunction isIgnored(config: Config, t: Table): boolean {\n  return (config.ignoredTables || [\"migrations\", \"pgmigrations\"]).includes(t.name) || !shouldIncludeSchema(config, t);\n}\n\n/** Uses the same schema selection for metadata and test database cleanup. */\nexport function shouldIncludeSchema(config: Config, t: Table): boolean {\n  return config.schemas ? config.schemas.includes(t.schema.name) : t.schema.name === \"public\";\n}\n"],"mappings":"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"}

package/build/utils.d.cts

@@ -29,6 +29,8 @@ declare function parseOrder(order: string | undefined): {
 } | undefined;
 declare function q(s: string | undefined): string;
 declare function uncapitalize(s: string): string;
+/** Uses the same schema selection for metadata and test database cleanup. */
+declare function shouldIncludeSchema(config: Config, t: Table): boolean;
 //#endregion
-export { assertNever, dateCode, fail, isEntityTable, isEnumTable, isJoinTable, isSubClassTable, joinTableHasId, mapSimpleDbTypeToTypescriptType, merge, parseOrder, plainDateCode, plainDateTimeCode, plainTimeCode, q, sortKeys, tableToEntityName, trueIfResolved, uncapitalize, zonedDateTimeCode };
+export { assertNever, dateCode, fail, isEntityTable, isEnumTable, isJoinTable, isSubClassTable, joinTableHasId, mapSimpleDbTypeToTypescriptType, merge, parseOrder, plainDateCode, plainDateTimeCode, plainTimeCode, q, shouldIncludeSchema, sortKeys, tableToEntityName, trueIfResolved, uncapitalize, zonedDateTimeCode };
 //# sourceMappingURL=utils.d.cts.map

package/build/utils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.cts","names":[],"sources":["../src/utils.ts"],"mappings":";;;;iBASgB,YAAY;iBAIZ,cAAc,QAAQ,QAAQ,GAAG;iBA8BjC,gBAAgB,GAAG;iBAKnB,YAAY,QAAQ,QAAQ,GAAG;iBAW/B,YAAY,QAAQ,QAAQ,GAAG;;iBAoB/B,eAAe,GAAG;;iBAelB,kBAAkB,QAAQ,QAAQ,OAAO;cAY5C,4BAAQ;cACR,iCAAa;cACb,iCAAa;cACb,qCAAiB;cACjB,qCAAiB;;iBAGd,gCAAgC,QAAQ,QAAQ,QAAQ,qBAAqB;iBA4C7E,MAAM,GAAG,GAAG,KAAK,GAAG,MAAM;;iBAKpB,eAAe,GAAG,mBAAmB;iBAO3C,KAAK;iBAIL,SAAS,kBAAkB,GAAG,IAAI;iBAclC,WAAW;EAA8B;EAAe;;iBAWxD,EAAE;iBAIF,aAAa"}
+{"version":3,"file":"utils.d.cts","names":[],"sources":["../src/utils.ts"],"mappings":";;;;iBASgB,YAAY;iBAIZ,cAAc,QAAQ,QAAQ,GAAG;iBA8BjC,gBAAgB,GAAG;iBAKnB,YAAY,QAAQ,QAAQ,GAAG;iBAW/B,YAAY,QAAQ,QAAQ,GAAG;;iBAoB/B,eAAe,GAAG;;iBAelB,kBAAkB,QAAQ,QAAQ,OAAO;cAY5C,4BAAQ;cACR,iCAAa;cACb,iCAAa;cACb,qCAAiB;cACjB,qCAAiB;;iBAGd,gCAAgC,QAAQ,QAAQ,QAAQ,qBAAqB;iBA4C7E,MAAM,GAAG,GAAG,KAAK,GAAG,MAAM;;iBAKpB,eAAe,GAAG,mBAAmB;iBAO3C,KAAK;iBAIL,SAAS,kBAAkB,GAAG,IAAI;iBAclC,WAAW;EAA8B;EAAe;;iBAWxD,EAAE;iBAIF,aAAa;;iBASb,oBAAoB,QAAQ,QAAQ,GAAG"}

package/build/utils.d.mts

@@ -29,6 +29,8 @@ declare function parseOrder(order: string | undefined): {
 } | undefined;
 declare function q(s: string | undefined): string;
 declare function uncapitalize(s: string): string;
+/** Uses the same schema selection for metadata and test database cleanup. */
+declare function shouldIncludeSchema(config: Config, t: Table): boolean;
 //#endregion
-export { assertNever, dateCode, fail, isEntityTable, isEnumTable, isJoinTable, isSubClassTable, joinTableHasId, mapSimpleDbTypeToTypescriptType, merge, parseOrder, plainDateCode, plainDateTimeCode, plainTimeCode, q, sortKeys, tableToEntityName, trueIfResolved, uncapitalize, zonedDateTimeCode };
+export { assertNever, dateCode, fail, isEntityTable, isEnumTable, isJoinTable, isSubClassTable, joinTableHasId, mapSimpleDbTypeToTypescriptType, merge, parseOrder, plainDateCode, plainDateTimeCode, plainTimeCode, q, shouldIncludeSchema, sortKeys, tableToEntityName, trueIfResolved, uncapitalize, zonedDateTimeCode };
 //# sourceMappingURL=utils.d.mts.map

package/build/utils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.mts","names":[],"sources":["../src/utils.ts"],"mappings":";;;;iBASgB,YAAY;iBAIZ,cAAc,QAAQ,QAAQ,GAAG;iBA8BjC,gBAAgB,GAAG;iBAKnB,YAAY,QAAQ,QAAQ,GAAG;iBAW/B,YAAY,QAAQ,QAAQ,GAAG;;iBAoB/B,eAAe,GAAG;;iBAelB,kBAAkB,QAAQ,QAAQ,OAAO;cAY5C,4BAAQ;cACR,iCAAa;cACb,iCAAa;cACb,qCAAiB;cACjB,qCAAiB;;iBAGd,gCAAgC,QAAQ,QAAQ,QAAQ,qBAAqB;iBA4C7E,MAAM,GAAG,GAAG,KAAK,GAAG,MAAM;;iBAKpB,eAAe,GAAG,mBAAmB;iBAO3C,KAAK;iBAIL,SAAS,kBAAkB,GAAG,IAAI;iBAclC,WAAW;EAA8B;EAAe;;iBAWxD,EAAE;iBAIF,aAAa"}
+{"version":3,"file":"utils.d.mts","names":[],"sources":["../src/utils.ts"],"mappings":";;;;iBASgB,YAAY;iBAIZ,cAAc,QAAQ,QAAQ,GAAG;iBA8BjC,gBAAgB,GAAG;iBAKnB,YAAY,QAAQ,QAAQ,GAAG;iBAW/B,YAAY,QAAQ,QAAQ,GAAG;;iBAoB/B,eAAe,GAAG;;iBAelB,kBAAkB,QAAQ,QAAQ,OAAO;cAY5C,4BAAQ;cACR,iCAAa;cACb,iCAAa;cACb,qCAAiB;cACjB,qCAAiB;;iBAGd,gCAAgC,QAAQ,QAAQ,QAAQ,qBAAqB;iBA4C7E,MAAM,GAAG,GAAG,KAAK,GAAG,MAAM;;iBAKpB,eAAe,GAAG,mBAAmB;iBAO3C,KAAK;iBAIL,SAAS,kBAAkB,GAAG,IAAI;iBAclC,WAAW;EAA8B;EAAe;;iBAWxD,EAAE;iBAIF,aAAa;;iBASb,oBAAoB,QAAQ,QAAQ,GAAG"}

package/build/utils.js

@@ -142,10 +142,11 @@ function uncapitalize(s) {
 function isIgnored(config, t) {
 	return (config.ignoredTables || ["migrations", "pgmigrations"]).includes(t.name) || !shouldIncludeSchema(config, t);
 }
+/** Uses the same schema selection for metadata and test database cleanup. */
 function shouldIncludeSchema(config, t) {
 	return config.schemas ? config.schemas.includes(t.schema.name) : t.schema.name === "public";
 }
 //#endregion
-export { assertNever, dateCode, fail, isEntityTable, isEnumTable, isJoinTable, isSubClassTable, joinTableHasId, mapSimpleDbTypeToTypescriptType, merge, parseOrder, plainDateCode, plainDateTimeCode, plainTimeCode, q, sortKeys, tableToEntityName, trueIfResolved, uncapitalize, zonedDateTimeCode };
+export { assertNever, dateCode, fail, isEntityTable, isEnumTable, isJoinTable, isSubClassTable, joinTableHasId, mapSimpleDbTypeToTypescriptType, merge, parseOrder, plainDateCode, plainDateTimeCode, plainTimeCode, q, shouldIncludeSchema, sortKeys, tableToEntityName, trueIfResolved, uncapitalize, zonedDateTimeCode };
 
 //# sourceMappingURL=utils.js.map

package/build/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","names":[],"sources":["../src/utils.ts"],"sourcesContent":["import { pascalCase } from \"change-case\";\nimport { isPlainObject } from \"joist-utils\";\nimport { type Table } from \"pg-structure\";\nimport pluralize from \"pluralize\";\nimport { code, imp } from \"ts-poet\";\n\nimport { type Config, getTimestampConfig } from \"./config.ts\";\nimport { type DatabaseColumnType, type PrimitiveTypescriptType } from \"./EntityDbMetadata.ts\";\n\nexport function assertNever(x: never): never {\n  throw new Error(\"Unexpected object: \" + x);\n}\n\nexport function isEntityTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t) || isJoinTable(config, t)) {\n    return false;\n  }\n\n  // Depending on the config settings, we may/may not require the presence of timestamp\n  // fields to determine whether a table is an entity.\n  const columnNames = t.columns.map((c) => c.name);\n  const { updatedAtConf, createdAtConf } = getTimestampConfig(config);\n  const hasCreatedAt = createdAtConf.names.some((c) => columnNames.includes(c));\n  const hasUpdatedAt = updatedAtConf.names.some((c) => columnNames.includes(c));\n\n  // Entities always require an id column\n  const hasIdColumn = columnNames.includes(\"id\");\n  if (!hasIdColumn) return false;\n\n  // If we have no timestamp columns, but do have `name` and `code`, we're probably an enum.\n  if (hasIdColumn && !hasCreatedAt && !hasUpdatedAt) {\n    if ([\"name\", \"code\"].every((c) => columnNames.includes(c))) {\n      return false;\n    }\n  }\n\n  // If the ID column is a FK then we're a subclass\n  if (isSubClassTable(t)) return true;\n\n  // Otherwise respect the created_at/updated_at required rules\n  return hasIdColumn && (hasCreatedAt || !createdAtConf.required) && (hasUpdatedAt || !updatedAtConf.required);\n}\n\nexport function isSubClassTable(t: Table): boolean {\n  // Note that `.get(\"id\")` will blow up if there is no id column\n  return t.columns.get(\"id\").foreignKeys.length === 1;\n}\n\nexport function isEnumTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  const columnNames = t.columns.map((c) => c.name);\n  return [\"id\", \"code\", \"name\"].every((c) => columnNames.includes(c)) && !isEntityTable(config, t);\n}\n\n// Oddly enough isJoinTable showed up as a hot spot, so cache its calculation.\nconst joinTables: Map<string, boolean> = new Map();\n\nexport function isJoinTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  return getOrElse(joinTables, t.name, () => {\n    const { columns } = t;\n    const fks = columns.filter((c) => c.isForeignKey);\n    const pks = columns.filter((c) => c.isPrimaryKey);\n    // Every join table is two FKs, plus either a surrogate `id` PK (\"id-ful\") or no surrogate\n    // at all, in which case the two FKs are themselves the composite PK (\"id-less\").\n    if (fks.length !== 2) return false;\n    if (!joinTableHasId(t) && !(pks.length === 2 && pks.every((c) => c.isForeignKey))) return false;\n    // Any column beyond the two FKs and the optional `id` PK must be a single created_at.\n    const others = columns.length - fks.length - (joinTableHasId(t) ? 1 : 0);\n    const createdAts = columns.filter((c) => c.name === \"created_at\" || c.name === \"createdAt\").length;\n    return others === 0 || (others === 1 && createdAts === 1);\n  });\n}\n\n/** Whether a join table has a surrogate `id` primary key (vs. an id-less FK-pair composite PK). */\nexport function joinTableHasId(t: Table): boolean {\n  const pks = t.columns.filter((c) => c.isPrimaryKey);\n  return pks.length === 1 && !pks[0].isForeignKey;\n}\n\nfunction getOrElse<K, V>(map: Map<K, V>, key: K, fn: () => V): V {\n  let value = map.get(key);\n  if (value === undefined) {\n    value = fn();\n    map.set(key, value);\n  }\n  return value;\n}\n\n/** Converts `projects` to `Project`. */\nexport function tableToEntityName(config: Config, table: Table): string {\n  let entityName = config.__tableToEntityName?.[table.name];\n  if (!entityName) {\n    const configEntityName = Object.entries(config.entities)\n      .filter(([, conf]) => conf.tableName === table.name)\n      .map(([entityName]) => entityName)[0];\n    entityName = configEntityName || pascalCase(pluralize.singular(table.name));\n    (config.__tableToEntityName ??= {})[table.name] = entityName;\n  }\n  return entityName;\n}\n\nexport const dateCode = code`Date`;\nexport const plainDateCode = code`${imp(\"Temporal@joist-orm\")}.PlainDate`;\nexport const plainTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainTime`;\nexport const plainDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainDateTime`;\nexport const zonedDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.ZonedDateTime`;\n\n/** Maps db types, i.e. `int`, to JS types, i.e. `number`. */\nexport function mapSimpleDbTypeToTypescriptType(config: Config, dbType: DatabaseColumnType): PrimitiveTypescriptType {\n  switch (dbType) {\n    case \"boolean\":\n      return \"boolean\";\n    case \"int\":\n    case \"numeric\":\n    case \"smallint\":\n    case \"integer\":\n    case \"decimal\":\n    case \"real\":\n    case \"smallserial\":\n    case \"serial\":\n    case \"double precision\":\n      return \"number\";\n    case \"bigserial\":\n    case \"bigint\":\n      return \"bigint\";\n    case \"text\":\n    case \"citext\":\n    case \"character varying\":\n    case \"varchar\":\n    case \"uuid\":\n    case \"tsvector\":\n    case \"tstzrange\":\n      return \"string\";\n    case \"time without time zone\":\n      return config.temporal\n        ? plainTimeCode\n        : fail(\"Joist doesn't support 'time without time zone' unless temporal is enabled\");\n    case \"timestamp with time zone\":\n      return config.temporal ? zonedDateTimeCode : dateCode;\n    case \"timestamp without time zone\":\n      return config.temporal ? plainDateTimeCode : dateCode;\n    case \"date\":\n      return config.temporal ? plainDateCode : dateCode;\n    case \"jsonb\":\n      return \"Object\";\n    case \"bytea\":\n      return \"Uint8Array\";\n    default:\n      assertNever(dbType);\n  }\n}\n\nexport function merge<T>(a: T[], b: T[]): T[] {\n  return [...a, ...b];\n}\n\n/** Returns true if `p` is resolved, otherwise false if it is rejected. */\nexport async function trueIfResolved(p: Promise<unknown>): Promise<boolean> {\n  return p.then(\n    () => true,\n    () => false,\n  );\n}\n\nexport function fail(message?: string): never {\n  throw new Error(message || \"Failed\");\n}\n\nexport function sortKeys<T extends object>(o: T): T {\n  return Object.keys(o)\n    .sort()\n    .reduce(\n      (acc, key) => {\n        const value = o[key as keyof T];\n        const newValue = typeof value === \"object\" && isPlainObject(value) ? sortKeys(value as any as object) : value;\n        acc[key as keyof T] = newValue as any;\n        return acc;\n      },\n      {} as any as T,\n    );\n}\n\nexport function parseOrder(order: string | undefined): { field: string; direction: \"ASC\" | \"DESC\" } | undefined {\n  if (!order) {\n    return undefined;\n  }\n  const [field, direction = \"ASC\"] = order.split(\" \");\n  if (direction !== \"ASC\" && direction !== \"DESC\") {\n    throw new Error(`Invalid direction: ${direction} (must be \"ASC\" or \"DESC\")`);\n  }\n  return { field, direction };\n}\n\nexport function q(s: string | undefined): string {\n  return s === undefined ? \"undefined\" : `\"${s}\"`;\n}\n\nexport function uncapitalize(s: string): string {\n  return s.charAt(0).toLowerCase() + s.slice(1);\n}\n\nfunction isIgnored(config: Config, t: Table): boolean {\n  return (config.ignoredTables || [\"migrations\", \"pgmigrations\"]).includes(t.name) || !shouldIncludeSchema(config, t);\n}\n\nfunction shouldIncludeSchema(config: Config, t: Table): boolean {\n  return config.schemas ? config.schemas.includes(t.schema.name) : t.schema.name === \"public\";\n}\n"],"mappings":"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"}
+{"version":3,"file":"utils.js","names":[],"sources":["../src/utils.ts"],"sourcesContent":["import { pascalCase } from \"change-case\";\nimport { isPlainObject } from \"joist-utils\";\nimport { type Table } from \"pg-structure\";\nimport pluralize from \"pluralize\";\nimport { code, imp } from \"ts-poet\";\n\nimport { type Config, getTimestampConfig } from \"./config.ts\";\nimport { type DatabaseColumnType, type PrimitiveTypescriptType } from \"./EntityDbMetadata.ts\";\n\nexport function assertNever(x: never): never {\n  throw new Error(\"Unexpected object: \" + x);\n}\n\nexport function isEntityTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t) || isJoinTable(config, t)) {\n    return false;\n  }\n\n  // Depending on the config settings, we may/may not require the presence of timestamp\n  // fields to determine whether a table is an entity.\n  const columnNames = t.columns.map((c) => c.name);\n  const { updatedAtConf, createdAtConf } = getTimestampConfig(config);\n  const hasCreatedAt = createdAtConf.names.some((c) => columnNames.includes(c));\n  const hasUpdatedAt = updatedAtConf.names.some((c) => columnNames.includes(c));\n\n  // Entities always require an id column\n  const hasIdColumn = columnNames.includes(\"id\");\n  if (!hasIdColumn) return false;\n\n  // If we have no timestamp columns, but do have `name` and `code`, we're probably an enum.\n  if (hasIdColumn && !hasCreatedAt && !hasUpdatedAt) {\n    if ([\"name\", \"code\"].every((c) => columnNames.includes(c))) {\n      return false;\n    }\n  }\n\n  // If the ID column is a FK then we're a subclass\n  if (isSubClassTable(t)) return true;\n\n  // Otherwise respect the created_at/updated_at required rules\n  return hasIdColumn && (hasCreatedAt || !createdAtConf.required) && (hasUpdatedAt || !updatedAtConf.required);\n}\n\nexport function isSubClassTable(t: Table): boolean {\n  // Note that `.get(\"id\")` will blow up if there is no id column\n  return t.columns.get(\"id\").foreignKeys.length === 1;\n}\n\nexport function isEnumTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  const columnNames = t.columns.map((c) => c.name);\n  return [\"id\", \"code\", \"name\"].every((c) => columnNames.includes(c)) && !isEntityTable(config, t);\n}\n\n// Oddly enough isJoinTable showed up as a hot spot, so cache its calculation.\nconst joinTables: Map<string, boolean> = new Map();\n\nexport function isJoinTable(config: Config, t: Table): boolean {\n  if (isIgnored(config, t)) {\n    return false;\n  }\n  return getOrElse(joinTables, t.name, () => {\n    const { columns } = t;\n    const fks = columns.filter((c) => c.isForeignKey);\n    const pks = columns.filter((c) => c.isPrimaryKey);\n    // Every join table is two FKs, plus either a surrogate `id` PK (\"id-ful\") or no surrogate\n    // at all, in which case the two FKs are themselves the composite PK (\"id-less\").\n    if (fks.length !== 2) return false;\n    if (!joinTableHasId(t) && !(pks.length === 2 && pks.every((c) => c.isForeignKey))) return false;\n    // Any column beyond the two FKs and the optional `id` PK must be a single created_at.\n    const others = columns.length - fks.length - (joinTableHasId(t) ? 1 : 0);\n    const createdAts = columns.filter((c) => c.name === \"created_at\" || c.name === \"createdAt\").length;\n    return others === 0 || (others === 1 && createdAts === 1);\n  });\n}\n\n/** Whether a join table has a surrogate `id` primary key (vs. an id-less FK-pair composite PK). */\nexport function joinTableHasId(t: Table): boolean {\n  const pks = t.columns.filter((c) => c.isPrimaryKey);\n  return pks.length === 1 && !pks[0].isForeignKey;\n}\n\nfunction getOrElse<K, V>(map: Map<K, V>, key: K, fn: () => V): V {\n  let value = map.get(key);\n  if (value === undefined) {\n    value = fn();\n    map.set(key, value);\n  }\n  return value;\n}\n\n/** Converts `projects` to `Project`. */\nexport function tableToEntityName(config: Config, table: Table): string {\n  let entityName = config.__tableToEntityName?.[table.name];\n  if (!entityName) {\n    const configEntityName = Object.entries(config.entities)\n      .filter(([, conf]) => conf.tableName === table.name)\n      .map(([entityName]) => entityName)[0];\n    entityName = configEntityName || pascalCase(pluralize.singular(table.name));\n    (config.__tableToEntityName ??= {})[table.name] = entityName;\n  }\n  return entityName;\n}\n\nexport const dateCode = code`Date`;\nexport const plainDateCode = code`${imp(\"Temporal@joist-orm\")}.PlainDate`;\nexport const plainTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainTime`;\nexport const plainDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.PlainDateTime`;\nexport const zonedDateTimeCode = code`${imp(\"Temporal@joist-orm\")}.ZonedDateTime`;\n\n/** Maps db types, i.e. `int`, to JS types, i.e. `number`. */\nexport function mapSimpleDbTypeToTypescriptType(config: Config, dbType: DatabaseColumnType): PrimitiveTypescriptType {\n  switch (dbType) {\n    case \"boolean\":\n      return \"boolean\";\n    case \"int\":\n    case \"numeric\":\n    case \"smallint\":\n    case \"integer\":\n    case \"decimal\":\n    case \"real\":\n    case \"smallserial\":\n    case \"serial\":\n    case \"double precision\":\n      return \"number\";\n    case \"bigserial\":\n    case \"bigint\":\n      return \"bigint\";\n    case \"text\":\n    case \"citext\":\n    case \"character varying\":\n    case \"varchar\":\n    case \"uuid\":\n    case \"tsvector\":\n    case \"tstzrange\":\n      return \"string\";\n    case \"time without time zone\":\n      return config.temporal\n        ? plainTimeCode\n        : fail(\"Joist doesn't support 'time without time zone' unless temporal is enabled\");\n    case \"timestamp with time zone\":\n      return config.temporal ? zonedDateTimeCode : dateCode;\n    case \"timestamp without time zone\":\n      return config.temporal ? plainDateTimeCode : dateCode;\n    case \"date\":\n      return config.temporal ? plainDateCode : dateCode;\n    case \"jsonb\":\n      return \"Object\";\n    case \"bytea\":\n      return \"Uint8Array\";\n    default:\n      assertNever(dbType);\n  }\n}\n\nexport function merge<T>(a: T[], b: T[]): T[] {\n  return [...a, ...b];\n}\n\n/** Returns true if `p` is resolved, otherwise false if it is rejected. */\nexport async function trueIfResolved(p: Promise<unknown>): Promise<boolean> {\n  return p.then(\n    () => true,\n    () => false,\n  );\n}\n\nexport function fail(message?: string): never {\n  throw new Error(message || \"Failed\");\n}\n\nexport function sortKeys<T extends object>(o: T): T {\n  return Object.keys(o)\n    .sort()\n    .reduce(\n      (acc, key) => {\n        const value = o[key as keyof T];\n        const newValue = typeof value === \"object\" && isPlainObject(value) ? sortKeys(value as any as object) : value;\n        acc[key as keyof T] = newValue as any;\n        return acc;\n      },\n      {} as any as T,\n    );\n}\n\nexport function parseOrder(order: string | undefined): { field: string; direction: \"ASC\" | \"DESC\" } | undefined {\n  if (!order) {\n    return undefined;\n  }\n  const [field, direction = \"ASC\"] = order.split(\" \");\n  if (direction !== \"ASC\" && direction !== \"DESC\") {\n    throw new Error(`Invalid direction: ${direction} (must be \"ASC\" or \"DESC\")`);\n  }\n  return { field, direction };\n}\n\nexport function q(s: string | undefined): string {\n  return s === undefined ? \"undefined\" : `\"${s}\"`;\n}\n\nexport function uncapitalize(s: string): string {\n  return s.charAt(0).toLowerCase() + s.slice(1);\n}\n\nfunction isIgnored(config: Config, t: Table): boolean {\n  return (config.ignoredTables || [\"migrations\", \"pgmigrations\"]).includes(t.name) || !shouldIncludeSchema(config, t);\n}\n\n/** Uses the same schema selection for metadata and test database cleanup. */\nexport function shouldIncludeSchema(config: Config, t: Table): boolean {\n  return config.schemas ? config.schemas.includes(t.schema.name) : t.schema.name === \"public\";\n}\n"],"mappings":";;;;;;;;AASA,SAAgB,YAAY,GAAiB;CAC3C,MAAM,IAAI,MAAM,wBAAwB,CAAC;AAC3C;AAEA,SAAgB,cAAc,QAAgB,GAAmB;CAC/D,IAAI,UAAU,QAAQ,CAAC,KAAK,YAAY,QAAQ,CAAC,GAC/C,OAAO;CAKT,MAAM,cAAc,EAAE,QAAQ,KAAK,MAAM,EAAE,IAAI;CAC/C,MAAM,EAAE,eAAe,kBAAkB,mBAAmB,MAAM;CAClE,MAAM,eAAe,cAAc,MAAM,MAAM,MAAM,YAAY,SAAS,CAAC,CAAC;CAC5E,MAAM,eAAe,cAAc,MAAM,MAAM,MAAM,YAAY,SAAS,CAAC,CAAC;CAG5E,MAAM,cAAc,YAAY,SAAS,IAAI;CAC7C,IAAI,CAAC,aAAa,OAAO;CAGzB,IAAI,eAAe,CAAC,gBAAgB,CAAC,cAC/B;MAAA,CAAC,QAAQ,MAAM,CAAC,CAAC,OAAO,MAAM,YAAY,SAAS,CAAC,CAAC,GACvD,OAAO;CAAA;CAKX,IAAI,gBAAgB,CAAC,GAAG,OAAO;CAG/B,OAAO,gBAAgB,gBAAgB,CAAC,cAAc,cAAc,gBAAgB,CAAC,cAAc;AACrG;AAEA,SAAgB,gBAAgB,GAAmB;CAEjD,OAAO,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC,YAAY,WAAW;AACpD;AAEA,SAAgB,YAAY,QAAgB,GAAmB;CAC7D,IAAI,UAAU,QAAQ,CAAC,GACrB,OAAO;CAET,MAAM,cAAc,EAAE,QAAQ,KAAK,MAAM,EAAE,IAAI;CAC/C,OAAO;EAAC;EAAM;EAAQ;CAAM,CAAC,CAAC,OAAO,MAAM,YAAY,SAAS,CAAC,CAAC,KAAK,CAAC,cAAc,QAAQ,CAAC;AACjG;AAGA,MAAM,6BAAmC,IAAI,IAAI;AAEjD,SAAgB,YAAY,QAAgB,GAAmB;CAC7D,IAAI,UAAU,QAAQ,CAAC,GACrB,OAAO;CAET,OAAO,UAAU,YAAY,EAAE,YAAY;EACzC,MAAM,EAAE,YAAY;EACpB,MAAM,MAAM,QAAQ,QAAQ,MAAM,EAAE,YAAY;EAChD,MAAM,MAAM,QAAQ,QAAQ,MAAM,EAAE,YAAY;EAGhD,IAAI,IAAI,WAAW,GAAG,OAAO;EAC7B,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,WAAW,KAAK,IAAI,OAAO,MAAM,EAAE,YAAY,IAAI,OAAO;EAE1F,MAAM,SAAS,QAAQ,SAAS,IAAI,UAAU,eAAe,CAAC,IAAI,IAAI;EACtE,MAAM,aAAa,QAAQ,QAAQ,MAAM,EAAE,SAAS,gBAAgB,EAAE,SAAS,WAAW,CAAC,CAAC;EAC5F,OAAO,WAAW,KAAM,WAAW,KAAK,eAAe;CACzD,CAAC;AACH;;AAGA,SAAgB,eAAe,GAAmB;CAChD,MAAM,MAAM,EAAE,QAAQ,QAAQ,MAAM,EAAE,YAAY;CAClD,OAAO,IAAI,WAAW,KAAK,CAAC,IAAI,EAAE,CAAC;AACrC;AAEA,SAAS,UAAgB,KAAgB,KAAQ,IAAgB;CAC/D,IAAI,QAAQ,IAAI,IAAI,GAAG;CACvB,IAAI,UAAU,KAAA,GAAW;EACvB,QAAQ,GAAG;EACX,IAAI,IAAI,KAAK,KAAK;CACpB;CACA,OAAO;AACT;;AAGA,SAAgB,kBAAkB,QAAgB,OAAsB;CACtE,IAAI,aAAa,OAAO,sBAAsB,MAAM;CACpD,IAAI,CAAC,YAAY;EAIf,aAHyB,OAAO,QAAQ,OAAO,QAAQ,CAAC,CACrD,QAAQ,GAAG,UAAU,KAAK,cAAc,MAAM,IAAI,CAAC,CACnD,KAAK,CAAC,gBAAgB,UAAU,CAAC,CAAC,MACJ,WAAW,UAAU,SAAS,MAAM,IAAI,CAAC;EAC1E,CAAC,OAAO,wBAAwB,CAAC,EAAA,CAAG,MAAM,QAAQ;CACpD;CACA,OAAO;AACT;AAEA,MAAa,WAAW,IAAI;AAC5B,MAAa,gBAAgB,IAAI,GAAG,IAAI,oBAAoB,EAAE;AAC9D,MAAa,gBAAgB,IAAI,GAAG,IAAI,oBAAoB,EAAE;AAC9D,MAAa,oBAAoB,IAAI,GAAG,IAAI,oBAAoB,EAAE;AAClE,MAAa,oBAAoB,IAAI,GAAG,IAAI,oBAAoB,EAAE;;AAGlE,SAAgB,gCAAgC,QAAgB,QAAqD;CACnH,QAAQ,QAAR;EACE,KAAK,WACH,OAAO;EACT,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK,oBACH,OAAO;EACT,KAAK;EACL,KAAK,UACH,OAAO;EACT,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK,aACH,OAAO;EACT,KAAK,0BACH,OAAO,OAAO,WACV,gBACA,KAAK,2EAA2E;EACtF,KAAK,4BACH,OAAO,OAAO,WAAW,oBAAoB;EAC/C,KAAK,+BACH,OAAO,OAAO,WAAW,oBAAoB;EAC/C,KAAK,QACH,OAAO,OAAO,WAAW,gBAAgB;EAC3C,KAAK,SACH,OAAO;EACT,KAAK,SACH,OAAO;EACT,SACE,YAAY,MAAM;CACtB;AACF;AAEA,SAAgB,MAAS,GAAQ,GAAa;CAC5C,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;AACpB;;AAGA,eAAsB,eAAe,GAAuC;CAC1E,OAAO,EAAE,WACD,YACA,KACR;AACF;AAEA,SAAgB,KAAK,SAAyB;CAC5C,MAAM,IAAI,MAAM,WAAW,QAAQ;AACrC;AAEA,SAAgB,SAA2B,GAAS;CAClD,OAAO,OAAO,KAAK,CAAC,CAAC,CAClB,KAAK,CAAC,CACN,QACE,KAAK,QAAQ;EACZ,MAAM,QAAQ,EAAE;EAEhB,IAAI,OADa,OAAO,UAAU,YAAY,cAAc,KAAK,IAAI,SAAS,KAAsB,IAAI;EAExG,OAAO;CACT,GACA,CAAC,CACH;AACJ;AAEA,SAAgB,WAAW,OAAqF;CAC9G,IAAI,CAAC,OACH;CAEF,MAAM,CAAC,OAAO,YAAY,SAAS,MAAM,MAAM,GAAG;CAClD,IAAI,cAAc,SAAS,cAAc,QACvC,MAAM,IAAI,MAAM,sBAAsB,UAAU,2BAA2B;CAE7E,OAAO;EAAE;EAAO;CAAU;AAC5B;AAEA,SAAgB,EAAE,GAA+B;CAC/C,OAAO,MAAM,KAAA,IAAY,cAAc,IAAI,EAAE;AAC/C;AAEA,SAAgB,aAAa,GAAmB;CAC9C,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,MAAM,CAAC;AAC9C;AAEA,SAAS,UAAU,QAAgB,GAAmB;CACpD,QAAQ,OAAO,iBAAiB,CAAC,cAAc,cAAc,EAAA,CAAG,SAAS,EAAE,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC;AACpH;;AAGA,SAAgB,oBAAoB,QAAgB,GAAmB;CACrE,OAAO,OAAO,UAAU,OAAO,QAAQ,SAAS,EAAE,OAAO,IAAI,IAAI,EAAE,OAAO,SAAS;AACrF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joist-codegen",
-  "version": "2.3.0-next.111",
+  "version": "2.3.0-next.113",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -38,7 +38,7 @@
     "skills"
   ],
   "peerDependencies": {
-    "joist-utils": "2.3.0-next.111",
+    "joist-utils": "2.3.0-next.113",
     "knex": "^3.1.0",
     "pg": "^8.23.0"
   },