@contember/client-content-generator 2.1.0-alpha.30 → 2.1.0-alpha.36

package/dist/types/EntityTypeSchemaGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityTypeSchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/EntityTypeSchemaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAKzC,qBAAa,yBAAyB;IACrC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM;IA6BrC,OAAO,CAAC,sBAAsB;IAoC9B,OAAO,CAAC,mBAAmB;IA8C3B,OAAO,CAAC,kBAAkB;CAU1B"}
+{"version":3,"file":"EntityTypeSchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/EntityTypeSchemaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAKzC,qBAAa,yBAAyB;IACrC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM;IA6BrC,OAAO,CAAC,sBAAsB;IAsC9B,OAAO,CAAC,mBAAmB;IA4C3B,OAAO,CAAC,kBAAkB;CAU1B"}

package/dist/types/NameSchemaGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NameSchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/NameSchemaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGzC,qBAAa,mBAAmB;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,WAAW;CAoC1C"}
+{"version":3,"file":"NameSchemaGenerator.d.ts","sourceRoot":"","sources":["../../src/NameSchemaGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGzC,qBAAa,mBAAmB;IAC/B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,WAAW;CAoC1C"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contember/client-content-generator",
   "license": "Apache-2.0",
-  "version": "2.1.0-alpha.30",
+  "version": "2.1.0-alpha.36",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/production/index.js",
@@ -33,17 +33,17 @@
     "ae:test": "api-extractor run"
   },
   "dependencies": {
-    "@contember/client-content": "2.1.0-alpha.30",
-    "@contember/schema": "2.1.0-alpha.30",
-    "@contember/schema-utils": "2.1.0-alpha.30"
+    "@contember/client-content": "workspace:*",
+    "@contember/schema": "workspace:*",
+    "@contember/schema-utils": "workspace:*"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.1.0-alpha.30",
-    "@types/node": "^20.17.22"
+    "@contember/schema-definition": "workspace:*",
+    "@types/node": "catalog:"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/contember/interface.git",
+    "url": "git+https://github.com/contember/contember.git",
     "directory": "packages/client-content-generator"
   }
 }

package/src/ContemberClientGenerator.ts

@@ -3,7 +3,6 @@ import { EnumTypeSchemaGenerator } from './EnumTypeSchemaGenerator'
 import { EntityTypeSchemaGenerator } from './EntityTypeSchemaGenerator'
 import { NameSchemaGenerator } from './NameSchemaGenerator'
 
