npm - @contember/schema-utils - Versions diffs - 2.1.0-beta.2 → 2.2.0-alpha.2 - Mend

@contember/schema-utils 2.1.0-beta.2 → 2.2.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (247) hide show

package/dist/development/index.cjs CHANGED Viewed

@@ -14,6 +14,9 @@ const TsDefinitionGenerator = require("./src/definition-generator/TsDefinitionGe
 const AclDefinitionCodeGenerator = require("./src/definition-generator/AclDefinitionCodeGenerator.cjs");
 const DefinitionCodeGenerator = require("./src/definition-generator/DefinitionCodeGenerator.cjs");
 const DefinitionNamingConventions = require("./src/definition-generator/DefinitionNamingConventions.cjs");
+const keywords = require("./src/json-schema/keywords.cjs");
+const collectUnsupportedKeywords = require("./src/json-schema/collectUnsupportedKeywords.cjs");
+const jsonSchemaToTsType = require("./src/json-schema/jsonSchemaToTsType.cjs");
 const schema = require("./src/lax/schema.cjs");
 const LaxSchemaConverter = require("./src/lax/LaxSchemaConverter.cjs");
 const AllowAllPermissionFactory = require("./src/acl/AllowAllPermissionFactory.cjs");
@@ -83,6 +86,14 @@ exports.TsDefinitionGenerator = TsDefinitionGenerator.TsDefinitionGenerator;
 exports.AclDefinitionCodeGenerator = AclDefinitionCodeGenerator.AclDefinitionCodeGenerator;
 exports.DefinitionCodeGenerator = DefinitionCodeGenerator.DefinitionCodeGenerator;
 exports.DefinitionNamingConventions = DefinitionNamingConventions.DefinitionNamingConventions;
+exports.ALLOWED_JSON_SCHEMA_ANNOTATION_KEYWORDS = keywords.ALLOWED_JSON_SCHEMA_ANNOTATION_KEYWORDS;
+exports.SUPPORTED_JSON_SCHEMA_KEYWORDS = keywords.SUPPORTED_JSON_SCHEMA_KEYWORDS;
+exports.isAllowedJsonSchemaAnnotationKeyword = keywords.isAllowedJsonSchemaAnnotationKeyword;
+exports.isRecognizedJsonSchemaKeyword = keywords.isRecognizedJsonSchemaKeyword;
+exports.isSupportedJsonSchemaKeyword = keywords.isSupportedJsonSchemaKeyword;
+exports.collectUnsupportedJsonSchemaKeywords = collectUnsupportedKeywords.collectUnsupportedJsonSchemaKeywords;
+exports.JSON_VALUE_TYPE = jsonSchemaToTsType.JSON_VALUE_TYPE;
+exports.jsonSchemaToTsType = jsonSchemaToTsType.jsonSchemaToTsType;
 exports.LaxSchema = schema.LaxSchema;
 exports.LaxSchemaConverter = LaxSchemaConverter.LaxSchemaConverter;
 exports.AllowAllPermissionFactory = AllowAllPermissionFactory.AllowAllPermissionFactory;

package/dist/development/index.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.cjs","sources":["../../../packages/schema-utils/src/index.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { emptyModelSchema } from './model'\nimport * as Typesafe from '@contember/typesafe'\nimport { aclSchema, modelSchema, settingsSchema, validationSchema } from './type-schema'\nimport { actionsSchema } from './type-schema/actions'\n\nexport * from './definition-generator'\nexport * from './lax'\nexport * from './model'\nexport * from './acl'\nexport * from './dataUtils'\nexport * from './validation'\nexport * from './schemaNormalizer'\nexport * from './schemaFilter'\nexport * from './schemaChecksum'\nexport { compareArraysIgnoreOrder, deepCompare } from './utils'\n\nexport const emptySchema: Schema = {\n\tmodel: emptyModelSchema,\n\tacl: { roles: {} },\n\tvalidation: {},\n\tactions: { triggers: {}, targets: {} },\n\tsettings: {},\n}\n\nexport const schemaType: Typesafe.Type<Schema> = Typesafe.object({\n\tmodel: modelSchema,\n\tacl: aclSchema,\n\tvalidation: validationSchema,\n\tactions: Typesafe.coalesce(actionsSchema, { triggers: {}, targets: {} }),\n\tsettings: Typesafe.coalesce(settingsSchema, {}),\n})\n"],"names":["emptyModelSchema","Typesafe","modelSchema","aclSchema","validationSchema","actionsSchema","settingsSchema"],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiBO~~,MAAM,cAAsB;AAAA,EAClC,OAAOA,WAAAA;AAAAA,EACP,KAAK,EAAE,OAAO,GAAC;AAAA,EACf,YAAY,CAAA;AAAA,EACZ,SAAS,EAAE,UAAU,IAAI,SAAS,CAAA,EAAC;AAAA,EACnC,UAAU,CAAA;AACX;AAEO,MAAM,aAAoCC,oBAAS,OAAO;AAAA,EAChE,OAAOC,MAAAA;AAAAA,EACP,KAAKC,IAAAA;AAAAA,EACL,YAAYC,WAAAA;AAAAA,EACZ,SAASH,oBAAS,SAASI,QAAAA,eAAe,EAAE,UAAU,CAAA,GAAI,SAAS,CAAA,GAAI;AAAA,EACvE,UAAUJ,oBAAS,SAASK,SAAAA,gBAAgB,CAAA,CAAE;AAC/C,CAAC~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~"}
1	+ {"version":3,"file":"index.cjs","sources":["../../../packages/schema-utils/src/index.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { emptyModelSchema } from './model/index.js'\nimport * as Typesafe from '@contember/typesafe'\nimport { aclSchema, modelSchema, settingsSchema, validationSchema } from './type-schema/index.js'\nimport { actionsSchema } from './type-schema/actions.js'\n\nexport * from './definition-generator/index.js'\nexport * from './json-schema/index.js'\nexport * from './lax/index.js'\nexport * from './model/index.js'\nexport * from './acl/index.js'\nexport * from './dataUtils.js'\nexport * from './validation/index.js'\nexport * from './schemaNormalizer.js'\nexport * from './schemaFilter.js'\nexport * from './schemaChecksum.js'\nexport { compareArraysIgnoreOrder, deepCompare } from './utils/index.js'\n\nexport const emptySchema: Schema = {\n\tmodel: emptyModelSchema,\n\tacl: { roles: {} },\n\tvalidation: {},\n\tactions: { triggers: {}, targets: {} },\n\tsettings: {},\n}\n\nexport const schemaType: Typesafe.Type<Schema> = Typesafe.object({\n\tmodel: modelSchema,\n\tacl: aclSchema,\n\tvalidation: validationSchema,\n\tactions: Typesafe.coalesce(actionsSchema, { triggers: {}, targets: {} }),\n\tsettings: Typesafe.coalesce(settingsSchema, {}),\n})\n"],"names":["emptyModelSchema","Typesafe","modelSchema","aclSchema","validationSchema","actionsSchema","settingsSchema"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBO,MAAM,cAAsB;AAAA,EAClC,OAAOA,WAAAA;AAAAA,EACP,KAAK,EAAE,OAAO,GAAC;AAAA,EACf,YAAY,CAAA;AAAA,EACZ,SAAS,EAAE,UAAU,IAAI,SAAS,CAAA,EAAC;AAAA,EACnC,UAAU,CAAA;AACX;AAEO,MAAM,aAAoCC,oBAAS,OAAO;AAAA,EAChE,OAAOC,MAAAA;AAAAA,EACP,KAAKC,IAAAA;AAAAA,EACL,YAAYC,WAAAA;AAAAA,EACZ,SAASH,oBAAS,SAASI,QAAAA,eAAe,EAAE,UAAU,CAAA,GAAI,SAAS,CAAA,GAAI;AAAA,EACvE,UAAUJ,oBAAS,SAASK,SAAAA,gBAAgB,CAAA,CAAE;AAC/C,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/development/index.js CHANGED Viewed

@@ -13,6 +13,9 @@ import { TsDefinitionGenerator } from "./src/definition-generator/TsDefinitionGe
 import { AclDefinitionCodeGenerator } from "./src/definition-generator/AclDefinitionCodeGenerator.js";
 import { DefinitionCodeGenerator } from "./src/definition-generator/DefinitionCodeGenerator.js";
 import { DefinitionNamingConventions } from "./src/definition-generator/DefinitionNamingConventions.js";
+import { ALLOWED_JSON_SCHEMA_ANNOTATION_KEYWORDS, SUPPORTED_JSON_SCHEMA_KEYWORDS, isAllowedJsonSchemaAnnotationKeyword, isRecognizedJsonSchemaKeyword, isSupportedJsonSchemaKeyword } from "./src/json-schema/keywords.js";
+import { collectUnsupportedJsonSchemaKeywords } from "./src/json-schema/collectUnsupportedKeywords.js";
+import { JSON_VALUE_TYPE, jsonSchemaToTsType } from "./src/json-schema/jsonSchemaToTsType.js";
 import { LaxSchema } from "./src/lax/schema.js";
 import { LaxSchemaConverter } from "./src/lax/LaxSchemaConverter.js";
 import { AllowAllPermissionFactory } from "./src/acl/AllowAllPermissionFactory.js";
@@ -44,6 +47,7 @@ const schemaType = Typesafe.object({
   settings: Typesafe.coalesce(settingsSchema, {})
 });
 export {
+  ALLOWED_JSON_SCHEMA_ANNOTATION_KEYWORDS,
   AclDefinitionCodeGenerator,
   AclValidator,
   AllowAllPermissionFactory,
@@ -51,6 +55,7 @@ export {
   DefinitionCodeGenerator,
   DefinitionNamingConventions,
   ErrorBuilder,
+  JSON_VALUE_TYPE,
   LaxSchema,
   LaxSchemaConverter,
   MembershipReadResult,
@@ -62,6 +67,7 @@ export {
   ModelValidator,
   NoDataError,
   PredicateDefinitionProcessor,
+  SUPPORTED_JSON_SCHEMA_KEYWORDS,
   SchemaValidator,
   TsDefinitionGenerator,
   ValidationValidator,
@@ -69,6 +75,7 @@ export {
   acceptFieldVisitor,
   acceptRelationTypeVisitor,
   calculateSchemaChecksum,
+  collectUnsupportedJsonSchemaKeywords,
   compareArraysIgnoreOrder,
   deepCompare,
   emptyModelSchema,
@@ -80,10 +87,14 @@ export {
   getField,
   getRoleVariables,
   getTargetEntity,
+  isAllowedJsonSchemaAnnotationKeyword,
   isColumn,
   isInverseRelation,
   isOwningRelation,
+  isRecognizedJsonSchemaKeyword,
   isRelation,
+  isSupportedJsonSchemaKeyword,
+  jsonSchemaToTsType,
   normalizeSchema,
   resolveColumnValue,
   resolveDefaultColumnType,

package/dist/development/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sources":["../../../packages/schema-utils/src/index.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { emptyModelSchema } from './model'\nimport * as Typesafe from '@contember/typesafe'\nimport { aclSchema, modelSchema, settingsSchema, validationSchema } from './type-schema'\nimport { actionsSchema } from './type-schema/actions'\n\nexport * from './definition-generator'\nexport * from './lax'\nexport * from './model'\nexport * from './acl'\nexport * from './dataUtils'\nexport * from './validation'\nexport * from './schemaNormalizer'\nexport * from './schemaFilter'\nexport * from './schemaChecksum'\nexport { compareArraysIgnoreOrder, deepCompare } from './utils'\n\nexport const emptySchema: Schema = {\n\tmodel: emptyModelSchema,\n\tacl: { roles: {} },\n\tvalidation: {},\n\tactions: { triggers: {}, targets: {} },\n\tsettings: {},\n}\n\nexport const schemaType: Typesafe.Type<Schema> = Typesafe.object({\n\tmodel: modelSchema,\n\tacl: aclSchema,\n\tvalidation: validationSchema,\n\tactions: Typesafe.coalesce(actionsSchema, { triggers: {}, targets: {} }),\n\tsettings: Typesafe.coalesce(settingsSchema, {}),\n})\n"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiBO~~,MAAM,cAAsB;AAAA,EAClC,OAAO;AAAA,EACP,KAAK,EAAE,OAAO,GAAC;AAAA,EACf,YAAY,CAAA;AAAA,EACZ,SAAS,EAAE,UAAU,IAAI,SAAS,CAAA,EAAC;AAAA,EACnC,UAAU,CAAA;AACX;AAEO,MAAM,aAAoC,SAAS,OAAO;AAAA,EAChE,OAAO;AAAA,EACP,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,SAAS,SAAS,SAAS,eAAe,EAAE,UAAU,CAAA,GAAI,SAAS,CAAA,GAAI;AAAA,EACvE,UAAU,SAAS,SAAS,gBAAgB,CAAA,CAAE;AAC/C,CAAC;"}
1	+ {"version":3,"file":"index.js","sources":["../../../packages/schema-utils/src/index.ts"],"sourcesContent":["import { Schema } from '@contember/schema'\nimport { emptyModelSchema } from './model/index.js'\nimport * as Typesafe from '@contember/typesafe'\nimport { aclSchema, modelSchema, settingsSchema, validationSchema } from './type-schema/index.js'\nimport { actionsSchema } from './type-schema/actions.js'\n\nexport * from './definition-generator/index.js'\nexport * from './json-schema/index.js'\nexport * from './lax/index.js'\nexport * from './model/index.js'\nexport * from './acl/index.js'\nexport * from './dataUtils.js'\nexport * from './validation/index.js'\nexport * from './schemaNormalizer.js'\nexport * from './schemaFilter.js'\nexport * from './schemaChecksum.js'\nexport { compareArraysIgnoreOrder, deepCompare } from './utils/index.js'\n\nexport const emptySchema: Schema = {\n\tmodel: emptyModelSchema,\n\tacl: { roles: {} },\n\tvalidation: {},\n\tactions: { triggers: {}, targets: {} },\n\tsettings: {},\n}\n\nexport const schemaType: Typesafe.Type<Schema> = Typesafe.object({\n\tmodel: modelSchema,\n\tacl: aclSchema,\n\tvalidation: validationSchema,\n\tactions: Typesafe.coalesce(actionsSchema, { triggers: {}, targets: {} }),\n\tsettings: Typesafe.coalesce(settingsSchema, {}),\n})\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBO,MAAM,cAAsB;AAAA,EAClC,OAAO;AAAA,EACP,KAAK,EAAE,OAAO,GAAC;AAAA,EACf,YAAY,CAAA;AAAA,EACZ,SAAS,EAAE,UAAU,IAAI,SAAS,CAAA,EAAC;AAAA,EACnC,UAAU,CAAA;AACX;AAEO,MAAM,aAAoC,SAAS,OAAO;AAAA,EAChE,OAAO;AAAA,EACP,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,SAAS,SAAS,SAAS,eAAe,EAAE,UAAU,CAAA,GAAI,SAAS,CAAA,GAAI;AAAA,EACvE,UAAU,SAAS,SAAS,gBAAgB,CAAA,CAAE;AAC/C,CAAC;"}

package/dist/development/src/acl/PredicateDefinitionProcessor.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PredicateDefinitionProcessor.cjs","sources":["../../../../../packages/schema-utils/src/acl/PredicateDefinitionProcessor.ts"],"sourcesContent":["import { acceptFieldVisitor } from '../model'\nimport { Acl, Input, Model, Writable } from '@contember/schema'\n\nclass PredicateDefinitionProcessor {\n\tconstructor(private readonly schema: Model.Schema) {}\n\n\tpublic process<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t): Input.Where<WhereValue> {\n\t\treturn this.processInternal(entity, definition, handler, [])\n\t}\n\n\tprivate processInternal<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t\tpath: string[],\n\t): Input.Where<WhereValue> {\n\t\tconst result: Writable<Input.Where<WhereValue>> = {}\n\t\tfor (const [key, value] of Object.entries(definition)) {\n\t\t\tif (value === undefined) {\n\t\t\t\t// do nothing\n\t\t\t} else if (key === 'not') {\n\t\t\t\tresult.not = this.processInternal(entity, value as Acl.PredicateDefinition<PredicateExtension>, handler, [\n\t\t\t\t\t...path,\n\t\t\t\t\tkey,\n\t\t\t\t])\n\t\t\t} else if (key === 'and' \|\| key === 'or') {\n\t\t\t\tresult[key] = (value as Acl.PredicateDefinition[]).map(it => this.processInternal(entity, it, handler, [...path, key]))\n\t\t\t} else if (!entity.fields[key] && handler.handleUndefinedField) {\n\t\t\t\tconst undefinedResult = handler.handleUndefinedField({ entity, name: key, value, path })\n\t\t\t\tif (undefinedResult !== undefined) {\n\t\t\t\t\tresult[key] = undefinedResult as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tconst fieldWhere = acceptFieldVisitor<\n\t\t\t\t\tWhereValue \| Input.Where \| Input.Condition \| [string, WhereValue \| Input.Where \| Input.Condition] \| undefined\n\t\t\t\t>(this.schema, entity, key, {\n\t\t\t\t\tvisitColumn: ({ entity, column }) => {\n\t\t\t\t\t\treturn handler.handleColumn({\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\tcolumn,\n\t\t\t\t\t\t\tvalue: value as Input.Condition \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t},\n\t\t\t\t\tvisitRelation: ({ entity, relation, targetEntity }) => {\n\t\t\t\t\t\tconst processedValue = handler.handleRelation({\n\t\t\t\t\t\t\trelation,\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\tvalue: value as Acl.PredicateVariable \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t\tif (\n\t\t\t\t\t\t\ttypeof processedValue === 'object'\n\t\t\t\t\t\t\t&& processedValue !== null\n\t\t\t\t\t\t\t&& 'constructor' in processedValue\n\t\t\t\t\t\t\t&& processedValue.constructor.name === 'Object'\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\treturn this.processInternal(\n\t\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\t\tprocessedValue as Acl.PredicateDefinition<PredicateExtension>,\n\t\t\t\t\t\t\t\thandler,\n\t\t\t\t\t\t\t\t[...path, key],\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn processedValue\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t\tif (fieldWhere === undefined) {\n\t\t\t\t\t// do nothing\n\t\t\t\t} else if (Array.isArray(fieldWhere) && fieldWhere.length === 2) {\n\t\t\t\t\tresult[fieldWhere[0]] = fieldWhere[1] as (typeof result)[keyof typeof result]\n\t\t\t\t} else {\n\t\t\t\t\tresult[key] = fieldWhere as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result\n\t}\n}\n\nnamespace PredicateDefinitionProcessor {\n\texport interface Handler<R, T> {\n\t\thandleColumn(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable \| Input.Condition\n\t\t\tentity: Model.Entity\n\t\t\tcolumn: Model.AnyColumn\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| Input.Condition \| undefined \| [string, R \| Input.Where \| Input.Condition]\n\n\t\thandleRelation(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable\n\t\t\tentity: Model.Entity\n\t\t\trelation: Model.Relation\n\t\t\ttargetEntity: Model.Entity\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| undefined \| [string, R \| Input.Where]\n\n\t\thandleUndefinedField?(ctx: {\n\t\t\tentity: Model.Entity\n\t\t\tname: string\n\t\t\tvalue: any\n\t\t\tpath: string[]\n\t\t}): never \| undefined \| R \| Input.Where\n\t}\n}\n\nexport { PredicateDefinitionProcessor }\n"],"names":["acceptFieldVisitor","entity"],"mappings":";;;;AAGA,MAAM,6BAA6B;AAAA,EAClC,YAA6B,QAAsB;AAAtB,SAAA,SAAA;AAAA,EAAuB;AAAA,EAE7C,QACN,QACA,YACA,SAC0B;AAC1B,WAAO,KAAK,gBAAgB,QAAQ,YAAY,SAAS,CAAA,CAAE;AAAA,EAC5D;AAAA,EAEQ,gBACP,QACA,YACA,SACA,MAC0B;AAC1B,UAAM,SAA4C,CAAA;AAClD,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,UAAU,GAAG;AACtD,UAAI,UAAU,OAAW;AAAA,eAEd,QAAQ,OAAO;AACzB,eAAO,MAAM,KAAK,gBAAgB,QAAQ,OAAsD,SAAS;AAAA,UACxG,GAAG;AAAA,UACH;AAAA,QAAA,CACA;AAAA,MACF,WAAW,QAAQ,SAAS,QAAQ,MAAM;AACzC,eAAO,GAAG,IAAK,MAAoC,IAAI,QAAM,KAAK,gBAAgB,QAAQ,IAAI,SAAS,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;AAAA,MACvH,WAAW,CAAC,OAAO,OAAO,GAAG,KAAK,QAAQ,sBAAsB;AAC/D,cAAM,kBAAkB,QAAQ,qBAAqB,EAAE,QAAQ,MAAM,KAAK,OAAO,MAAM;AACvF,YAAI,oBAAoB,QAAW;AAClC,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD,OAAO;AACN,cAAM,aAAaA,WAAAA,mBAEjB,KAAK,QAAQ,QAAQ,KAAK;AAAA,UAC3B,aAAa,CAAC,EAAE,QAAAC,SAAQ,aAAa;AACpC,mBAAO,QAAQ,aAAa;AAAA,cAC3B,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AAAA,UACF;AAAA,UACA,eAAe,CAAC,EAAE,QAAAA,SAAQ,UAAU,mBAAmB;AACtD,kBAAM,iBAAiB,QAAQ,eAAe;AAAA,cAC7C;AAAA,cACA,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AACD,gBACC,OAAO,mBAAmB,YACvB,mBAAmB,QACnB,iBAAiB,kBACjB,eAAe,YAAY,SAAS,UACtC;AACD,qBAAO,KAAK;AAAA,gBACX;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,CAAC,GAAG,MAAM,GAAG;AAAA,cAAA;AAAA,YAEf;AACA,mBAAO;AAAA,UACR;AAAA,QAAA,CACA;AACD,YAAI,eAAe,OAAW;AAAA,iBAEnB,MAAM,QAAQ,UAAU,KAAK,WAAW,WAAW,GAAG;AAChE,iBAAO,WAAW,CAAC,CAAC,IAAI,WAAW,CAAC;AAAA,QACrC,OAAO;AACN,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD;AAAA,IACD;AACA,WAAO;AAAA,EACR;AACD;;"}
1	+ {"version":3,"file":"PredicateDefinitionProcessor.cjs","sources":["../../../../../packages/schema-utils/src/acl/PredicateDefinitionProcessor.ts"],"sourcesContent":["import { acceptFieldVisitor } from '../model/index.js'\nimport { Acl, Input, Model, Writable } from '@contember/schema'\n\nclass PredicateDefinitionProcessor {\n\tconstructor(private readonly schema: Model.Schema) {}\n\n\tpublic process<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t): Input.Where<WhereValue> {\n\t\treturn this.processInternal(entity, definition, handler, [])\n\t}\n\n\tprivate processInternal<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t\tpath: string[],\n\t): Input.Where<WhereValue> {\n\t\tconst result: Writable<Input.Where<WhereValue>> = {}\n\t\tfor (const [key, value] of Object.entries(definition)) {\n\t\t\tif (value === undefined) {\n\t\t\t\t// do nothing\n\t\t\t} else if (key === 'not') {\n\t\t\t\tresult.not = this.processInternal(entity, value as Acl.PredicateDefinition<PredicateExtension>, handler, [\n\t\t\t\t\t...path,\n\t\t\t\t\tkey,\n\t\t\t\t])\n\t\t\t} else if (key === 'and' \|\| key === 'or') {\n\t\t\t\tresult[key] = (value as Acl.PredicateDefinition[]).map(it => this.processInternal(entity, it, handler, [...path, key]))\n\t\t\t} else if (!entity.fields[key] && handler.handleUndefinedField) {\n\t\t\t\tconst undefinedResult = handler.handleUndefinedField({ entity, name: key, value, path })\n\t\t\t\tif (undefinedResult !== undefined) {\n\t\t\t\t\tresult[key] = undefinedResult as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tconst fieldWhere = acceptFieldVisitor<\n\t\t\t\t\tWhereValue \| Input.Where \| Input.Condition \| [string, WhereValue \| Input.Where \| Input.Condition] \| undefined\n\t\t\t\t>(this.schema, entity, key, {\n\t\t\t\t\tvisitColumn: ({ entity, column }) => {\n\t\t\t\t\t\treturn handler.handleColumn({\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\tcolumn,\n\t\t\t\t\t\t\tvalue: value as Input.Condition \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t},\n\t\t\t\t\tvisitRelation: ({ entity, relation, targetEntity }) => {\n\t\t\t\t\t\tconst processedValue = handler.handleRelation({\n\t\t\t\t\t\t\trelation,\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\tvalue: value as Acl.PredicateVariable \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t\tif (\n\t\t\t\t\t\t\ttypeof processedValue === 'object'\n\t\t\t\t\t\t\t&& processedValue !== null\n\t\t\t\t\t\t\t&& 'constructor' in processedValue\n\t\t\t\t\t\t\t&& processedValue.constructor.name === 'Object'\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\treturn this.processInternal(\n\t\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\t\tprocessedValue as Acl.PredicateDefinition<PredicateExtension>,\n\t\t\t\t\t\t\t\thandler,\n\t\t\t\t\t\t\t\t[...path, key],\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn processedValue\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t\tif (fieldWhere === undefined) {\n\t\t\t\t\t// do nothing\n\t\t\t\t} else if (Array.isArray(fieldWhere) && fieldWhere.length === 2) {\n\t\t\t\t\tresult[fieldWhere[0]] = fieldWhere[1] as (typeof result)[keyof typeof result]\n\t\t\t\t} else {\n\t\t\t\t\tresult[key] = fieldWhere as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result\n\t}\n}\n\nnamespace PredicateDefinitionProcessor {\n\texport interface Handler<R, T> {\n\t\thandleColumn(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable \| Input.Condition\n\t\t\tentity: Model.Entity\n\t\t\tcolumn: Model.AnyColumn\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| Input.Condition \| undefined \| [string, R \| Input.Where \| Input.Condition]\n\n\t\thandleRelation(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable\n\t\t\tentity: Model.Entity\n\t\t\trelation: Model.Relation\n\t\t\ttargetEntity: Model.Entity\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| undefined \| [string, R \| Input.Where]\n\n\t\thandleUndefinedField?(ctx: {\n\t\t\tentity: Model.Entity\n\t\t\tname: string\n\t\t\tvalue: any\n\t\t\tpath: string[]\n\t\t}): never \| undefined \| R \| Input.Where\n\t}\n}\n\nexport { PredicateDefinitionProcessor }\n"],"names":["acceptFieldVisitor","entity"],"mappings":";;;;AAGA,MAAM,6BAA6B;AAAA,EAClC,YAA6B,QAAsB;AAAtB,SAAA,SAAA;AAAA,EAAuB;AAAA,EAE7C,QACN,QACA,YACA,SAC0B;AAC1B,WAAO,KAAK,gBAAgB,QAAQ,YAAY,SAAS,CAAA,CAAE;AAAA,EAC5D;AAAA,EAEQ,gBACP,QACA,YACA,SACA,MAC0B;AAC1B,UAAM,SAA4C,CAAA;AAClD,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,UAAU,GAAG;AACtD,UAAI,UAAU,OAAW;AAAA,eAEd,QAAQ,OAAO;AACzB,eAAO,MAAM,KAAK,gBAAgB,QAAQ,OAAsD,SAAS;AAAA,UACxG,GAAG;AAAA,UACH;AAAA,QAAA,CACA;AAAA,MACF,WAAW,QAAQ,SAAS,QAAQ,MAAM;AACzC,eAAO,GAAG,IAAK,MAAoC,IAAI,QAAM,KAAK,gBAAgB,QAAQ,IAAI,SAAS,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;AAAA,MACvH,WAAW,CAAC,OAAO,OAAO,GAAG,KAAK,QAAQ,sBAAsB;AAC/D,cAAM,kBAAkB,QAAQ,qBAAqB,EAAE,QAAQ,MAAM,KAAK,OAAO,MAAM;AACvF,YAAI,oBAAoB,QAAW;AAClC,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD,OAAO;AACN,cAAM,aAAaA,WAAAA,mBAEjB,KAAK,QAAQ,QAAQ,KAAK;AAAA,UAC3B,aAAa,CAAC,EAAE,QAAAC,SAAQ,aAAa;AACpC,mBAAO,QAAQ,aAAa;AAAA,cAC3B,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AAAA,UACF;AAAA,UACA,eAAe,CAAC,EAAE,QAAAA,SAAQ,UAAU,mBAAmB;AACtD,kBAAM,iBAAiB,QAAQ,eAAe;AAAA,cAC7C;AAAA,cACA,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AACD,gBACC,OAAO,mBAAmB,YACvB,mBAAmB,QACnB,iBAAiB,kBACjB,eAAe,YAAY,SAAS,UACtC;AACD,qBAAO,KAAK;AAAA,gBACX;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,CAAC,GAAG,MAAM,GAAG;AAAA,cAAA;AAAA,YAEf;AACA,mBAAO;AAAA,UACR;AAAA,QAAA,CACA;AACD,YAAI,eAAe,OAAW;AAAA,iBAEnB,MAAM,QAAQ,UAAU,KAAK,WAAW,WAAW,GAAG;AAChE,iBAAO,WAAW,CAAC,CAAC,IAAI,WAAW,CAAC;AAAA,QACrC,OAAO;AACN,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD;AAAA,IACD;AACA,WAAO;AAAA,EACR;AACD;;"}

package/dist/development/src/acl/PredicateDefinitionProcessor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PredicateDefinitionProcessor.js","sources":["../../../../../packages/schema-utils/src/acl/PredicateDefinitionProcessor.ts"],"sourcesContent":["import { acceptFieldVisitor } from '../model'\nimport { Acl, Input, Model, Writable } from '@contember/schema'\n\nclass PredicateDefinitionProcessor {\n\tconstructor(private readonly schema: Model.Schema) {}\n\n\tpublic process<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t): Input.Where<WhereValue> {\n\t\treturn this.processInternal(entity, definition, handler, [])\n\t}\n\n\tprivate processInternal<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t\tpath: string[],\n\t): Input.Where<WhereValue> {\n\t\tconst result: Writable<Input.Where<WhereValue>> = {}\n\t\tfor (const [key, value] of Object.entries(definition)) {\n\t\t\tif (value === undefined) {\n\t\t\t\t// do nothing\n\t\t\t} else if (key === 'not') {\n\t\t\t\tresult.not = this.processInternal(entity, value as Acl.PredicateDefinition<PredicateExtension>, handler, [\n\t\t\t\t\t...path,\n\t\t\t\t\tkey,\n\t\t\t\t])\n\t\t\t} else if (key === 'and' \|\| key === 'or') {\n\t\t\t\tresult[key] = (value as Acl.PredicateDefinition[]).map(it => this.processInternal(entity, it, handler, [...path, key]))\n\t\t\t} else if (!entity.fields[key] && handler.handleUndefinedField) {\n\t\t\t\tconst undefinedResult = handler.handleUndefinedField({ entity, name: key, value, path })\n\t\t\t\tif (undefinedResult !== undefined) {\n\t\t\t\t\tresult[key] = undefinedResult as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tconst fieldWhere = acceptFieldVisitor<\n\t\t\t\t\tWhereValue \| Input.Where \| Input.Condition \| [string, WhereValue \| Input.Where \| Input.Condition] \| undefined\n\t\t\t\t>(this.schema, entity, key, {\n\t\t\t\t\tvisitColumn: ({ entity, column }) => {\n\t\t\t\t\t\treturn handler.handleColumn({\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\tcolumn,\n\t\t\t\t\t\t\tvalue: value as Input.Condition \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t},\n\t\t\t\t\tvisitRelation: ({ entity, relation, targetEntity }) => {\n\t\t\t\t\t\tconst processedValue = handler.handleRelation({\n\t\t\t\t\t\t\trelation,\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\tvalue: value as Acl.PredicateVariable \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t\tif (\n\t\t\t\t\t\t\ttypeof processedValue === 'object'\n\t\t\t\t\t\t\t&& processedValue !== null\n\t\t\t\t\t\t\t&& 'constructor' in processedValue\n\t\t\t\t\t\t\t&& processedValue.constructor.name === 'Object'\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\treturn this.processInternal(\n\t\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\t\tprocessedValue as Acl.PredicateDefinition<PredicateExtension>,\n\t\t\t\t\t\t\t\thandler,\n\t\t\t\t\t\t\t\t[...path, key],\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn processedValue\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t\tif (fieldWhere === undefined) {\n\t\t\t\t\t// do nothing\n\t\t\t\t} else if (Array.isArray(fieldWhere) && fieldWhere.length === 2) {\n\t\t\t\t\tresult[fieldWhere[0]] = fieldWhere[1] as (typeof result)[keyof typeof result]\n\t\t\t\t} else {\n\t\t\t\t\tresult[key] = fieldWhere as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result\n\t}\n}\n\nnamespace PredicateDefinitionProcessor {\n\texport interface Handler<R, T> {\n\t\thandleColumn(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable \| Input.Condition\n\t\t\tentity: Model.Entity\n\t\t\tcolumn: Model.AnyColumn\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| Input.Condition \| undefined \| [string, R \| Input.Where \| Input.Condition]\n\n\t\thandleRelation(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable\n\t\t\tentity: Model.Entity\n\t\t\trelation: Model.Relation\n\t\t\ttargetEntity: Model.Entity\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| undefined \| [string, R \| Input.Where]\n\n\t\thandleUndefinedField?(ctx: {\n\t\t\tentity: Model.Entity\n\t\t\tname: string\n\t\t\tvalue: any\n\t\t\tpath: string[]\n\t\t}): never \| undefined \| R \| Input.Where\n\t}\n}\n\nexport { PredicateDefinitionProcessor }\n"],"names":["entity"],"mappings":";;AAGA,MAAM,6BAA6B;AAAA,EAClC,YAA6B,QAAsB;AAAtB,SAAA,SAAA;AAAA,EAAuB;AAAA,EAE7C,QACN,QACA,YACA,SAC0B;AAC1B,WAAO,KAAK,gBAAgB,QAAQ,YAAY,SAAS,CAAA,CAAE;AAAA,EAC5D;AAAA,EAEQ,gBACP,QACA,YACA,SACA,MAC0B;AAC1B,UAAM,SAA4C,CAAA;AAClD,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,UAAU,GAAG;AACtD,UAAI,UAAU,OAAW;AAAA,eAEd,QAAQ,OAAO;AACzB,eAAO,MAAM,KAAK,gBAAgB,QAAQ,OAAsD,SAAS;AAAA,UACxG,GAAG;AAAA,UACH;AAAA,QAAA,CACA;AAAA,MACF,WAAW,QAAQ,SAAS,QAAQ,MAAM;AACzC,eAAO,GAAG,IAAK,MAAoC,IAAI,QAAM,KAAK,gBAAgB,QAAQ,IAAI,SAAS,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;AAAA,MACvH,WAAW,CAAC,OAAO,OAAO,GAAG,KAAK,QAAQ,sBAAsB;AAC/D,cAAM,kBAAkB,QAAQ,qBAAqB,EAAE,QAAQ,MAAM,KAAK,OAAO,MAAM;AACvF,YAAI,oBAAoB,QAAW;AAClC,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD,OAAO;AACN,cAAM,aAAa,mBAEjB,KAAK,QAAQ,QAAQ,KAAK;AAAA,UAC3B,aAAa,CAAC,EAAE,QAAAA,SAAQ,aAAa;AACpC,mBAAO,QAAQ,aAAa;AAAA,cAC3B,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AAAA,UACF;AAAA,UACA,eAAe,CAAC,EAAE,QAAAA,SAAQ,UAAU,mBAAmB;AACtD,kBAAM,iBAAiB,QAAQ,eAAe;AAAA,cAC7C;AAAA,cACA,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AACD,gBACC,OAAO,mBAAmB,YACvB,mBAAmB,QACnB,iBAAiB,kBACjB,eAAe,YAAY,SAAS,UACtC;AACD,qBAAO,KAAK;AAAA,gBACX;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,CAAC,GAAG,MAAM,GAAG;AAAA,cAAA;AAAA,YAEf;AACA,mBAAO;AAAA,UACR;AAAA,QAAA,CACA;AACD,YAAI,eAAe,OAAW;AAAA,iBAEnB,MAAM,QAAQ,UAAU,KAAK,WAAW,WAAW,GAAG;AAChE,iBAAO,WAAW,CAAC,CAAC,IAAI,WAAW,CAAC;AAAA,QACrC,OAAO;AACN,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD;AAAA,IACD;AACA,WAAO;AAAA,EACR;AACD;"}
1	+ {"version":3,"file":"PredicateDefinitionProcessor.js","sources":["../../../../../packages/schema-utils/src/acl/PredicateDefinitionProcessor.ts"],"sourcesContent":["import { acceptFieldVisitor } from '../model/index.js'\nimport { Acl, Input, Model, Writable } from '@contember/schema'\n\nclass PredicateDefinitionProcessor {\n\tconstructor(private readonly schema: Model.Schema) {}\n\n\tpublic process<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t): Input.Where<WhereValue> {\n\t\treturn this.processInternal(entity, definition, handler, [])\n\t}\n\n\tprivate processInternal<WhereValue, PredicateExtension = never>(\n\t\tentity: Model.Entity,\n\t\tdefinition: Acl.PredicateDefinition<PredicateExtension>,\n\t\thandler: PredicateDefinitionProcessor.Handler<WhereValue, PredicateExtension>,\n\t\tpath: string[],\n\t): Input.Where<WhereValue> {\n\t\tconst result: Writable<Input.Where<WhereValue>> = {}\n\t\tfor (const [key, value] of Object.entries(definition)) {\n\t\t\tif (value === undefined) {\n\t\t\t\t// do nothing\n\t\t\t} else if (key === 'not') {\n\t\t\t\tresult.not = this.processInternal(entity, value as Acl.PredicateDefinition<PredicateExtension>, handler, [\n\t\t\t\t\t...path,\n\t\t\t\t\tkey,\n\t\t\t\t])\n\t\t\t} else if (key === 'and' \|\| key === 'or') {\n\t\t\t\tresult[key] = (value as Acl.PredicateDefinition[]).map(it => this.processInternal(entity, it, handler, [...path, key]))\n\t\t\t} else if (!entity.fields[key] && handler.handleUndefinedField) {\n\t\t\t\tconst undefinedResult = handler.handleUndefinedField({ entity, name: key, value, path })\n\t\t\t\tif (undefinedResult !== undefined) {\n\t\t\t\t\tresult[key] = undefinedResult as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tconst fieldWhere = acceptFieldVisitor<\n\t\t\t\t\tWhereValue \| Input.Where \| Input.Condition \| [string, WhereValue \| Input.Where \| Input.Condition] \| undefined\n\t\t\t\t>(this.schema, entity, key, {\n\t\t\t\t\tvisitColumn: ({ entity, column }) => {\n\t\t\t\t\t\treturn handler.handleColumn({\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\tcolumn,\n\t\t\t\t\t\t\tvalue: value as Input.Condition \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t},\n\t\t\t\t\tvisitRelation: ({ entity, relation, targetEntity }) => {\n\t\t\t\t\t\tconst processedValue = handler.handleRelation({\n\t\t\t\t\t\t\trelation,\n\t\t\t\t\t\t\tentity,\n\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\tvalue: value as Acl.PredicateVariable \| PredicateExtension,\n\t\t\t\t\t\t\tpath,\n\t\t\t\t\t\t})\n\t\t\t\t\t\tif (\n\t\t\t\t\t\t\ttypeof processedValue === 'object'\n\t\t\t\t\t\t\t&& processedValue !== null\n\t\t\t\t\t\t\t&& 'constructor' in processedValue\n\t\t\t\t\t\t\t&& processedValue.constructor.name === 'Object'\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\treturn this.processInternal(\n\t\t\t\t\t\t\t\ttargetEntity,\n\t\t\t\t\t\t\t\tprocessedValue as Acl.PredicateDefinition<PredicateExtension>,\n\t\t\t\t\t\t\t\thandler,\n\t\t\t\t\t\t\t\t[...path, key],\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t}\n\t\t\t\t\t\treturn processedValue\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t\tif (fieldWhere === undefined) {\n\t\t\t\t\t// do nothing\n\t\t\t\t} else if (Array.isArray(fieldWhere) && fieldWhere.length === 2) {\n\t\t\t\t\tresult[fieldWhere[0]] = fieldWhere[1] as (typeof result)[keyof typeof result]\n\t\t\t\t} else {\n\t\t\t\t\tresult[key] = fieldWhere as (typeof result)[keyof typeof result]\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result\n\t}\n}\n\nnamespace PredicateDefinitionProcessor {\n\texport interface Handler<R, T> {\n\t\thandleColumn(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable \| Input.Condition\n\t\t\tentity: Model.Entity\n\t\t\tcolumn: Model.AnyColumn\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| Input.Condition \| undefined \| [string, R \| Input.Where \| Input.Condition]\n\n\t\thandleRelation(ctx: {\n\t\t\tvalue: T \| Acl.PredicateVariable\n\t\t\tentity: Model.Entity\n\t\t\trelation: Model.Relation\n\t\t\ttargetEntity: Model.Entity\n\t\t\tpath: string[]\n\t\t}): R \| Input.Where \| undefined \| [string, R \| Input.Where]\n\n\t\thandleUndefinedField?(ctx: {\n\t\t\tentity: Model.Entity\n\t\t\tname: string\n\t\t\tvalue: any\n\t\t\tpath: string[]\n\t\t}): never \| undefined \| R \| Input.Where\n\t}\n}\n\nexport { PredicateDefinitionProcessor }\n"],"names":["entity"],"mappings":";;AAGA,MAAM,6BAA6B;AAAA,EAClC,YAA6B,QAAsB;AAAtB,SAAA,SAAA;AAAA,EAAuB;AAAA,EAE7C,QACN,QACA,YACA,SAC0B;AAC1B,WAAO,KAAK,gBAAgB,QAAQ,YAAY,SAAS,CAAA,CAAE;AAAA,EAC5D;AAAA,EAEQ,gBACP,QACA,YACA,SACA,MAC0B;AAC1B,UAAM,SAA4C,CAAA;AAClD,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,UAAU,GAAG;AACtD,UAAI,UAAU,OAAW;AAAA,eAEd,QAAQ,OAAO;AACzB,eAAO,MAAM,KAAK,gBAAgB,QAAQ,OAAsD,SAAS;AAAA,UACxG,GAAG;AAAA,UACH;AAAA,QAAA,CACA;AAAA,MACF,WAAW,QAAQ,SAAS,QAAQ,MAAM;AACzC,eAAO,GAAG,IAAK,MAAoC,IAAI,QAAM,KAAK,gBAAgB,QAAQ,IAAI,SAAS,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;AAAA,MACvH,WAAW,CAAC,OAAO,OAAO,GAAG,KAAK,QAAQ,sBAAsB;AAC/D,cAAM,kBAAkB,QAAQ,qBAAqB,EAAE,QAAQ,MAAM,KAAK,OAAO,MAAM;AACvF,YAAI,oBAAoB,QAAW;AAClC,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD,OAAO;AACN,cAAM,aAAa,mBAEjB,KAAK,QAAQ,QAAQ,KAAK;AAAA,UAC3B,aAAa,CAAC,EAAE,QAAAA,SAAQ,aAAa;AACpC,mBAAO,QAAQ,aAAa;AAAA,cAC3B,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AAAA,UACF;AAAA,UACA,eAAe,CAAC,EAAE,QAAAA,SAAQ,UAAU,mBAAmB;AACtD,kBAAM,iBAAiB,QAAQ,eAAe;AAAA,cAC7C;AAAA,cACA,QAAAA;AAAAA,cACA;AAAA,cACA;AAAA,cACA;AAAA,YAAA,CACA;AACD,gBACC,OAAO,mBAAmB,YACvB,mBAAmB,QACnB,iBAAiB,kBACjB,eAAe,YAAY,SAAS,UACtC;AACD,qBAAO,KAAK;AAAA,gBACX;AAAA,gBACA;AAAA,gBACA;AAAA,gBACA,CAAC,GAAG,MAAM,GAAG;AAAA,cAAA;AAAA,YAEf;AACA,mBAAO;AAAA,UACR;AAAA,QAAA,CACA;AACD,YAAI,eAAe,OAAW;AAAA,iBAEnB,MAAM,QAAQ,UAAU,KAAK,WAAW,WAAW,GAAG;AAChE,iBAAO,WAAW,CAAC,CAAC,IAAI,WAAW,CAAC;AAAA,QACrC,OAAO;AACN,iBAAO,GAAG,IAAI;AAAA,QACf;AAAA,MACD;AAAA,IACD;AACA,WAAO;AAAA,EACR;AACD;"}

package/dist/development/src/dataUtils.cjs CHANGED Viewed

@@ -11,6 +11,7 @@ const resolveDefaultValue = (column, providers) => {
     case schema.Model.ColumnType.Int:
     case schema.Model.ColumnType.Enum:
     case schema.Model.ColumnType.Double:
+    case schema.Model.ColumnType.Numeric:
     case schema.Model.ColumnType.Bool:
     case schema.Model.ColumnType.Json:
       if (typeof column.default !== "undefined") {

package/dist/development/src/dataUtils.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dataUtils.cjs","sources":["../../../../packages/schema-utils/src/dataUtils.ts"],"sourcesContent":["import { Input, Model, Value } from '@contember/schema'\n\nexport interface Providers {\n\tuuid: (args?: { version?: 4 \| 7 }) => string\n\tnow: () => Date\n}\n\nexport const resolveDefaultValue = (column: Model.AnyColumn, providers: Pick<Providers, 'now'>) => {\n\tconst type = column.type\n\n\tif (type === Model.ColumnType.Int && column.sequence) {\n\t\treturn undefined\n\t}\n\n\tswitch (type) {\n\t\tcase Model.ColumnType.String:\n\t\tcase Model.ColumnType.Int:\n\t\tcase Model.ColumnType.Enum:\n\t\tcase Model.ColumnType.Double:\n\t\tcase Model.ColumnType.Bool:\n\t\tcase Model.ColumnType.Json:\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.DateTime:\n\t\tcase Model.ColumnType.Date:\n\t\tcase Model.ColumnType.Time:\n\t\t\tif (column.default === 'now') {\n\t\t\t\treturn providers.now().toISOString()\n\t\t\t}\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.Uuid:\n\t\t\tbreak\n\t\tdefault:\n\t\t\t;((x: never) => {})(type)\n\t}\n\n\tif (column.nullable) {\n\t\treturn null\n\t}\n\n\tthrow new NoDataError(`No data for column ${column.name}`)\n}\n\nexport const resolveColumnValue = (\n\t{\n\t\tentity,\n\t\tcolumn,\n\t\tinput,\n\t}: {\n\t\tentity: Model.Entity\n\t\tcolumn: Model.AnyColumn\n\t\tinput: Input.ColumnValue \| undefined\n\t},\n\tproviders: Providers,\n\toptions: {\n\t\tuuidVersion?: 4 \| 7\n\t},\n): Value.FieldValue \| undefined => {\n\tif (input !== undefined) {\n\t\treturn input\n\t}\n\tif (entity.primary === column.name) {\n\t\tif (column.type === Model.ColumnType.Uuid) {\n\t\t\treturn providers.uuid({ version: options.uuidVersion })\n\t\t}\n\t\treturn undefined\n\t}\n\n\treturn resolveDefaultValue(column, providers)\n}\n\nexport class NoDataError extends Error {}\n"],"names":["Model"],"mappings":";;;AAOO,MAAM,sBAAsB,CAAC,QAAyB,cAAsC;AAClG,QAAM,OAAO,OAAO;AAEpB,MAAI,SAASA,OAAAA,MAAM,WAAW,OAAO,OAAO,UAAU;AACrD,WAAO;AAAA,EACR;AAEA,UAAQ,MAAA;AAAA,IACP,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AACrB,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AACrB,UAAI,OAAO,YAAY,OAAO;AAC7B,eAAO,UAAU,IAAA,EAAM,YAAA;AAAA,MACxB;AACA,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAKA,OAAAA,MAAM,WAAW;AACrB;AAAA,EAEwB;AAG1B,MAAI,OAAO,UAAU;AACpB,WAAO;AAAA,EACR;AAEA,QAAM,IAAI,YAAY,sBAAsB,OAAO,IAAI,EAAE;AAC1D;AAEO,MAAM,qBAAqB,CACjC;AAAA,EACC;AAAA,EACA;AAAA,EACA;AACD,GAKA,WACA,YAGkC;AAClC,MAAI,UAAU,QAAW;AACxB,WAAO;AAAA,EACR;AACA,MAAI,OAAO,YAAY,OAAO,MAAM;AACnC,QAAI,OAAO,SAASA,aAAM,WAAW,MAAM;AAC1C,aAAO,UAAU,KAAK,EAAE,SAAS,QAAQ,aAAa;AAAA,IACvD;AACA,WAAO;AAAA,EACR;AAEA,SAAO,oBAAoB,QAAQ,SAAS;AAC7C;AAEO,MAAM,oBAAoB,MAAM;AAAC;;;;"}
1	+ {"version":3,"file":"dataUtils.cjs","sources":["../../../../packages/schema-utils/src/dataUtils.ts"],"sourcesContent":["import { Input, Model, Value } from '@contember/schema'\n\nexport interface Providers {\n\tuuid: (args?: { version?: 4 \| 7 }) => string\n\tnow: () => Date\n}\n\nexport const resolveDefaultValue = (column: Model.AnyColumn, providers: Pick<Providers, 'now'>) => {\n\tconst type = column.type\n\n\tif (type === Model.ColumnType.Int && column.sequence) {\n\t\treturn undefined\n\t}\n\n\tswitch (type) {\n\t\tcase Model.ColumnType.String:\n\t\tcase Model.ColumnType.Int:\n\t\tcase Model.ColumnType.Enum:\n\t\tcase Model.ColumnType.Double:\n\t\tcase Model.ColumnType.Numeric:\n\t\tcase Model.ColumnType.Bool:\n\t\tcase Model.ColumnType.Json:\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.DateTime:\n\t\tcase Model.ColumnType.Date:\n\t\tcase Model.ColumnType.Time:\n\t\t\tif (column.default === 'now') {\n\t\t\t\treturn providers.now().toISOString()\n\t\t\t}\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.Uuid:\n\t\t\tbreak\n\t\tdefault:\n\t\t\t;((x: never) => {})(type)\n\t}\n\n\tif (column.nullable) {\n\t\treturn null\n\t}\n\n\tthrow new NoDataError(`No data for column ${column.name}`)\n}\n\nexport const resolveColumnValue = (\n\t{\n\t\tentity,\n\t\tcolumn,\n\t\tinput,\n\t}: {\n\t\tentity: Model.Entity\n\t\tcolumn: Model.AnyColumn\n\t\tinput: Input.ColumnValue \| undefined\n\t},\n\tproviders: Providers,\n\toptions: {\n\t\tuuidVersion?: 4 \| 7\n\t},\n): Value.FieldValue \| undefined => {\n\tif (input !== undefined) {\n\t\treturn input\n\t}\n\tif (entity.primary === column.name) {\n\t\tif (column.type === Model.ColumnType.Uuid) {\n\t\t\treturn providers.uuid({ version: options.uuidVersion })\n\t\t}\n\t\treturn undefined\n\t}\n\n\treturn resolveDefaultValue(column, providers)\n}\n\nexport class NoDataError extends Error {}\n"],"names":["Model"],"mappings":";;;AAOO,MAAM,sBAAsB,CAAC,QAAyB,cAAsC;AAClG,QAAM,OAAO,OAAO;AAEpB,MAAI,SAASA,OAAAA,MAAM,WAAW,OAAO,OAAO,UAAU;AACrD,WAAO;AAAA,EACR;AAEA,UAAQ,MAAA;AAAA,IACP,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AACrB,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AAAA,IACtB,KAAKA,OAAAA,MAAM,WAAW;AACrB,UAAI,OAAO,YAAY,OAAO;AAC7B,eAAO,UAAU,IAAA,EAAM,YAAA;AAAA,MACxB;AACA,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAKA,OAAAA,MAAM,WAAW;AACrB;AAAA,EAEwB;AAG1B,MAAI,OAAO,UAAU;AACpB,WAAO;AAAA,EACR;AAEA,QAAM,IAAI,YAAY,sBAAsB,OAAO,IAAI,EAAE;AAC1D;AAEO,MAAM,qBAAqB,CACjC;AAAA,EACC;AAAA,EACA;AAAA,EACA;AACD,GAKA,WACA,YAGkC;AAClC,MAAI,UAAU,QAAW;AACxB,WAAO;AAAA,EACR;AACA,MAAI,OAAO,YAAY,OAAO,MAAM;AACnC,QAAI,OAAO,SAASA,aAAM,WAAW,MAAM;AAC1C,aAAO,UAAU,KAAK,EAAE,SAAS,QAAQ,aAAa;AAAA,IACvD;AACA,WAAO;AAAA,EACR;AAEA,SAAO,oBAAoB,QAAQ,SAAS;AAC7C;AAEO,MAAM,oBAAoB,MAAM;AAAC;;;;"}

package/dist/development/src/dataUtils.js CHANGED Viewed

@@ -9,6 +9,7 @@ const resolveDefaultValue = (column, providers) => {
     case Model.ColumnType.Int:
     case Model.ColumnType.Enum:
     case Model.ColumnType.Double:
+    case Model.ColumnType.Numeric:
     case Model.ColumnType.Bool:
     case Model.ColumnType.Json:
       if (typeof column.default !== "undefined") {

package/dist/development/src/dataUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dataUtils.js","sources":["../../../../packages/schema-utils/src/dataUtils.ts"],"sourcesContent":["import { Input, Model, Value } from '@contember/schema'\n\nexport interface Providers {\n\tuuid: (args?: { version?: 4 \| 7 }) => string\n\tnow: () => Date\n}\n\nexport const resolveDefaultValue = (column: Model.AnyColumn, providers: Pick<Providers, 'now'>) => {\n\tconst type = column.type\n\n\tif (type === Model.ColumnType.Int && column.sequence) {\n\t\treturn undefined\n\t}\n\n\tswitch (type) {\n\t\tcase Model.ColumnType.String:\n\t\tcase Model.ColumnType.Int:\n\t\tcase Model.ColumnType.Enum:\n\t\tcase Model.ColumnType.Double:\n\t\tcase Model.ColumnType.Bool:\n\t\tcase Model.ColumnType.Json:\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.DateTime:\n\t\tcase Model.ColumnType.Date:\n\t\tcase Model.ColumnType.Time:\n\t\t\tif (column.default === 'now') {\n\t\t\t\treturn providers.now().toISOString()\n\t\t\t}\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.Uuid:\n\t\t\tbreak\n\t\tdefault:\n\t\t\t;((x: never) => {})(type)\n\t}\n\n\tif (column.nullable) {\n\t\treturn null\n\t}\n\n\tthrow new NoDataError(`No data for column ${column.name}`)\n}\n\nexport const resolveColumnValue = (\n\t{\n\t\tentity,\n\t\tcolumn,\n\t\tinput,\n\t}: {\n\t\tentity: Model.Entity\n\t\tcolumn: Model.AnyColumn\n\t\tinput: Input.ColumnValue \| undefined\n\t},\n\tproviders: Providers,\n\toptions: {\n\t\tuuidVersion?: 4 \| 7\n\t},\n): Value.FieldValue \| undefined => {\n\tif (input !== undefined) {\n\t\treturn input\n\t}\n\tif (entity.primary === column.name) {\n\t\tif (column.type === Model.ColumnType.Uuid) {\n\t\t\treturn providers.uuid({ version: options.uuidVersion })\n\t\t}\n\t\treturn undefined\n\t}\n\n\treturn resolveDefaultValue(column, providers)\n}\n\nexport class NoDataError extends Error {}\n"],"names":[],"mappings":";AAOO,MAAM,sBAAsB,CAAC,QAAyB,cAAsC;AAClG,QAAM,OAAO,OAAO;AAEpB,MAAI,SAAS,MAAM,WAAW,OAAO,OAAO,UAAU;AACrD,WAAO;AAAA,EACR;AAEA,UAAQ,MAAA;AAAA,IACP,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AACrB,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AACrB,UAAI,OAAO,YAAY,OAAO;AAC7B,eAAO,UAAU,IAAA,EAAM,YAAA;AAAA,MACxB;AACA,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAK,MAAM,WAAW;AACrB;AAAA,EAEwB;AAG1B,MAAI,OAAO,UAAU;AACpB,WAAO;AAAA,EACR;AAEA,QAAM,IAAI,YAAY,sBAAsB,OAAO,IAAI,EAAE;AAC1D;AAEO,MAAM,qBAAqB,CACjC;AAAA,EACC;AAAA,EACA;AAAA,EACA;AACD,GAKA,WACA,YAGkC;AAClC,MAAI,UAAU,QAAW;AACxB,WAAO;AAAA,EACR;AACA,MAAI,OAAO,YAAY,OAAO,MAAM;AACnC,QAAI,OAAO,SAAS,MAAM,WAAW,MAAM;AAC1C,aAAO,UAAU,KAAK,EAAE,SAAS,QAAQ,aAAa;AAAA,IACvD;AACA,WAAO;AAAA,EACR;AAEA,SAAO,oBAAoB,QAAQ,SAAS;AAC7C;AAEO,MAAM,oBAAoB,MAAM;AAAC;"}
1	+ {"version":3,"file":"dataUtils.js","sources":["../../../../packages/schema-utils/src/dataUtils.ts"],"sourcesContent":["import { Input, Model, Value } from '@contember/schema'\n\nexport interface Providers {\n\tuuid: (args?: { version?: 4 \| 7 }) => string\n\tnow: () => Date\n}\n\nexport const resolveDefaultValue = (column: Model.AnyColumn, providers: Pick<Providers, 'now'>) => {\n\tconst type = column.type\n\n\tif (type === Model.ColumnType.Int && column.sequence) {\n\t\treturn undefined\n\t}\n\n\tswitch (type) {\n\t\tcase Model.ColumnType.String:\n\t\tcase Model.ColumnType.Int:\n\t\tcase Model.ColumnType.Enum:\n\t\tcase Model.ColumnType.Double:\n\t\tcase Model.ColumnType.Numeric:\n\t\tcase Model.ColumnType.Bool:\n\t\tcase Model.ColumnType.Json:\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.DateTime:\n\t\tcase Model.ColumnType.Date:\n\t\tcase Model.ColumnType.Time:\n\t\t\tif (column.default === 'now') {\n\t\t\t\treturn providers.now().toISOString()\n\t\t\t}\n\t\t\tif (typeof column.default !== 'undefined') {\n\t\t\t\treturn column.default\n\t\t\t}\n\t\t\tbreak\n\t\tcase Model.ColumnType.Uuid:\n\t\t\tbreak\n\t\tdefault:\n\t\t\t;((x: never) => {})(type)\n\t}\n\n\tif (column.nullable) {\n\t\treturn null\n\t}\n\n\tthrow new NoDataError(`No data for column ${column.name}`)\n}\n\nexport const resolveColumnValue = (\n\t{\n\t\tentity,\n\t\tcolumn,\n\t\tinput,\n\t}: {\n\t\tentity: Model.Entity\n\t\tcolumn: Model.AnyColumn\n\t\tinput: Input.ColumnValue \| undefined\n\t},\n\tproviders: Providers,\n\toptions: {\n\t\tuuidVersion?: 4 \| 7\n\t},\n): Value.FieldValue \| undefined => {\n\tif (input !== undefined) {\n\t\treturn input\n\t}\n\tif (entity.primary === column.name) {\n\t\tif (column.type === Model.ColumnType.Uuid) {\n\t\t\treturn providers.uuid({ version: options.uuidVersion })\n\t\t}\n\t\treturn undefined\n\t}\n\n\treturn resolveDefaultValue(column, providers)\n}\n\nexport class NoDataError extends Error {}\n"],"names":[],"mappings":";AAOO,MAAM,sBAAsB,CAAC,QAAyB,cAAsC;AAClG,QAAM,OAAO,OAAO;AAEpB,MAAI,SAAS,MAAM,WAAW,OAAO,OAAO,UAAU;AACrD,WAAO;AAAA,EACR;AAEA,UAAQ,MAAA;AAAA,IACP,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AACrB,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AAAA,IACtB,KAAK,MAAM,WAAW;AACrB,UAAI,OAAO,YAAY,OAAO;AAC7B,eAAO,UAAU,IAAA,EAAM,YAAA;AAAA,MACxB;AACA,UAAI,OAAO,OAAO,YAAY,aAAa;AAC1C,eAAO,OAAO;AAAA,MACf;AACA;AAAA,IACD,KAAK,MAAM,WAAW;AACrB;AAAA,EAEwB;AAG1B,MAAI,OAAO,UAAU;AACpB,WAAO;AAAA,EACR;AAEA,QAAM,IAAI,YAAY,sBAAsB,OAAO,IAAI,EAAE;AAC1D;AAEO,MAAM,qBAAqB,CACjC;AAAA,EACC;AAAA,EACA;AAAA,EACA;AACD,GAKA,WACA,YAGkC;AAClC,MAAI,UAAU,QAAW;AACxB,WAAO;AAAA,EACR;AACA,MAAI,OAAO,YAAY,OAAO,MAAM;AACnC,QAAI,OAAO,SAAS,MAAM,WAAW,MAAM;AAC1C,aAAO,UAAU,KAAK,EAAE,SAAS,QAAQ,aAAa;AAAA,IACvD;AACA,WAAO;AAAA,EACR;AAEA,SAAO,oBAAoB,QAAQ,SAAS;AAC7C;AAEO,MAAM,oBAAoB,MAAM;AAAC;"}

package/dist/development/src/definition-generator/AclDefinitionCodeGenerator.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AclDefinitionCodeGenerator.cjs","sources":["../../../../../packages/schema-utils/src/definition-generator/AclDefinitionCodeGenerator.ts"],"sourcesContent":["import { PredicateDefinitionProcessor } from '../acl'\nimport { IndentDecider, Literal, printJsValue } from '../utils/printJsValue'\nimport { Acl, Model, Schema } from '@contember/schema'\nimport { DefinitionNamingConventions } from './DefinitionNamingConventions'\n\nconst indentFirstLevel: IndentDecider = (val, path) => path.length === 0\n\nexport class AclDefinitionCodeGenerator {\n\tconstructor(\n\t\tprivate readonly definitionNamingConventions = new DefinitionNamingConventions(),\n\t) {\n\t}\n\n\tpublic generateRoles({ acl }: { acl: Acl.Schema }): string {\n\t\treturn Object.entries(acl.roles).map(([name, values]) =>\n\t\t\tthis.generateRole({\n\t\t\t\tname,\n\t\t\t\tvalues,\n\t\t\t})\n\t\t).join('')\n\t}\n\n\tprivate generateRole({ name, values }: { name: string; values: Acl.RolePermissions }): string {\n\t\tconst { variables, entities, inherits, ...other } = values\n\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(name)\n\t\treturn `\\nexport const ${roleVarName} = c.createRole(${printJsValue(name)}, ${printJsValue(other)})\\n`\n\t}\n\n\tpublic generateAclVariables({ acl }: { acl: Acl.Schema }): string {\n\t\tconst variablesOutput: string[] = []\n\n\t\tObject.entries(acl.roles).map(([roleName, roleValues]) => {\n\t\t\tObject.entries(roleValues.variables).map(([variableName, variableValues]) => {\n\t\t\t\tlet variableDefinition = `\\nexport const ${this.definitionNamingConventions.variableVarName(roleName, variableName)} = c.`\n\t\t\t\tconst varFormatted = printJsValue(variableName)\n\t\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\n\t\t\t\tif (variableValues.type === Acl.VariableType.predefined) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.value)\n\t\t\t\t\tvariableDefinition += `createPredefinedVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else if (variableValues.type === Acl.VariableType.entity) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.entityName)\n\t\t\t\t\tvariableDefinition += `createEntityVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else {\n\t\t\t\t\tthrow new Error(`Variable type ${variableValues.type} not yet supported`)\n\t\t\t\t}\n\n\t\t\t\tvariablesOutput.push(variableDefinition)\n\t\t\t})\n\t\t})\n\n\t\treturn variablesOutput.join('')\n\t}\n\n\tpublic generateEntityAcl({ entity, schema }: { entity: Model.Entity; schema: Schema }): string {\n\t\tconst aclOutput: string[] = []\n\t\tconst numberOfEntityFieldsWithoutId = Object.keys(entity.fields).length - 1\n\t\tfor (const [roleName, roleDefinition] of Object.entries(schema.acl.roles)) {\n\t\t\tconst entityPermission = roleDefinition.entities[entity.name]\n\t\t\tif (!entityPermission) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\t\t\tfor (const [predicateName, predicateDefinition] of Object.entries(entityPermission.predicates)) {\n\t\t\t\tconst operations = this.getMatchingOperations({\n\t\t\t\t\tpredicate: predicateName,\n\t\t\t\t\toperations: entityPermission.operations,\n\t\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t\t})\n\t\t\t\tif (Object.keys(operations).length > 0) {\n\t\t\t\t\tconst processor = new PredicateDefinitionProcessor(schema.model)\n\t\t\t\t\tconst when = processor.process(entity, predicateDefinition, {\n\t\t\t\t\t\thandleColumn: ctx => {\n\t\t\t\t\t\t\tif (typeof ctx.value === 'string' && ctx.value in roleDefinition.variables) {\n\t\t\t\t\t\t\t\treturn new Literal(this.definitionNamingConventions.variableVarName(roleName, ctx.value))\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t\thandleRelation: ctx => {\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t\tconst aclDefinition = printJsValue({ when, ...operations }, indentFirstLevel)\n\t\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst trueOperations = this.getMatchingOperations({\n\t\t\t\tpredicate: true,\n\t\t\t\toperations: entityPermission.operations,\n\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t})\n\t\t\tif (Object.keys(trueOperations).length > 0) {\n\t\t\t\tconst aclDefinition = printJsValue({ ...trueOperations }, indentFirstLevel)\n\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t}\n\t\t}\n\n\t\tif (!aclOutput.length) {\n\t\t\treturn ''\n\t\t}\n\t\treturn `${aclOutput.join('')}`\n\t}\n\n\tprivate getMatchingOperations({ operations, predicate, numberOfEntityFieldsWithoutId }: {\n\t\toperations: Acl.EntityOperations\n\t\tpredicate: Acl.Predicate\n\t\tnumberOfEntityFieldsWithoutId: number\n\t}): { read?: string[] \| true; create?: string[] \| boolean; update?: string[] \| boolean; delete?: true } {\n\t\tconst result: ReturnType<AclDefinitionCodeGenerator['getMatchingOperations']> = {}\n\t\tfor (const op of ['read', 'create', 'update'] as const) {\n\t\t\tconst fields = Object.entries(operations[op] ?? {}).filter(([, it]) => it === predicate).map(([it]) => it)\n\t\t\tif (fields.length === 0) {\n\t\t\t} else if (fields.length === numberOfEntityFieldsWithoutId) {\n\t\t\t\tresult[op] = true\n\t\t\t} else {\n\t\t\t\tresult[op] = fields\n\t\t\t}\n\t\t}\n\t\tif (operations.delete === predicate) {\n\t\t\tresult.delete = true\n\t\t}\n\n\t\treturn result\n\t}\n}\n"],"names":["DefinitionNamingConventions","printJsValue","Acl","schema","PredicateDefinitionProcessor","Literal"],"mappings":"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"}
1	+ {"version":3,"file":"AclDefinitionCodeGenerator.cjs","sources":["../../../../../packages/schema-utils/src/definition-generator/AclDefinitionCodeGenerator.ts"],"sourcesContent":["import { PredicateDefinitionProcessor } from '../acl/index.js'\nimport { IndentDecider, Literal, printJsValue } from '../utils/printJsValue.js'\nimport { Acl, Model, Schema } from '@contember/schema'\nimport { DefinitionNamingConventions } from './DefinitionNamingConventions.js'\n\nconst indentFirstLevel: IndentDecider = (val, path) => path.length === 0\n\nexport class AclDefinitionCodeGenerator {\n\tconstructor(\n\t\tprivate readonly definitionNamingConventions = new DefinitionNamingConventions(),\n\t) {\n\t}\n\n\tpublic generateRoles({ acl }: { acl: Acl.Schema }): string {\n\t\treturn Object.entries(acl.roles).map(([name, values]) =>\n\t\t\tthis.generateRole({\n\t\t\t\tname,\n\t\t\t\tvalues,\n\t\t\t})\n\t\t).join('')\n\t}\n\n\tprivate generateRole({ name, values }: { name: string; values: Acl.RolePermissions }): string {\n\t\tconst { variables, entities, inherits, ...other } = values\n\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(name)\n\t\treturn `\\nexport const ${roleVarName} = c.createRole(${printJsValue(name)}, ${printJsValue(other)})\\n`\n\t}\n\n\tpublic generateAclVariables({ acl }: { acl: Acl.Schema }): string {\n\t\tconst variablesOutput: string[] = []\n\n\t\tObject.entries(acl.roles).map(([roleName, roleValues]) => {\n\t\t\tObject.entries(roleValues.variables).map(([variableName, variableValues]) => {\n\t\t\t\tlet variableDefinition = `\\nexport const ${this.definitionNamingConventions.variableVarName(roleName, variableName)} = c.`\n\t\t\t\tconst varFormatted = printJsValue(variableName)\n\t\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\n\t\t\t\tif (variableValues.type === Acl.VariableType.predefined) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.value)\n\t\t\t\t\tvariableDefinition += `createPredefinedVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else if (variableValues.type === Acl.VariableType.entity) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.entityName)\n\t\t\t\t\tvariableDefinition += `createEntityVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else {\n\t\t\t\t\tthrow new Error(`Variable type ${variableValues.type} not yet supported`)\n\t\t\t\t}\n\n\t\t\t\tvariablesOutput.push(variableDefinition)\n\t\t\t})\n\t\t})\n\n\t\treturn variablesOutput.join('')\n\t}\n\n\tpublic generateEntityAcl({ entity, schema }: { entity: Model.Entity; schema: Schema }): string {\n\t\tconst aclOutput: string[] = []\n\t\tconst numberOfEntityFieldsWithoutId = Object.keys(entity.fields).length - 1\n\t\tfor (const [roleName, roleDefinition] of Object.entries(schema.acl.roles)) {\n\t\t\tconst entityPermission = roleDefinition.entities[entity.name]\n\t\t\tif (!entityPermission) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\t\t\tfor (const [predicateName, predicateDefinition] of Object.entries(entityPermission.predicates)) {\n\t\t\t\tconst operations = this.getMatchingOperations({\n\t\t\t\t\tpredicate: predicateName,\n\t\t\t\t\toperations: entityPermission.operations,\n\t\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t\t})\n\t\t\t\tif (Object.keys(operations).length > 0) {\n\t\t\t\t\tconst processor = new PredicateDefinitionProcessor(schema.model)\n\t\t\t\t\tconst when = processor.process(entity, predicateDefinition, {\n\t\t\t\t\t\thandleColumn: ctx => {\n\t\t\t\t\t\t\tif (typeof ctx.value === 'string' && ctx.value in roleDefinition.variables) {\n\t\t\t\t\t\t\t\treturn new Literal(this.definitionNamingConventions.variableVarName(roleName, ctx.value))\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t\thandleRelation: ctx => {\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t\tconst aclDefinition = printJsValue({ when, ...operations }, indentFirstLevel)\n\t\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst trueOperations = this.getMatchingOperations({\n\t\t\t\tpredicate: true,\n\t\t\t\toperations: entityPermission.operations,\n\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t})\n\t\t\tif (Object.keys(trueOperations).length > 0) {\n\t\t\t\tconst aclDefinition = printJsValue({ ...trueOperations }, indentFirstLevel)\n\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t}\n\t\t}\n\n\t\tif (!aclOutput.length) {\n\t\t\treturn ''\n\t\t}\n\t\treturn `${aclOutput.join('')}`\n\t}\n\n\tprivate getMatchingOperations({ operations, predicate, numberOfEntityFieldsWithoutId }: {\n\t\toperations: Acl.EntityOperations\n\t\tpredicate: Acl.Predicate\n\t\tnumberOfEntityFieldsWithoutId: number\n\t}): { read?: string[] \| true; create?: string[] \| boolean; update?: string[] \| boolean; delete?: true } {\n\t\tconst result: ReturnType<AclDefinitionCodeGenerator['getMatchingOperations']> = {}\n\t\tfor (const op of ['read', 'create', 'update'] as const) {\n\t\t\tconst fields = Object.entries(operations[op] ?? {}).filter(([, it]) => it === predicate).map(([it]) => it)\n\t\t\tif (fields.length === 0) {\n\t\t\t} else if (fields.length === numberOfEntityFieldsWithoutId) {\n\t\t\t\tresult[op] = true\n\t\t\t} else {\n\t\t\t\tresult[op] = fields\n\t\t\t}\n\t\t}\n\t\tif (operations.delete === predicate) {\n\t\t\tresult.delete = true\n\t\t}\n\n\t\treturn result\n\t}\n}\n"],"names":["DefinitionNamingConventions","printJsValue","Acl","schema","PredicateDefinitionProcessor","Literal"],"mappings":"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"}

package/dist/development/src/definition-generator/AclDefinitionCodeGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AclDefinitionCodeGenerator.js","sources":["../../../../../packages/schema-utils/src/definition-generator/AclDefinitionCodeGenerator.ts"],"sourcesContent":["import { PredicateDefinitionProcessor } from '../acl'\nimport { IndentDecider, Literal, printJsValue } from '../utils/printJsValue'\nimport { Acl, Model, Schema } from '@contember/schema'\nimport { DefinitionNamingConventions } from './DefinitionNamingConventions'\n\nconst indentFirstLevel: IndentDecider = (val, path) => path.length === 0\n\nexport class AclDefinitionCodeGenerator {\n\tconstructor(\n\t\tprivate readonly definitionNamingConventions = new DefinitionNamingConventions(),\n\t) {\n\t}\n\n\tpublic generateRoles({ acl }: { acl: Acl.Schema }): string {\n\t\treturn Object.entries(acl.roles).map(([name, values]) =>\n\t\t\tthis.generateRole({\n\t\t\t\tname,\n\t\t\t\tvalues,\n\t\t\t})\n\t\t).join('')\n\t}\n\n\tprivate generateRole({ name, values }: { name: string; values: Acl.RolePermissions }): string {\n\t\tconst { variables, entities, inherits, ...other } = values\n\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(name)\n\t\treturn `\\nexport const ${roleVarName} = c.createRole(${printJsValue(name)}, ${printJsValue(other)})\\n`\n\t}\n\n\tpublic generateAclVariables({ acl }: { acl: Acl.Schema }): string {\n\t\tconst variablesOutput: string[] = []\n\n\t\tObject.entries(acl.roles).map(([roleName, roleValues]) => {\n\t\t\tObject.entries(roleValues.variables).map(([variableName, variableValues]) => {\n\t\t\t\tlet variableDefinition = `\\nexport const ${this.definitionNamingConventions.variableVarName(roleName, variableName)} = c.`\n\t\t\t\tconst varFormatted = printJsValue(variableName)\n\t\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\n\t\t\t\tif (variableValues.type === Acl.VariableType.predefined) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.value)\n\t\t\t\t\tvariableDefinition += `createPredefinedVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else if (variableValues.type === Acl.VariableType.entity) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.entityName)\n\t\t\t\t\tvariableDefinition += `createEntityVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else {\n\t\t\t\t\tthrow new Error(`Variable type ${variableValues.type} not yet supported`)\n\t\t\t\t}\n\n\t\t\t\tvariablesOutput.push(variableDefinition)\n\t\t\t})\n\t\t})\n\n\t\treturn variablesOutput.join('')\n\t}\n\n\tpublic generateEntityAcl({ entity, schema }: { entity: Model.Entity; schema: Schema }): string {\n\t\tconst aclOutput: string[] = []\n\t\tconst numberOfEntityFieldsWithoutId = Object.keys(entity.fields).length - 1\n\t\tfor (const [roleName, roleDefinition] of Object.entries(schema.acl.roles)) {\n\t\t\tconst entityPermission = roleDefinition.entities[entity.name]\n\t\t\tif (!entityPermission) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\t\t\tfor (const [predicateName, predicateDefinition] of Object.entries(entityPermission.predicates)) {\n\t\t\t\tconst operations = this.getMatchingOperations({\n\t\t\t\t\tpredicate: predicateName,\n\t\t\t\t\toperations: entityPermission.operations,\n\t\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t\t})\n\t\t\t\tif (Object.keys(operations).length > 0) {\n\t\t\t\t\tconst processor = new PredicateDefinitionProcessor(schema.model)\n\t\t\t\t\tconst when = processor.process(entity, predicateDefinition, {\n\t\t\t\t\t\thandleColumn: ctx => {\n\t\t\t\t\t\t\tif (typeof ctx.value === 'string' && ctx.value in roleDefinition.variables) {\n\t\t\t\t\t\t\t\treturn new Literal(this.definitionNamingConventions.variableVarName(roleName, ctx.value))\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t\thandleRelation: ctx => {\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t\tconst aclDefinition = printJsValue({ when, ...operations }, indentFirstLevel)\n\t\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst trueOperations = this.getMatchingOperations({\n\t\t\t\tpredicate: true,\n\t\t\t\toperations: entityPermission.operations,\n\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t})\n\t\t\tif (Object.keys(trueOperations).length > 0) {\n\t\t\t\tconst aclDefinition = printJsValue({ ...trueOperations }, indentFirstLevel)\n\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t}\n\t\t}\n\n\t\tif (!aclOutput.length) {\n\t\t\treturn ''\n\t\t}\n\t\treturn `${aclOutput.join('')}`\n\t}\n\n\tprivate getMatchingOperations({ operations, predicate, numberOfEntityFieldsWithoutId }: {\n\t\toperations: Acl.EntityOperations\n\t\tpredicate: Acl.Predicate\n\t\tnumberOfEntityFieldsWithoutId: number\n\t}): { read?: string[] \| true; create?: string[] \| boolean; update?: string[] \| boolean; delete?: true } {\n\t\tconst result: ReturnType<AclDefinitionCodeGenerator['getMatchingOperations']> = {}\n\t\tfor (const op of ['read', 'create', 'update'] as const) {\n\t\t\tconst fields = Object.entries(operations[op] ?? {}).filter(([, it]) => it === predicate).map(([it]) => it)\n\t\t\tif (fields.length === 0) {\n\t\t\t} else if (fields.length === numberOfEntityFieldsWithoutId) {\n\t\t\t\tresult[op] = true\n\t\t\t} else {\n\t\t\t\tresult[op] = fields\n\t\t\t}\n\t\t}\n\t\tif (operations.delete === predicate) {\n\t\t\tresult.delete = true\n\t\t}\n\n\t\treturn result\n\t}\n}\n"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"AclDefinitionCodeGenerator.js","sources":["../../../../../packages/schema-utils/src/definition-generator/AclDefinitionCodeGenerator.ts"],"sourcesContent":["import { PredicateDefinitionProcessor } from '../acl/index.js'\nimport { IndentDecider, Literal, printJsValue } from '../utils/printJsValue.js'\nimport { Acl, Model, Schema } from '@contember/schema'\nimport { DefinitionNamingConventions } from './DefinitionNamingConventions.js'\n\nconst indentFirstLevel: IndentDecider = (val, path) => path.length === 0\n\nexport class AclDefinitionCodeGenerator {\n\tconstructor(\n\t\tprivate readonly definitionNamingConventions = new DefinitionNamingConventions(),\n\t) {\n\t}\n\n\tpublic generateRoles({ acl }: { acl: Acl.Schema }): string {\n\t\treturn Object.entries(acl.roles).map(([name, values]) =>\n\t\t\tthis.generateRole({\n\t\t\t\tname,\n\t\t\t\tvalues,\n\t\t\t})\n\t\t).join('')\n\t}\n\n\tprivate generateRole({ name, values }: { name: string; values: Acl.RolePermissions }): string {\n\t\tconst { variables, entities, inherits, ...other } = values\n\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(name)\n\t\treturn `\\nexport const ${roleVarName} = c.createRole(${printJsValue(name)}, ${printJsValue(other)})\\n`\n\t}\n\n\tpublic generateAclVariables({ acl }: { acl: Acl.Schema }): string {\n\t\tconst variablesOutput: string[] = []\n\n\t\tObject.entries(acl.roles).map(([roleName, roleValues]) => {\n\t\t\tObject.entries(roleValues.variables).map(([variableName, variableValues]) => {\n\t\t\t\tlet variableDefinition = `\\nexport const ${this.definitionNamingConventions.variableVarName(roleName, variableName)} = c.`\n\t\t\t\tconst varFormatted = printJsValue(variableName)\n\t\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\n\t\t\t\tif (variableValues.type === Acl.VariableType.predefined) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.value)\n\t\t\t\t\tvariableDefinition += `createPredefinedVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else if (variableValues.type === Acl.VariableType.entity) {\n\t\t\t\t\tconst varDefinition = printJsValue(variableValues.entityName)\n\t\t\t\t\tvariableDefinition += `createEntityVariable(${varFormatted}, ${varDefinition}, ${roleVarName})\\n`\n\t\t\t\t} else {\n\t\t\t\t\tthrow new Error(`Variable type ${variableValues.type} not yet supported`)\n\t\t\t\t}\n\n\t\t\t\tvariablesOutput.push(variableDefinition)\n\t\t\t})\n\t\t})\n\n\t\treturn variablesOutput.join('')\n\t}\n\n\tpublic generateEntityAcl({ entity, schema }: { entity: Model.Entity; schema: Schema }): string {\n\t\tconst aclOutput: string[] = []\n\t\tconst numberOfEntityFieldsWithoutId = Object.keys(entity.fields).length - 1\n\t\tfor (const [roleName, roleDefinition] of Object.entries(schema.acl.roles)) {\n\t\t\tconst entityPermission = roleDefinition.entities[entity.name]\n\t\t\tif (!entityPermission) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst roleVarName = this.definitionNamingConventions.roleVarName(roleName)\n\t\t\tfor (const [predicateName, predicateDefinition] of Object.entries(entityPermission.predicates)) {\n\t\t\t\tconst operations = this.getMatchingOperations({\n\t\t\t\t\tpredicate: predicateName,\n\t\t\t\t\toperations: entityPermission.operations,\n\t\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t\t})\n\t\t\t\tif (Object.keys(operations).length > 0) {\n\t\t\t\t\tconst processor = new PredicateDefinitionProcessor(schema.model)\n\t\t\t\t\tconst when = processor.process(entity, predicateDefinition, {\n\t\t\t\t\t\thandleColumn: ctx => {\n\t\t\t\t\t\t\tif (typeof ctx.value === 'string' && ctx.value in roleDefinition.variables) {\n\t\t\t\t\t\t\t\treturn new Literal(this.definitionNamingConventions.variableVarName(roleName, ctx.value))\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t\thandleRelation: ctx => {\n\t\t\t\t\t\t\treturn ctx.value\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\t\t\t\t\tconst aclDefinition = printJsValue({ when, ...operations }, indentFirstLevel)\n\t\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t\t}\n\t\t\t}\n\t\t\tconst trueOperations = this.getMatchingOperations({\n\t\t\t\tpredicate: true,\n\t\t\t\toperations: entityPermission.operations,\n\t\t\t\tnumberOfEntityFieldsWithoutId,\n\t\t\t})\n\t\t\tif (Object.keys(trueOperations).length > 0) {\n\t\t\t\tconst aclDefinition = printJsValue({ ...trueOperations }, indentFirstLevel)\n\t\t\t\taclOutput.push(`@c.Allow(${roleVarName}, ${aclDefinition})\\n`)\n\t\t\t}\n\t\t}\n\n\t\tif (!aclOutput.length) {\n\t\t\treturn ''\n\t\t}\n\t\treturn `${aclOutput.join('')}`\n\t}\n\n\tprivate getMatchingOperations({ operations, predicate, numberOfEntityFieldsWithoutId }: {\n\t\toperations: Acl.EntityOperations\n\t\tpredicate: Acl.Predicate\n\t\tnumberOfEntityFieldsWithoutId: number\n\t}): { read?: string[] \| true; create?: string[] \| boolean; update?: string[] \| boolean; delete?: true } {\n\t\tconst result: ReturnType<AclDefinitionCodeGenerator['getMatchingOperations']> = {}\n\t\tfor (const op of ['read', 'create', 'update'] as const) {\n\t\t\tconst fields = Object.entries(operations[op] ?? {}).filter(([, it]) => it === predicate).map(([it]) => it)\n\t\t\tif (fields.length === 0) {\n\t\t\t} else if (fields.length === numberOfEntityFieldsWithoutId) {\n\t\t\t\tresult[op] = true\n\t\t\t} else {\n\t\t\t\tresult[op] = fields\n\t\t\t}\n\t\t}\n\t\tif (operations.delete === predicate) {\n\t\t\tresult.delete = true\n\t\t}\n\n\t\treturn result\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/development/src/definition-generator/DefinitionCodeGenerator.cjs CHANGED Viewed

@@ -44,8 +44,29 @@ ${Object.values(entity.fields).map((field) => this.generateField({ field, entity
     return `@c.Unique(${fieldsList})`;
   }
   generateIndex({ entity, index }) {
-    const fieldsList = `${index.fields.map((it) => printJsValue.printJsValue(it)).join(", ")}`;
-    return `@c.Index(${fieldsList})`;
+    const hasColumnOptions = index.columnOptions !== void 0 && Object.keys(index.columnOptions).length > 0;
+    if (!index.method && !index.opClass && !index.where && !index.include?.length && !hasColumnOptions) {
+      return `@c.Index(${index.fields.map((it) => printJsValue.printJsValue(it)).join(", ")})`;
+    }
+    const options = {
+      fields: hasColumnOptions ? index.fields.map((field) => {
+        const columnOption = index.columnOptions?.[field];
+        return columnOption && Object.keys(columnOption).length > 0 ? { field, ...columnOption } : field;
+      }) : index.fields
+    };
+    if (index.method) {
+      options.method = index.method;
+    }
+    if (index.opClass) {
+      options.opClass = index.opClass;
+    }
+    if (index.include?.length) {
+      options.include = index.include;
+    }
+    if (index.where) {
+      options.where = index.where;
+    }
+    return `@c.Index(${printJsValue.printJsValue(options)})`;
   }
   generateView({ entity }) {
     if (!entity.view) {
@@ -177,6 +198,16 @@ ${Object.values(entity.fields).map((field) => this.generateField({ field, entity
     let parts = [];
     if (column.type === schema.Model.ColumnType.Enum) {
       parts.push(`enumColumn(${column.columnType})`);
+    } else if (column.type === schema.Model.ColumnType.Numeric) {
+      const match = /numeric\s*\(\s*(\d+)\s*,\s*(\d+)\s*\)/i.exec(column.columnType);
+      if (match) {
+        parts.push(`numericColumn(${match[1]}, ${match[2]})`);
+      } else {
+        parts.push("numericColumn(30, 10)");
+        if (resolveDefaultColumnType.resolveDefaultColumnType(column.type) !== column.columnType) {
+          parts.push(`columnType(${printJsValue.printJsValue(column.columnType)})`);
+        }
+      }
     } else {
       parts.push(`${ColumnToMethodMapping[column.type]}()`);
       const defaultColumnType = resolveDefaultColumnType.resolveDefaultColumnType(column.type);
@@ -197,6 +228,9 @@ ${Object.values(entity.fields).map((field) => this.generateField({ field, entity
     if (column.typeAlias) {
       parts.push(`typeAlias(${printJsValue.printJsValue(column.typeAlias)})`);
     }
+    if (column.type === schema.Model.ColumnType.Json && column.schema !== void 0) {
+      parts.push(`schema(${printJsValue.printJsValue(column.schema)})`);
+    }
     return parts;
   }
   formatIdentifier(id) {
@@ -210,6 +244,7 @@ const ColumnToMethodMapping = {
   [schema.Model.ColumnType.Time]: "timeColumn",
   [schema.Model.ColumnType.Json]: "jsonColumn",
   [schema.Model.ColumnType.Double]: "doubleColumn",
+  [schema.Model.ColumnType.Numeric]: "numericColumn",
   [schema.Model.ColumnType.Uuid]: "uuidColumn",
   [schema.Model.ColumnType.Int]: "intColumn",
   [schema.Model.ColumnType.String]: "stringColumn"

package/dist/development/src/definition-generator/DefinitionCodeGenerator.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DefinitionCodeGenerator.cjs","sources":["../../../../../packages/schema-utils/src/definition-generator/DefinitionCodeGenerator.ts"],"sourcesContent":["import { Model, Schema, Writable } from '@contember/schema'\nimport { acceptFieldVisitor, DefaultNamingConventions, isInverseRelation, NamingConventions, resolveDefaultColumnType } from '../model'\nimport { printJsValue } from '../utils/printJsValue'\nimport { DefinitionNamingConventions } from './DefinitionNamingConventions'\nimport { AclDefinitionCodeGenerator } from './AclDefinitionCodeGenerator'\n\nexport class DefinitionCodeGenerator {\n\tconstructor(\n\t\tprivate readonly schemaNamingConventions: NamingConventions = new DefaultNamingConventions(),\n\t\tprivate readonly definitionNamingConventions = new DefinitionNamingConventions(),\n\t\tprivate readonly aclGenerator = new AclDefinitionCodeGenerator(),\n\t) {\n\t}\n\n\tpublic generate(schema: Schema) {\n\t\tconst roles = this.aclGenerator.generateRoles({ acl: schema.acl })\n\t\tconst aclVariables = this.aclGenerator.generateAclVariables({ acl: schema.acl })\n\t\tconst enums = Object.entries(schema.model.enums).map(([name, values]) => this.generateEnum({ name, values })).join('')\n\t\tconst entities = Object.values(schema.model.entities).map(entity => this.generateEntity({ entity, schema })).join('')\n\n\t\treturn `import { c } from '@contember/schema-definition'\\n${roles}${aclVariables}${enums}${entities}`\n\t}\n\n\tprivate generateEnum({ name, values }: { name: string; values: readonly string[] }): string {\n\t\treturn `\\nexport const ${this.formatIdentifier(name)} = c.createEnum(${values.map(it => printJsValue(it)).join(', ')})\\n`\n\t}\n\n\tpublic generateEntity({ entity, schema }: { entity: Model.Entity; schema: Schema }): string {\n\t\tconst uniqueConstraints = Object.values(entity.unique).map(constraint => this.generateUniqueConstraint({ entity, constraint }))\n\t\tconst indexes = Object.values(entity.indexes).map(index => this.generateIndex({ entity, index }))\n\t\tconst views = this.generateView({ entity })\n\n\t\tconst decorators = [...uniqueConstraints, ...indexes, views].filter(it => !!it).map(it => `${it}\\n`).join('')\n\t\tconst acl = this.aclGenerator.generateEntityAcl({ entity, schema })\n\n\t\treturn `\\n${decorators}${acl}export class ${this.formatIdentifier(entity.name)} {\n${Object.values(entity.fields).map(field => this.generateField({ field, entity, schema })).filter(it => !!it).join('\\n')}\n}\\n`\n\t}\n\n\tprivate generateUniqueConstraint({ entity, constraint }: { entity: Model.Entity; constraint: Model.UniqueConstraint \| Model.UniqueIndex }): string {\n\t\tconst fieldsList = `${constraint.fields.map(it => printJsValue(it)).join(', ')}`\n\n\t\treturn `@c.Unique(${fieldsList})`\n\t}\n\n\tprivate generateIndex({ entity, index }: { entity: Model.Entity; index: Model.Index }): string {\n\t\tconst fieldsList = `${index.fields.map(it => printJsValue(it)).join(', ')}`\n\n\t\treturn `@c.Index(${fieldsList})`\n\t}\n\n\tprivate generateView({ entity }: { entity: Model.Entity }): string \| undefined {\n\t\tif (!entity.view) {\n\t\t\treturn undefined\n\t\t}\n\n\t\tconst dependenciesExpr = (entity.view.dependencies?.length ?? 0) > 0\n\t\t\t? `, {\\n\\tdependencies: () => [${entity.view.dependencies?.map(it => this.formatIdentifier(it))}]\\n}`\n\t\t\t: ''\n\n\t\treturn `@c.View(\\`${entity.view.sql}\\`${dependenciesExpr})`\n\t}\n\n\tpublic generateField({ entity, field, schema }: { entity: Model.Entity; field: Model.AnyField; schema: Schema }): string \| undefined {\n\t\tconst formatRelationFactory = (method: string, relation: Model.AnyRelation) => {\n\t\t\tconst otherSide = isInverseRelation(relation) ? relation.ownedBy : relation.inversedBy\n\t\t\tconst otherSideFormatted = otherSide ? `, ${printJsValue(otherSide)}` : ''\n\t\t\treturn `${method}(${this.formatIdentifier(relation.target)}${otherSideFormatted})`\n\t\t}\n\t\tconst formatEnumRef = (enumName: string, enumValues: Record<string, string>, providedValue?: string, defaultValue?: string): string \| undefined => {\n\t\t\tif (!providedValue \|\| providedValue === defaultValue) {\n\t\t\t\treturn undefined\n\t\t\t}\n\t\t\tconst enumValueKey = Object.entries(Model.OrderDirection).find(dir => dir[1] === providedValue)?.[0]\n\t\t\tif (!enumValueKey) {\n\t\t\t\tthrow new Error(`Value ${providedValue} is not defined in enum ${enumName}`)\n\t\t\t}\n\t\t\treturn `${enumName}.${enumValueKey}`\n\t\t}\n\t\tconst formatOrderBy = (orderBy?: readonly Model.OrderBy[]) => {\n\t\t\treturn orderBy?.map(it => {\n\t\t\t\tconst enumExpr = formatEnumRef(`Model.OrderDirection`, Model.OrderDirection, it.direction, Model.OrderDirection.asc)\n\t\t\t\treturn `orderBy(${printJsValue(it.path)}${enumExpr ? `, ${enumExpr}` : ''})`\n\t\t\t}) ?? []\n\t\t}\n\t\tconst formatOnDelete = (onDelete?: Model.OnDelete): string \| undefined => {\n\t\t\tif (onDelete === Model.OnDelete.cascade) {\n\t\t\t\treturn 'cascadeOnDelete()'\n\t\t\t}\n\t\t\tif (onDelete === Model.OnDelete.setNull) {\n\t\t\t\treturn 'setNullOnDelete()'\n\t\t\t}\n\t\t\treturn undefined\n\t\t}\n\t\tconst formatJoiningColumn = (joiningColumnName: string, fieldName: string): string \| undefined => {\n\t\t\tconst defaultJoiningColumn = this.schemaNamingConventions.getJoiningColumnName(fieldName)\n\t\t\tif (defaultJoiningColumn === joiningColumnName) {\n\t\t\t\treturn undefined\n\t\t\t}\n\t\t\treturn `joiningColumn(${printJsValue(joiningColumnName)})`\n\t\t}\n\t\tconst definition = acceptFieldVisitor<(string \| undefined)[]>(schema.model, entity, field, {\n\t\t\tvisitColumn: ctx => {\n\t\t\t\treturn this.generateColumn(ctx)\n\t\t\t},\n\t\t\tvisitOneHasMany: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('oneHasMany', relation),\n\t\t\t\t\t...formatOrderBy(relation.orderBy),\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitManyHasOne: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('manyHasOne', relation),\n\t\t\t\t\t!relation.nullable ? 'notNull()' : undefined,\n\t\t\t\t\tformatOnDelete(relation.joiningColumn.onDelete),\n\t\t\t\t\tformatJoiningColumn(relation.joiningColumn.columnName, relation.name),\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitOneHasOneInverse: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('oneHasOneInverse', relation),\n\t\t\t\t\t!relation.nullable ? 'notNull()' : undefined,\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitOneHasOneOwning: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('oneHasOne', relation),\n\t\t\t\t\t!relation.nullable ? 'notNull()' : undefined,\n\t\t\t\t\tformatOnDelete(relation.joiningColumn.onDelete),\n\t\t\t\t\tformatJoiningColumn(relation.joiningColumn.columnName, relation.name),\n\t\t\t\t\trelation.orphanRemoval ? 'removeOrphan()' : undefined,\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitManyHasManyOwning: ({ entity, relation }) => {\n\t\t\t\tconst columnNames = this.schemaNamingConventions.getJoiningTableColumnNames(\n\t\t\t\t\tentity.name,\n\t\t\t\t\trelation.name,\n\t\t\t\t\trelation.target,\n\t\t\t\t\trelation.inversedBy,\n\t\t\t\t)\n\t\t\t\tconst defaultJoiningTable = this.schemaNamingConventions.getJoiningTableName(entity.name, relation.name)\n\t\t\t\tconst joiningTable: Writable<Partial<Model.JoiningTable>> = {}\n\t\t\t\tif (relation.joiningTable.tableName !== defaultJoiningTable) {\n\t\t\t\t\tjoiningTable.tableName = relation.joiningTable.tableName\n\t\t\t\t}\n\t\t\t\tif (!relation.joiningTable.eventLog.enabled) {\n\t\t\t\t\tjoiningTable.eventLog = { enabled: false }\n\t\t\t\t}\n\t\t\t\tif (\n\t\t\t\t\tcolumnNames[0] !== relation.joiningTable.joiningColumn.columnName \|\| relation.joiningTable.joiningColumn.onDelete !== Model.OnDelete.cascade\n\t\t\t\t) {\n\t\t\t\t\tjoiningTable.joiningColumn = {\n\t\t\t\t\t\tcolumnName: relation.joiningTable.joiningColumn.columnName,\n\t\t\t\t\t\tonDelete: relation.joiningTable.joiningColumn.onDelete,\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (\n\t\t\t\t\tcolumnNames[1] !== relation.joiningTable.inverseJoiningColumn.columnName\n\t\t\t\t\t\|\| relation.joiningTable.inverseJoiningColumn.onDelete !== Model.OnDelete.cascade\n\t\t\t\t) {\n\t\t\t\t\tjoiningTable.inverseJoiningColumn = {\n\t\t\t\t\t\tcolumnName: relation.joiningTable.inverseJoiningColumn.columnName,\n\t\t\t\t\t\tonDelete: relation.joiningTable.inverseJoiningColumn.onDelete,\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('manyHasMany', relation),\n\t\t\t\t\t...formatOrderBy(relation.orderBy),\n\t\t\t\t\tObject.keys(joiningTable).length > 0 ? `joiningTable(${printJsValue(joiningTable)})` : undefined,\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitManyHasManyInverse: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('manyHasManyInverse', relation),\n\t\t\t\t\t...formatOrderBy(relation.orderBy),\n\t\t\t\t]\n\t\t\t},\n\t\t})\n\t\tconst definitionCode = definition.filter(it => !!it).join('.')\n\t\tif (field.name === 'id' && definitionCode === 'uuidColumn().notNull()') {\n\t\t\treturn undefined\n\t\t}\n\t\treturn `\\t${this.formatIdentifier(field.name)} = c.${definitionCode}`\n\t}\n\n\tprivate generateColumn({ entity, column }: { entity: Model.Entity; column: Model.AnyColumn }): string[] {\n\t\tlet parts: string[] = []\n\t\tif (column.type === Model.ColumnType.Enum) {\n\t\t\tparts.push(`enumColumn(${column.columnType})`)\n\t\t} else {\n\t\t\tparts.push(`${ColumnToMethodMapping[column.type]}()`)\n\t\t\tconst defaultColumnType = resolveDefaultColumnType(column.type)\n\t\t\tif (defaultColumnType !== column.columnType) {\n\t\t\t\tparts.push(`columnType(${printJsValue(column.columnType)})`)\n\t\t\t}\n\t\t}\n\t\tconst defaultColumnName = this.schemaNamingConventions.getColumnName(column.name)\n\t\tif (defaultColumnName !== column.columnName) {\n\t\t\tparts.push(`columnName(${printJsValue(column.columnName)})`)\n\t\t}\n\t\tif (!column.nullable) {\n\t\t\tparts.push('notNull()')\n\t\t}\n\t\tif (column.default !== undefined) {\n\t\t\tparts.push(`default(${printJsValue(column.default)})`)\n\t\t}\n\t\tif (column.typeAlias) {\n\t\t\tparts.push(`typeAlias(${printJsValue(column.typeAlias)})`)\n\t\t}\n\n\t\t// todo: sequence\n\t\t// todo: maybe single column unique()\n\n\t\treturn parts\n\t}\n\n\tprivate formatIdentifier(id: string): string {\n\t\treturn this.definitionNamingConventions.formatIdentifier(id)\n\t}\n}\n\nconst ColumnToMethodMapping: {\n\t[K in Exclude<Model.ColumnType, Model.ColumnType.Enum>]: string\n} = {\n\t[Model.ColumnType.Bool]: 'boolColumn',\n\t[Model.ColumnType.Date]: 'dateColumn',\n\t[Model.ColumnType.DateTime]: 'dateTimeColumn',\n\t[Model.ColumnType.Time]: 'timeColumn',\n\t[Model.ColumnType.Json]: 'jsonColumn',\n\t[Model.ColumnType.Double]: 'doubleColumn',\n\t[Model.ColumnType.Uuid]: 'uuidColumn',\n\t[Model.ColumnType.Int]: 'intColumn',\n\t[Model.ColumnType.String]: 'stringColumn',\n}\n"],"names":["DefaultNamingConventions","DefinitionNamingConventions","AclDefinitionCodeGenerator","schema","printJsValue","isInverseRelation","Model","acceptFieldVisitor","entity","resolveDefaultColumnType"],"mappings":"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"}
1	+ {"version":3,"file":"DefinitionCodeGenerator.cjs","sources":["../../../../../packages/schema-utils/src/definition-generator/DefinitionCodeGenerator.ts"],"sourcesContent":["import { Model, Schema, Writable } from '@contember/schema'\nimport { acceptFieldVisitor, DefaultNamingConventions, isInverseRelation, NamingConventions, resolveDefaultColumnType } from '../model/index.js'\nimport { printJsValue } from '../utils/printJsValue.js'\nimport { DefinitionNamingConventions } from './DefinitionNamingConventions.js'\nimport { AclDefinitionCodeGenerator } from './AclDefinitionCodeGenerator.js'\n\nexport class DefinitionCodeGenerator {\n\tconstructor(\n\t\tprivate readonly schemaNamingConventions: NamingConventions = new DefaultNamingConventions(),\n\t\tprivate readonly definitionNamingConventions = new DefinitionNamingConventions(),\n\t\tprivate readonly aclGenerator = new AclDefinitionCodeGenerator(),\n\t) {\n\t}\n\n\tpublic generate(schema: Schema) {\n\t\tconst roles = this.aclGenerator.generateRoles({ acl: schema.acl })\n\t\tconst aclVariables = this.aclGenerator.generateAclVariables({ acl: schema.acl })\n\t\tconst enums = Object.entries(schema.model.enums).map(([name, values]) => this.generateEnum({ name, values })).join('')\n\t\tconst entities = Object.values(schema.model.entities).map(entity => this.generateEntity({ entity, schema })).join('')\n\n\t\treturn `import { c } from '@contember/schema-definition'\\n${roles}${aclVariables}${enums}${entities}`\n\t}\n\n\tprivate generateEnum({ name, values }: { name: string; values: readonly string[] }): string {\n\t\treturn `\\nexport const ${this.formatIdentifier(name)} = c.createEnum(${values.map(it => printJsValue(it)).join(', ')})\\n`\n\t}\n\n\tpublic generateEntity({ entity, schema }: { entity: Model.Entity; schema: Schema }): string {\n\t\tconst uniqueConstraints = Object.values(entity.unique).map(constraint => this.generateUniqueConstraint({ entity, constraint }))\n\t\tconst indexes = Object.values(entity.indexes).map(index => this.generateIndex({ entity, index }))\n\t\tconst views = this.generateView({ entity })\n\n\t\tconst decorators = [...uniqueConstraints, ...indexes, views].filter(it => !!it).map(it => `${it}\\n`).join('')\n\t\tconst acl = this.aclGenerator.generateEntityAcl({ entity, schema })\n\n\t\treturn `\\n${decorators}${acl}export class ${this.formatIdentifier(entity.name)} {\n${Object.values(entity.fields).map(field => this.generateField({ field, entity, schema })).filter(it => !!it).join('\\n')}\n}\\n`\n\t}\n\n\tprivate generateUniqueConstraint({ entity, constraint }: { entity: Model.Entity; constraint: Model.UniqueConstraint \| Model.UniqueIndex }): string {\n\t\tconst fieldsList = `${constraint.fields.map(it => printJsValue(it)).join(', ')}`\n\n\t\treturn `@c.Unique(${fieldsList})`\n\t}\n\n\tprivate generateIndex({ entity, index }: { entity: Model.Entity; index: Model.Index }): string {\n\t\tconst hasColumnOptions = index.columnOptions !== undefined && Object.keys(index.columnOptions).length > 0\n\t\tif (!index.method && !index.opClass && !index.where && !index.include?.length && !hasColumnOptions) {\n\t\t\treturn `@c.Index(${index.fields.map(it => printJsValue(it)).join(', ')})`\n\t\t}\n\t\tconst options: Record<string, unknown> = {\n\t\t\tfields: hasColumnOptions\n\t\t\t\t? index.fields.map(field => {\n\t\t\t\t\tconst columnOption = index.columnOptions?.[field]\n\t\t\t\t\treturn columnOption && Object.keys(columnOption).length > 0 ? { field, ...columnOption } : field\n\t\t\t\t})\n\t\t\t\t: index.fields,\n\t\t}\n\t\tif (index.method) {\n\t\t\toptions.method = index.method\n\t\t}\n\t\tif (index.opClass) {\n\t\t\toptions.opClass = index.opClass\n\t\t}\n\t\tif (index.include?.length) {\n\t\t\toptions.include = index.include\n\t\t}\n\t\tif (index.where) {\n\t\t\toptions.where = index.where\n\t\t}\n\t\treturn `@c.Index(${printJsValue(options)})`\n\t}\n\n\tprivate generateView({ entity }: { entity: Model.Entity }): string \| undefined {\n\t\tif (!entity.view) {\n\t\t\treturn undefined\n\t\t}\n\n\t\tconst dependenciesExpr = (entity.view.dependencies?.length ?? 0) > 0\n\t\t\t? `, {\\n\\tdependencies: () => [${entity.view.dependencies?.map(it => this.formatIdentifier(it))}]\\n}`\n\t\t\t: ''\n\n\t\treturn `@c.View(\\`${entity.view.sql}\\`${dependenciesExpr})`\n\t}\n\n\tpublic generateField({ entity, field, schema }: { entity: Model.Entity; field: Model.AnyField; schema: Schema }): string \| undefined {\n\t\tconst formatRelationFactory = (method: string, relation: Model.AnyRelation) => {\n\t\t\tconst otherSide = isInverseRelation(relation) ? relation.ownedBy : relation.inversedBy\n\t\t\tconst otherSideFormatted = otherSide ? `, ${printJsValue(otherSide)}` : ''\n\t\t\treturn `${method}(${this.formatIdentifier(relation.target)}${otherSideFormatted})`\n\t\t}\n\t\tconst formatEnumRef = (enumName: string, enumValues: Record<string, string>, providedValue?: string, defaultValue?: string): string \| undefined => {\n\t\t\tif (!providedValue \|\| providedValue === defaultValue) {\n\t\t\t\treturn undefined\n\t\t\t}\n\t\t\tconst enumValueKey = Object.entries(Model.OrderDirection).find(dir => dir[1] === providedValue)?.[0]\n\t\t\tif (!enumValueKey) {\n\t\t\t\tthrow new Error(`Value ${providedValue} is not defined in enum ${enumName}`)\n\t\t\t}\n\t\t\treturn `${enumName}.${enumValueKey}`\n\t\t}\n\t\tconst formatOrderBy = (orderBy?: readonly Model.OrderBy[]) => {\n\t\t\treturn orderBy?.map(it => {\n\t\t\t\tconst enumExpr = formatEnumRef(`Model.OrderDirection`, Model.OrderDirection, it.direction, Model.OrderDirection.asc)\n\t\t\t\treturn `orderBy(${printJsValue(it.path)}${enumExpr ? `, ${enumExpr}` : ''})`\n\t\t\t}) ?? []\n\t\t}\n\t\tconst formatOnDelete = (onDelete?: Model.OnDelete): string \| undefined => {\n\t\t\tif (onDelete === Model.OnDelete.cascade) {\n\t\t\t\treturn 'cascadeOnDelete()'\n\t\t\t}\n\t\t\tif (onDelete === Model.OnDelete.setNull) {\n\t\t\t\treturn 'setNullOnDelete()'\n\t\t\t}\n\t\t\treturn undefined\n\t\t}\n\t\tconst formatJoiningColumn = (joiningColumnName: string, fieldName: string): string \| undefined => {\n\t\t\tconst defaultJoiningColumn = this.schemaNamingConventions.getJoiningColumnName(fieldName)\n\t\t\tif (defaultJoiningColumn === joiningColumnName) {\n\t\t\t\treturn undefined\n\t\t\t}\n\t\t\treturn `joiningColumn(${printJsValue(joiningColumnName)})`\n\t\t}\n\t\tconst definition = acceptFieldVisitor<(string \| undefined)[]>(schema.model, entity, field, {\n\t\t\tvisitColumn: ctx => {\n\t\t\t\treturn this.generateColumn(ctx)\n\t\t\t},\n\t\t\tvisitOneHasMany: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('oneHasMany', relation),\n\t\t\t\t\t...formatOrderBy(relation.orderBy),\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitManyHasOne: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('manyHasOne', relation),\n\t\t\t\t\t!relation.nullable ? 'notNull()' : undefined,\n\t\t\t\t\tformatOnDelete(relation.joiningColumn.onDelete),\n\t\t\t\t\tformatJoiningColumn(relation.joiningColumn.columnName, relation.name),\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitOneHasOneInverse: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('oneHasOneInverse', relation),\n\t\t\t\t\t!relation.nullable ? 'notNull()' : undefined,\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitOneHasOneOwning: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('oneHasOne', relation),\n\t\t\t\t\t!relation.nullable ? 'notNull()' : undefined,\n\t\t\t\t\tformatOnDelete(relation.joiningColumn.onDelete),\n\t\t\t\t\tformatJoiningColumn(relation.joiningColumn.columnName, relation.name),\n\t\t\t\t\trelation.orphanRemoval ? 'removeOrphan()' : undefined,\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitManyHasManyOwning: ({ entity, relation }) => {\n\t\t\t\tconst columnNames = this.schemaNamingConventions.getJoiningTableColumnNames(\n\t\t\t\t\tentity.name,\n\t\t\t\t\trelation.name,\n\t\t\t\t\trelation.target,\n\t\t\t\t\trelation.inversedBy,\n\t\t\t\t)\n\t\t\t\tconst defaultJoiningTable = this.schemaNamingConventions.getJoiningTableName(entity.name, relation.name)\n\t\t\t\tconst joiningTable: Writable<Partial<Model.JoiningTable>> = {}\n\t\t\t\tif (relation.joiningTable.tableName !== defaultJoiningTable) {\n\t\t\t\t\tjoiningTable.tableName = relation.joiningTable.tableName\n\t\t\t\t}\n\t\t\t\tif (!relation.joiningTable.eventLog.enabled) {\n\t\t\t\t\tjoiningTable.eventLog = { enabled: false }\n\t\t\t\t}\n\t\t\t\tif (\n\t\t\t\t\tcolumnNames[0] !== relation.joiningTable.joiningColumn.columnName \|\| relation.joiningTable.joiningColumn.onDelete !== Model.OnDelete.cascade\n\t\t\t\t) {\n\t\t\t\t\tjoiningTable.joiningColumn = {\n\t\t\t\t\t\tcolumnName: relation.joiningTable.joiningColumn.columnName,\n\t\t\t\t\t\tonDelete: relation.joiningTable.joiningColumn.onDelete,\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (\n\t\t\t\t\tcolumnNames[1] !== relation.joiningTable.inverseJoiningColumn.columnName\n\t\t\t\t\t\|\| relation.joiningTable.inverseJoiningColumn.onDelete !== Model.OnDelete.cascade\n\t\t\t\t) {\n\t\t\t\t\tjoiningTable.inverseJoiningColumn = {\n\t\t\t\t\t\tcolumnName: relation.joiningTable.inverseJoiningColumn.columnName,\n\t\t\t\t\t\tonDelete: relation.joiningTable.inverseJoiningColumn.onDelete,\n\t\t\t\t\t}\n\t\t\t\t}\n\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('manyHasMany', relation),\n\t\t\t\t\t...formatOrderBy(relation.orderBy),\n\t\t\t\t\tObject.keys(joiningTable).length > 0 ? `joiningTable(${printJsValue(joiningTable)})` : undefined,\n\t\t\t\t]\n\t\t\t},\n\t\t\tvisitManyHasManyInverse: ({ relation }) => {\n\t\t\t\treturn [\n\t\t\t\t\tformatRelationFactory('manyHasManyInverse', relation),\n\t\t\t\t\t...formatOrderBy(relation.orderBy),\n\t\t\t\t]\n\t\t\t},\n\t\t})\n\t\tconst definitionCode = definition.filter(it => !!it).join('.')\n\t\tif (field.name === 'id' && definitionCode === 'uuidColumn().notNull()') {\n\t\t\treturn undefined\n\t\t}\n\t\treturn `\\t${this.formatIdentifier(field.name)} = c.${definitionCode}`\n\t}\n\n\tprivate generateColumn({ entity, column }: { entity: Model.Entity; column: Model.AnyColumn }): string[] {\n\t\tlet parts: string[] = []\n\t\tif (column.type === Model.ColumnType.Enum) {\n\t\t\tparts.push(`enumColumn(${column.columnType})`)\n\t\t} else if (column.type === Model.ColumnType.Numeric) {\n\t\t\t// numericColumn requires precision and scale, parsed from e.g. \"numeric(10, 2)\"\n\t\t\tconst match = /numeric\\s\$\\s(\\d+)\\s,\\s(\\d+)\\s*\$/i.exec(column.columnType)\n\t\t\tif (match) {\n\t\t\t\tparts.push(`numericColumn(${match[1]}, ${match[2]})`)\n\t\t\t} else {\n\t\t\t\tparts.push('numericColumn(30, 10)')\n\t\t\t\tif (resolveDefaultColumnType(column.type) !== column.columnType) {\n\t\t\t\t\tparts.push(`columnType(${printJsValue(column.columnType)})`)\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\tparts.push(`${ColumnToMethodMapping[column.type]}()`)\n\t\t\tconst defaultColumnType = resolveDefaultColumnType(column.type)\n\t\t\tif (defaultColumnType !== column.columnType) {\n\t\t\t\tparts.push(`columnType(${printJsValue(column.columnType)})`)\n\t\t\t}\n\t\t}\n\t\tconst defaultColumnName = this.schemaNamingConventions.getColumnName(column.name)\n\t\tif (defaultColumnName !== column.columnName) {\n\t\t\tparts.push(`columnName(${printJsValue(column.columnName)})`)\n\t\t}\n\t\tif (!column.nullable) {\n\t\t\tparts.push('notNull()')\n\t\t}\n\t\tif (column.default !== undefined) {\n\t\t\tparts.push(`default(${printJsValue(column.default)})`)\n\t\t}\n\t\tif (column.typeAlias) {\n\t\t\tparts.push(`typeAlias(${printJsValue(column.typeAlias)})`)\n\t\t}\n\t\tif (column.type === Model.ColumnType.Json && column.schema !== undefined) {\n\t\t\tparts.push(`schema(${printJsValue(column.schema)})`)\n\t\t}\n\n\t\t// todo: sequence\n\t\t// todo: maybe single column unique()\n\n\t\treturn parts\n\t}\n\n\tprivate formatIdentifier(id: string): string {\n\t\treturn this.definitionNamingConventions.formatIdentifier(id)\n\t}\n}\n\nconst ColumnToMethodMapping: {\n\t[K in Exclude<Model.ColumnType, Model.ColumnType.Enum>]: string\n} = {\n\t[Model.ColumnType.Bool]: 'boolColumn',\n\t[Model.ColumnType.Date]: 'dateColumn',\n\t[Model.ColumnType.DateTime]: 'dateTimeColumn',\n\t[Model.ColumnType.Time]: 'timeColumn',\n\t[Model.ColumnType.Json]: 'jsonColumn',\n\t[Model.ColumnType.Double]: 'doubleColumn',\n\t[Model.ColumnType.Numeric]: 'numericColumn',\n\t[Model.ColumnType.Uuid]: 'uuidColumn',\n\t[Model.ColumnType.Int]: 'intColumn',\n\t[Model.ColumnType.String]: 'stringColumn',\n}\n"],"names":["DefaultNamingConventions","DefinitionNamingConventions","AclDefinitionCodeGenerator","schema","printJsValue","isInverseRelation","Model","acceptFieldVisitor","entity","resolveDefaultColumnType"],"mappings":"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"}

package/dist/development/src/definition-generator/DefinitionCodeGenerator.js CHANGED Viewed

@@ -42,8 +42,29 @@ ${Object.values(entity.fields).map((field) => this.generateField({ field, entity
     return `@c.Unique(${fieldsList})`;
   }
   generateIndex({ entity, index }) {
-    const fieldsList = `${index.fields.map((it) => printJsValue(it)).join(", ")}`;
-    return `@c.Index(${fieldsList})`;
+    const hasColumnOptions = index.columnOptions !== void 0 && Object.keys(index.columnOptions).length > 0;
+    if (!index.method && !index.opClass && !index.where && !index.include?.length && !hasColumnOptions) {
+      return `@c.Index(${index.fields.map((it) => printJsValue(it)).join(", ")})`;
+    }
+    const options = {
+      fields: hasColumnOptions ? index.fields.map((field) => {
+        const columnOption = index.columnOptions?.[field];
+        return columnOption && Object.keys(columnOption).length > 0 ? { field, ...columnOption } : field;
+      }) : index.fields
+    };
+    if (index.method) {
+      options.method = index.method;
+    }
+    if (index.opClass) {
+      options.opClass = index.opClass;
+    }
+    if (index.include?.length) {
+      options.include = index.include;
+    }
+    if (index.where) {
+      options.where = index.where;
+    }
+    return `@c.Index(${printJsValue(options)})`;
   }
   generateView({ entity }) {
     if (!entity.view) {
@@ -175,6 +196,16 @@ ${Object.values(entity.fields).map((field) => this.generateField({ field, entity
     let parts = [];
     if (column.type === Model.ColumnType.Enum) {
       parts.push(`enumColumn(${column.columnType})`);
+    } else if (column.type === Model.ColumnType.Numeric) {
+      const match = /numeric\s*\(\s*(\d+)\s*,\s*(\d+)\s*\)/i.exec(column.columnType);
+      if (match) {
+        parts.push(`numericColumn(${match[1]}, ${match[2]})`);
+      } else {
+        parts.push("numericColumn(30, 10)");
+        if (resolveDefaultColumnType(column.type) !== column.columnType) {
+          parts.push(`columnType(${printJsValue(column.columnType)})`);
+        }
+      }
     } else {
       parts.push(`${ColumnToMethodMapping[column.type]}()`);
       const defaultColumnType = resolveDefaultColumnType(column.type);
@@ -195,6 +226,9 @@ ${Object.values(entity.fields).map((field) => this.generateField({ field, entity
     if (column.typeAlias) {
       parts.push(`typeAlias(${printJsValue(column.typeAlias)})`);
     }
+    if (column.type === Model.ColumnType.Json && column.schema !== void 0) {
+      parts.push(`schema(${printJsValue(column.schema)})`);
+    }
     return parts;
   }
   formatIdentifier(id) {
@@ -208,6 +242,7 @@ const ColumnToMethodMapping = {
   [Model.ColumnType.Time]: "timeColumn",
   [Model.ColumnType.Json]: "jsonColumn",
   [Model.ColumnType.Double]: "doubleColumn",
+  [Model.ColumnType.Numeric]: "numericColumn",
   [Model.ColumnType.Uuid]: "uuidColumn",
   [Model.ColumnType.Int]: "intColumn",
   [Model.ColumnType.String]: "stringColumn"