-
 export class ContemberClientGenerator {
 	constructor(
 		private readonly nameSchemaGenerator: NameSchemaGenerator = new NameSchemaGenerator(),
@@ -17,8 +16,17 @@ export class ContemberClientGenerator {
 		const enumTypeSchema = this.enumTypeSchemaGenerator.generate(model)
 		const entityTypeSchema = this.entityTypeSchemaGenerator.generate(model)
 
-		const namesCode = `import { SchemaNames } from '@contember/client-content'
-export const ContemberClientNames: SchemaNames = ` + JSON.stringify(nameSchema, null, 2)
+		const namesCode = `import type { SchemaNames, SchemaEntityNames } from '@contember/client-content'
+import type { ContemberClientEntities } from './entities'
+import type { ContemberClientEnums } from './enums'
+export const ContemberClientNames = {
+	entities: ${
+			JSON.stringify(nameSchema.entities, null, '\t').replaceAll('\n', '\n\t')
+		} satisfies {[K in keyof ContemberClientEntities]: SchemaEntityNames<K>},
+	enums: ${
+			JSON.stringify(nameSchema.enums, null, '\t').replaceAll('\n', '\n\t')
+		} satisfies {[K in keyof ContemberClientEnums]: readonly ContemberClientEnums[K][]},
+} satisfies SchemaNames`
 
 		const indexCode = `
 import { ContemberClientNames } from './names'

package/src/EntityTypeSchemaGenerator.ts

@@ -35,7 +35,7 @@ export type JSONArray = readonly JSONValue[]
 
 	private generateTypeEntityCode(model: Model.Schema, entity: Model.Entity): string {
 		let code = `export type ${entity.name} <OverRelation extends string | never = never> = {\n`
-		code += '\tname: \'' + entity.name + '\'\n'
+		code += "\tname: '" + entity.name + "'\n"
 		code += '\tunique:\n'
 		code += this.formatUniqueFields(model, entity)
 		let columnsCode = ''
@@ -43,7 +43,9 @@ export type JSONArray = readonly JSONValue[]
 		let hasManyCode = ''
 		acceptEveryFieldVisitor(model, entity, {
 			visitHasMany: ctx => {
-				hasManyCode += `\t\t${ctx.relation.name}: ${ctx.targetEntity.name}${ctx.targetRelation?.type === Model.RelationType.ManyHasOne ? `<'${ctx.targetRelation.name}'>` : ''}\n`
+				hasManyCode += `\t\t${ctx.relation.name}: ${ctx.targetEntity.name}${
+					ctx.targetRelation?.type === Model.RelationType.ManyHasOne ? `<'${ctx.targetRelation.name}'>` : ''
+				}\n`
 			},
 			visitHasOne: ctx => {
 				hasOneCode += `\t\t${ctx.relation.name}: ${ctx.targetEntity.name}\n`
@@ -78,7 +80,7 @@ export type JSONArray = readonly JSONValue[]
 				}
 				const uniqueConstraints = getFieldsForUniqueWhere(model, targetEntity)
 				const composedUnique = uniqueConstraints
-					.filter(fields => fields.length === 2) //todo support all uniques
+					.filter(fields => fields.length === 2) // todo support all uniques
 					.filter(fields => fields.includes(targetRelation.name))
 					.map(fields => fields.filter(it => it !== targetRelation.name))
 					.map(fields => fields[0])
@@ -86,7 +88,6 @@ export type JSONArray = readonly JSONValue[]
 					.filter(fields => fields.length === 1 && fields[0] !== targetEntity.primary)
 					.map(fields => fields[0])
 					.filter(it => it !== targetRelation.name)
-
 				;[...composedUnique, ...singleUnique].forEach(fieldName => {
 					const capitalizeFirstLetter = (value: string) => {
 						return value.charAt(0).toUpperCase() + value.slice(1)
@@ -96,7 +97,6 @@ export type JSONArray = readonly JSONValue[]
 					const targetUnique = targetEntity.fields[fieldName]
 
 					code += `\t\t${name}: { entity: ${targetEntity.name}; by: {${fieldName}: ${uniqueType(model, targetEntity, targetUnique)}}  }\n`
-
 				})
 			},
 			visitColumn: () => {
@@ -127,7 +127,6 @@ export type JSONArray = readonly JSONValue[]
 	}
 }
 
-
 const uniqueType = (model: Model.Schema, entity: Model.Entity, field: Model.AnyField): string => {
 	return acceptFieldVisitor(model, entity, field, {
 		visitColumn: ctx => {
@@ -139,7 +138,6 @@ const uniqueType = (model: Model.Schema, entity: Model.Entity, field: Model.AnyF
 	})
 }
 
-
 const columnToTsType = (column: Model.AnyColumn): string => {
 	const baseType = (() => {
 		switch (column.type) {
@@ -164,7 +162,7 @@ const columnToTsType = (column: Model.AnyColumn): string => {
 			case Model.ColumnType.Uuid:
 				return 'string'
 			default:
-				((_: never) => {
+				;((_: never) => {
 					throw new Error(`Unknown type ${_}`)
 				})(column.type)
 		}

package/src/NameSchemaGenerator.ts

@@ -1,4 +1,4 @@
-import { SchemaNames, SchemaEntityNames } from '@contember/client-content'
+import { SchemaEntityNames, SchemaNames } from '@contember/client-content'
 import { Model } from '@contember/schema'
 import { acceptEveryFieldVisitor } from '@contember/schema-utils'
 
@@ -40,5 +40,3 @@ export class NameSchemaGenerator {
 		}
 	}
 }
-
-

package/src/generate.ts

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 import * as fs from 'node:fs/promises'
-import { resolve, join } from 'node:path'
-import { ContemberClientGenerator } from './ContemberClientGenerator';
-
-(async () => {
+import { join, resolve } from 'node:path'
+import { ContemberClientGenerator } from './ContemberClientGenerator'
+;(async () => {
 	const schemaPath = process.argv[2]
 	const outDir = process.argv[3]
 
@@ -46,4 +45,3 @@ yarn run --silent contember project:print-schema --format=schema | yarn contembe
 	console.error(e)
 	process.exit(1)
 })
-

package/tests/__snapshots__/generateEnittyTypes.test.ts.snap

@@ -1,4 +1,4 @@
-// Bun Snapshot v1, https://goo.gl/fbAQLP
+// Bun Snapshot v1, https://bun.sh/docs/test/snapshots
 
 exports[`generate entities generate for scalars 1`] = `
 "
@@ -8,34 +8,34 @@ export type JSONObject = { readonly [K in string]?: JSONValue }
 export type JSONArray = readonly JSONValue[]
 
 export type Foo <OverRelation extends string | never = never> = {
-\tname: 'Foo'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t\tstringCol: string | null
-\t\tintCol: number | null
-\t\tdoubleCol: number | null
-\t\tdateCol: string | null
-\t\tdatetimeCol: string | null
-\t\tbooleanCol: boolean | null
-\t\tjsonCol: JSONValue | null
-\t\tuuidCol: string | null
-\t}
-\thasOne: {
-\t}
-\thasMany: {
-\t}
-\thasManyBy: {
-\t}
+	name: 'Foo'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+	columns: {
+		id: string
+		stringCol: string | null
+		intCol: number | null
+		doubleCol: number | null
+		dateCol: string | null
+		datetimeCol: string | null
+		booleanCol: boolean | null
+		jsonCol: JSONValue | null
+		uuidCol: string | null
+	}
+	hasOne: {
+	}
+	hasMany: {
+	}
+	hasManyBy: {
+	}
 }
 
 export type ContemberClientEntities = {
-\tFoo: Foo
+	Foo: Foo
 }
 
 export type ContemberClientSchema = {
-\tentities: ContemberClientEntities
+	entities: ContemberClientEntities
 }
 "
 `;
@@ -49,27 +49,27 @@ export type JSONObject = { readonly [K in string]?: JSONValue }
 export type JSONArray = readonly JSONValue[]
 
 export type Foo <OverRelation extends string | never = never> = {
-\tname: 'Foo'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t\tenumCol: FooEnumCol | null
-\t}
-\thasOne: {
-\t}
-\thasMany: {
-\t}
-\thasManyBy: {
-\t}
+	name: 'Foo'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+	columns: {
+		id: string
+		enumCol: FooEnumCol | null
+	}
+	hasOne: {
+	}
+	hasMany: {
+	}
+	hasManyBy: {
+	}
 }
 
 export type ContemberClientEntities = {
-\tFoo: Foo
+	Foo: Foo
 }
 
 export type ContemberClientSchema = {
-\tentities: ContemberClientEntities
+	entities: ContemberClientEntities
 }
 "
 `;
@@ -82,45 +82,45 @@ export type JSONObject = { readonly [K in string]?: JSONValue }
 export type JSONArray = readonly JSONValue[]
 
 export type Foo <OverRelation extends string | never = never> = {
-\tname: 'Foo'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\t\t| Omit<{ oneHasOneInverseRel: Bar['unique']}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t\toneHasOneInverseRel: Bar
-\t}
-\thasMany: {
-\t}
-\thasManyBy: {
-\t}
+	name: 'Foo'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+		| Omit<{ oneHasOneInverseRel: Bar['unique']}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+		oneHasOneInverseRel: Bar
+	}
+	hasMany: {
+	}
+	hasManyBy: {
+	}
 }
 export type Bar <OverRelation extends string | never = never> = {
-\tname: 'Bar'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\t\t| Omit<{ oneHasOneOwningRel: Foo['unique']}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t\toneHasOneOwningRel: Foo
-\t}
-\thasMany: {
-\t}
-\thasManyBy: {
-\t}
+	name: 'Bar'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+		| Omit<{ oneHasOneOwningRel: Foo['unique']}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+		oneHasOneOwningRel: Foo
+	}
+	hasMany: {
+	}
+	hasManyBy: {
+	}
 }
 
 export type ContemberClientEntities = {
-\tFoo: Foo
-\tBar: Bar
+	Foo: Foo
+	Bar: Bar
 }
 
 export type ContemberClientSchema = {
-\tentities: ContemberClientEntities
+	entities: ContemberClientEntities
 }
 "
 `;
@@ -133,44 +133,44 @@ export type JSONObject = { readonly [K in string]?: JSONValue }
 export type JSONArray = readonly JSONValue[]
 
 export type Foo <OverRelation extends string | never = never> = {
-\tname: 'Foo'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\t\t| Omit<{ oneHasManyRel: Bar['unique']}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t}
-\thasMany: {
-\t\toneHasManyRel: Bar<'manyHasOneRel'>
-\t}
-\thasManyBy: {
-\t}
+	name: 'Foo'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+		| Omit<{ oneHasManyRel: Bar['unique']}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+	}
+	hasMany: {
+		oneHasManyRel: Bar<'manyHasOneRel'>
+	}
+	hasManyBy: {
+	}
 }
 export type Bar <OverRelation extends string | never = never> = {
-\tname: 'Bar'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t\tmanyHasOneRel: Foo
-\t}
-\thasMany: {
-\t}
-\thasManyBy: {
-\t}
+	name: 'Bar'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+		manyHasOneRel: Foo
+	}
+	hasMany: {
+	}
+	hasManyBy: {
+	}
 }
 
 export type ContemberClientEntities = {
-\tFoo: Foo
-\tBar: Bar
+	Foo: Foo
+	Bar: Bar
 }
 
 export type ContemberClientSchema = {
-\tentities: ContemberClientEntities
+	entities: ContemberClientEntities
 }
 "
 `;
@@ -183,43 +183,43 @@ export type JSONObject = { readonly [K in string]?: JSONValue }
 export type JSONArray = readonly JSONValue[]
 
 export type Foo <OverRelation extends string | never = never> = {
-\tname: 'Foo'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t}
-\thasMany: {
-\t\tmanyHasManyRel: Bar
-\t}
-\thasManyBy: {
-\t}
+	name: 'Foo'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+	}
+	hasMany: {
+		manyHasManyRel: Bar
+	}
+	hasManyBy: {
+	}
 }
 export type Bar <OverRelation extends string | never = never> = {
-\tname: 'Bar'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t}
-\thasMany: {
-\t\tmanyHasManyInverseRel: Foo
-\t}
-\thasManyBy: {
-\t}
+	name: 'Bar'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+	}
+	hasMany: {
+		manyHasManyInverseRel: Foo
+	}
+	hasManyBy: {
+	}
 }
 
 export type ContemberClientEntities = {
-\tFoo: Foo
-\tBar: Bar
+	Foo: Foo
+	Bar: Bar
 }
 
 export type ContemberClientSchema = {
-\tentities: ContemberClientEntities
+	entities: ContemberClientEntities
 }
 "
 `;
@@ -232,47 +232,47 @@ export type JSONObject = { readonly [K in string]?: JSONValue }
 export type JSONArray = readonly JSONValue[]
 
 export type Foo <OverRelation extends string | never = never> = {
-\tname: 'Foo'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\t\t| Omit<{ locales: FooLocale['unique']}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t}
-\thasOne: {
-\t}
-\thasMany: {
-\t\tlocales: FooLocale<'foo'>
-\t}
-\thasManyBy: {
-\t\tlocalesByLocale: { entity: FooLocale; by: {locale: string}  }
-\t}
+	name: 'Foo'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+		| Omit<{ locales: FooLocale['unique']}, OverRelation>
+	columns: {
+		id: string
+	}
+	hasOne: {
+	}
+	hasMany: {
+		locales: FooLocale<'foo'>
+	}
+	hasManyBy: {
+		localesByLocale: { entity: FooLocale; by: {locale: string}  }
+	}
 }
 export type FooLocale <OverRelation extends string | never = never> = {
-\tname: 'FooLocale'
-\tunique:
-\t\t| Omit<{ id: string}, OverRelation>
-\t\t| Omit<{ locale: string, foo: Foo['unique']}, OverRelation>
-\tcolumns: {
-\t\tid: string
-\t\tlocale: string
-\t}
-\thasOne: {
-\t\tfoo: Foo
-\t}
-\thasMany: {
-\t}
-\thasManyBy: {
-\t}
+	name: 'FooLocale'
+	unique:
+		| Omit<{ id: string}, OverRelation>
+		| Omit<{ locale: string, foo: Foo['unique']}, OverRelation>
+	columns: {
+		id: string
+		locale: string
+	}
+	hasOne: {
+		foo: Foo
+	}
+	hasMany: {
+	}
+	hasManyBy: {
+	}
 }
 
 export type ContemberClientEntities = {
-\tFoo: Foo
-\tFooLocale: FooLocale
+	Foo: Foo
+	FooLocale: FooLocale
 }
 
 export type ContemberClientSchema = {
-\tentities: ContemberClientEntities
+	entities: ContemberClientEntities
 }
 "
 `;

package/tests/__snapshots__/generateEnumTypes.test.ts.snap

@@ -1,16 +1,16 @@
-// Bun Snapshot v1, https://goo.gl/fbAQLP
+// Bun Snapshot v1, https://bun.sh/docs/test/snapshots
 
 exports[`generate enums 1`] = `
 "export type OrderStatus = 
-\t | "new"
-\t | "paid"
-\t | "cancelled"
+	 | "new"
+	 | "paid"
+	 | "cancelled"
 export type OrderType = 
-\t | "normal"
-\t | "express"
+	 | "normal"
+	 | "express"
 export type ContemberClientEnums = {
-\tOrderStatus: OrderStatus
-\torderType: OrderType
+	OrderStatus: OrderStatus
+	orderType: OrderType
 }
 
 "

package/tests/generateEnittyTypes.test.ts

@@ -2,37 +2,28 @@ import { describe, expect, test } from 'bun:test'
 import { EntityTypeSchemaGenerator } from '../src'
 import { schemas } from './schemas'
 
-
 describe('generate entities', () => {
-
 	const entityGenerator = new EntityTypeSchemaGenerator()
 	test('generate for scalars', () => {
-
 		expect(entityGenerator.generate(schemas.scalarsSchema.model)).toMatchSnapshot()
 	})
 
 	test('generate for has enum', () => {
-
 		expect(entityGenerator.generate(schemas.enumSchema.model)).toMatchSnapshot()
 	})
 	test('generate one has one', () => {
-
 		expect(entityGenerator.generate(schemas.oneHasOneSchema.model)).toMatchSnapshot()
 	})
 
 	test('generate one has many', () => {
-
 		expect(entityGenerator.generate(schemas.oneHasManySchema.model)).toMatchSnapshot()
 	})
 
 	test('generate many has many', () => {
-
 		expect(entityGenerator.generate(schemas.manyHasManySchema.model)).toMatchSnapshot()
 	})
 
 	test('generate reduced has by', () => {
-
 		expect(entityGenerator.generate(schemas.reducedHasManySchema.model)).toMatchSnapshot()
 	})
-
 })

package/tests/generateEnumTypes.test.ts

@@ -1,7 +1,6 @@
 import { describe, expect, test } from 'bun:test'
 import { EnumTypeSchemaGenerator } from '../src'
 
-
 test('generate enums', () => {
 	const enumGenerator = new EnumTypeSchemaGenerator()
 	expect(enumGenerator.generate({

package/tests/schemas.ts

@@ -1,4 +1,4 @@
-import { SchemaDefinition as def, createSchema } from '@contember/schema-definition'
+import { createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 
 namespace ManyScalarsSchema {
 	export class Foo {
@@ -13,7 +13,6 @@ namespace ManyScalarsSchema {
 	}
 }
 
-
 namespace EnumSchema {
 	export class Foo {
 		enumCol = def.enumColumn(def.createEnum('foo', 'bar'))
@@ -40,7 +39,6 @@ namespace OneHasManySchema {
 	}
 }
 
-
 namespace ManyHasManySchema {
 	export class Foo {
 		manyHasManyRel = def.manyHasMany(Bar, 'manyHasManyInverseRel')