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

package/dist/types/type-schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/type-schema/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/type-schema/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}

package/dist/types/type-schema/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/type-schema/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAuOzC,eAAO,MAAM,WAAW;;;;;;;;;;;;;kCA7Je,OAAO;;;;;;;;;;;;;EAgK5C,CAAA"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/type-schema/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAmPzC,eAAO,MAAM,WAAW;;;;;;;;;;;;;kCAzKe,OAAO;;;;;;;;;;;;;EA4K5C,CAAA"}

package/dist/types/type-schema/settings.d.ts

@@ -8,6 +8,7 @@ export declare const settingsSchema: {
         readonly content?: {
             readonly useExistsInHasManyFilter?: boolean | undefined;
             readonly fullDateTimeResponse?: boolean | undefined;
+            readonly dateTimeResponseFormat?: "legacy" | "iso8601" | undefined;
             readonly shortDateResponse?: boolean | undefined;
             readonly uuidVersion?: 4 | 7 | undefined;
         } | undefined;
@@ -29,12 +30,14 @@ export declare const settingsSchema: {
             (input: unknown, path?: PropertyKey[]): {
                 readonly useExistsInHasManyFilter?: boolean | undefined;
                 readonly fullDateTimeResponse?: boolean | undefined;
+                readonly dateTimeResponseFormat?: "legacy" | "iso8601" | undefined;
                 readonly shortDateResponse?: boolean | undefined;
                 readonly uuidVersion?: 4 | 7 | undefined;
             };
             inner: {
                 useExistsInHasManyFilter: Typesafe.Type<boolean>;
                 fullDateTimeResponse: Typesafe.Type<boolean>;
+                dateTimeResponseFormat: Typesafe.Type<"legacy" | "iso8601">;
                 shortDateResponse: Typesafe.Type<boolean>;
                 uuidVersion: Typesafe.Type<4 | 7>;
             };

package/dist/types/type-schema/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/type-schema/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAG/C,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAezB,CAAA"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/type-schema/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAG/C,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgBzB,CAAA"}

package/dist/types/utils/index.d.ts

@@ -1,4 +1,4 @@
-export * from './assertNever';
-export * from './isIt';
-export * from './deepCompare';
+export * from './assertNever.js';
+export * from './isIt.js';
+export * from './deepCompare.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,QAAQ,CAAA;AACtB,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAA;AAChC,cAAc,WAAW,CAAA;AACzB,cAAc,kBAAkB,CAAA"}

package/dist/types/validation/AclValidator.d.ts

@@ -1,5 +1,5 @@
 import { Acl, Model } from '@contember/schema';
-import { ValidationError } from './errors';
+import { ValidationError } from './errors.js';
 export declare class AclValidator {
     private readonly model;
     constructor(model: Model.Schema);

package/dist/types/validation/AclValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AclValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/AclValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAGxD,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,eAAe,EAAE;IAMtD,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,2BAA2B;IAmCnC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,wBAAwB;IAiBhC,OAAO,CAAC,iBAAiB;CAYzB"}
+{"version":3,"file":"AclValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/AclValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAgB,eAAe,EAAE,MAAM,aAAa,CAAA;AAG3D,qBAAa,YAAY;IACZ,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,eAAe,EAAE;IAMtD,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,CAAC,yBAAyB;IAoBjC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,2BAA2B;IAmCnC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,wBAAwB;IAiBhC,OAAO,CAAC,iBAAiB;CAYzB"}

package/dist/types/validation/ActionsValidator.d.ts

@@ -1,5 +1,5 @@
 import { Actions, Model } from '@contember/schema';
-import { ValidationError } from './errors';
+import { ValidationError } from './errors.js';
 export declare class ActionsValidator {
     private readonly model;
     constructor(model: Model.Schema);

package/dist/types/validation/ActionsValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ActionsValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAaxD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,eAAe,EAAE;IAM1D,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,iBAAiB;CAyCzB"}
+{"version":3,"file":"ActionsValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ActionsValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElD,OAAO,EAAgB,eAAe,EAAE,MAAM,aAAa,CAAA;AAa3D,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,eAAe,EAAE;IAM1D,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,iBAAiB;CAyCzB"}

package/dist/types/validation/ModelValidator.d.ts

@@ -1,5 +1,5 @@
 import { Model } from '@contember/schema';
-import { ValidationError } from './errors';
+import { ValidationError } from './errors.js';
 export declare class ModelValidator {
     private readonly model;
     constructor(model: Model.Schema);
@@ -7,9 +7,11 @@ export declare class ModelValidator {
     private validateEnums;
     private validateEntities;
     private validateEntity;
+    private validateIndexes;
     private validateUniqueConstraints;
     private validateColumnNamesCollision;
     private validateField;
+    private validateColumnJsonSchema;
     private validateRelation;
     private validateIdentifier;
     private validateEntityName;

package/dist/types/validation/ModelValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ModelValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAMxD,qBAAa,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,IAAI,eAAe,EAAE;IAQpC,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,4BAA4B;IA4BpC,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,gBAAgB;IAgIxB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,2BAA2B;IAwCnC,OAAO,CAAC,6BAA6B;CAwBrC"}
+{"version":3,"file":"ModelValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ModelValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,eAAe,EAAE,MAAM,aAAa,CAAA;AAS3D,qBAAa,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,IAAI,eAAe,EAAE;IAQpC,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,eAAe;IAwDvB,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,4BAA4B;IA4BpC,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,wBAAwB;IAchC,OAAO,CAAC,gBAAgB;IAgIxB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,2BAA2B;IAwCnC,OAAO,CAAC,6BAA6B;CAwBrC"}

package/dist/types/validation/SchemaValidator.d.ts

@@ -1,5 +1,5 @@
 import { Schema } from '@contember/schema';
-import { ValidationError, ValidationErrorCode } from './errors';
+import { ValidationError, ValidationErrorCode } from './errors.js';
 export interface SchemaValidatorSkippedErrors {
     readonly code: ValidationErrorCode;
     readonly skipUntil?: string;

package/dist/types/validation/SchemaValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/SchemaValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAM/D,MAAM,WAAW,4BAA4B;IAC5C,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,qBAAa,eAAe;WACb,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,4BAA4B,EAAO,GAAG,eAAe,EAAE;CA0B7G"}
+{"version":3,"file":"SchemaValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/SchemaValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAMlE,MAAM,WAAW,4BAA4B;IAC5C,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAClC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,qBAAa,eAAe;WACb,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,GAAE,4BAA4B,EAAO,GAAG,eAAe,EAAE;CA0B7G"}

package/dist/types/validation/ValidationValidator.d.ts

@@ -1,5 +1,5 @@
 import { Model, Validation } from '@contember/schema';
-import { ValidationError } from './errors';
+import { ValidationError } from './errors.js';
 export declare class ValidationValidator {
     private readonly model;
     constructor(model: Model.Schema);

package/dist/types/validation/ValidationValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ValidationValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAGxD,qBAAa,mBAAmB;IACnB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,eAAe,EAAE;IAc7D,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,oBAAoB;CAe5B"}
+{"version":3,"file":"ValidationValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ValidationValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAgB,eAAe,EAAE,MAAM,aAAa,CAAA;AAG3D,qBAAa,mBAAmB;IACnB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,eAAe,EAAE;IAc7D,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAmBzB,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,oBAAoB;CAe5B"}

package/dist/types/validation/errors.d.ts

@@ -1,4 +1,4 @@
-export type ValidationErrorCode = 'MODEL_NAME_MISMATCH' | 'MODEL_UNDEFINED_FIELD' | 'MODEL_INVALID_FIELD' | 'MODEL_UNDEFINED_ENTITY' | 'MODEL_RELATION_REQUIRED' | 'MODEL_INVALID_RELATION_DEFINITION' | 'MODEL_INVALID_COLUMN_DEFINITION' | 'MODEL_INVALID_VIEW_USAGE' | 'MODEL_INVALID_IDENTIFIER' | 'MODEL_INVALID_ENTITY_NAME' | 'MODEL_INVALID_CONSTRAINT' | 'MODEL_NAME_COLLISION' | 'ACL_INVALID_CONDITION' | 'ACL_UNDEFINED_VARIABLE' | 'ACL_UNDEFINED_FIELD' | 'ACL_UNDEFINED_PREDICATE' | 'ACL_UNDEFINED_ROLE' | 'ACL_UNDEFINED_ENTITY' | 'ACTIONS_NAME_MISMATCH' | 'ACTIONS_INVALID_CONDITION' | 'ACTIONS_UNDEFINED_FIELD' | 'ACTIONS_UNDEFINED_ENTITY' | 'ACTIONS_UNDEFINED_TRIGGER_TARGET' | 'ACTIONS_INVALID_SELECTION' | 'VALIDATION_UNDEFINED_ENTITY' | 'VALIDATION_UNDEFINED_FIELD' | 'VALIDATION_NOT_IMPLEMENTED';
+export type ValidationErrorCode = 'MODEL_NAME_MISMATCH' | 'MODEL_UNDEFINED_FIELD' | 'MODEL_INVALID_FIELD' | 'MODEL_UNDEFINED_ENTITY' | 'MODEL_RELATION_REQUIRED' | 'MODEL_INVALID_RELATION_DEFINITION' | 'MODEL_INVALID_COLUMN_DEFINITION' | 'MODEL_INVALID_JSON_SCHEMA' | 'MODEL_INVALID_VIEW_USAGE' | 'MODEL_INVALID_IDENTIFIER' | 'MODEL_INVALID_ENTITY_NAME' | 'MODEL_INVALID_CONSTRAINT' | 'MODEL_INVALID_INDEX' | 'MODEL_NAME_COLLISION' | 'ACL_INVALID_CONDITION' | 'ACL_UNDEFINED_VARIABLE' | 'ACL_UNDEFINED_FIELD' | 'ACL_UNDEFINED_PREDICATE' | 'ACL_UNDEFINED_ROLE' | 'ACL_UNDEFINED_ENTITY' | 'ACTIONS_NAME_MISMATCH' | 'ACTIONS_INVALID_CONDITION' | 'ACTIONS_UNDEFINED_FIELD' | 'ACTIONS_UNDEFINED_ENTITY' | 'ACTIONS_UNDEFINED_TRIGGER_TARGET' | 'ACTIONS_INVALID_SELECTION' | 'VALIDATION_UNDEFINED_ENTITY' | 'VALIDATION_UNDEFINED_FIELD' | 'VALIDATION_NOT_IMPLEMENTED';
 export interface ValidationError {
     path: (string | number)[];
     message: string;

package/dist/types/validation/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/validation/errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAC5B,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,wBAAwB,GACxB,yBAAyB,GACzB,mCAAmC,GACnC,iCAAiC,GACjC,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,GAC3B,0BAA0B,GAC1B,sBAAsB,GACtB,uBAAuB,GACvB,wBAAwB,GACxB,qBAAqB,GACrB,yBAAyB,GACzB,oBAAoB,GACpB,sBAAsB,GACtB,uBAAuB,GACvB,2BAA2B,GAC3B,yBAAyB,GACzB,0BAA0B,GAC1B,kCAAkC,GAClC,2BAA2B,GAC3B,6BAA6B,GAC7B,4BAA4B,GAC5B,4BAA4B,CAAA;AAE/B,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,mBAAmB,CAAA;CACzB;AAED,qBAAa,YAAY;aACI,MAAM,EAAE,eAAe,EAAE;IAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAhD,MAAM,EAAE,eAAe,EAAE,EAAmB,IAAI,GAAE,MAAM,EAAO;IAE3F,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,YAAY;IAIpC,GAAG,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;CAGrD"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/validation/errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAC5B,qBAAqB,GACrB,uBAAuB,GACvB,qBAAqB,GACrB,wBAAwB,GACxB,yBAAyB,GACzB,mCAAmC,GACnC,iCAAiC,GACjC,2BAA2B,GAC3B,0BAA0B,GAC1B,0BAA0B,GAC1B,2BAA2B,GAC3B,0BAA0B,GAC1B,qBAAqB,GACrB,sBAAsB,GACtB,uBAAuB,GACvB,wBAAwB,GACxB,qBAAqB,GACrB,yBAAyB,GACzB,oBAAoB,GACpB,sBAAsB,GACtB,uBAAuB,GACvB,2BAA2B,GAC3B,yBAAyB,GACzB,0BAA0B,GAC1B,kCAAkC,GAClC,2BAA2B,GAC3B,6BAA6B,GAC7B,4BAA4B,GAC5B,4BAA4B,CAAA;AAE/B,MAAM,WAAW,eAAe;IAC/B,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,mBAAmB,CAAA;CACzB;AAED,qBAAa,YAAY;aACI,MAAM,EAAE,eAAe,EAAE;IAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAhD,MAAM,EAAE,eAAe,EAAE,EAAmB,IAAI,GAAE,MAAM,EAAO;IAE3F,GAAG,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,YAAY;IAIpC,GAAG,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;CAGrD"}

package/dist/types/validation/index.d.ts

@@ -1,7 +1,7 @@
-export * from './AclValidator';
-export * from './ModelValidator';
-export * from './ValidationValidator';
-export * from './errors';
-export * from './SchemaValidator';
-export * from './MembershipResolver';
+export * from './AclValidator.js';
+export * from './ModelValidator.js';
+export * from './ValidationValidator.js';
+export * from './errors.js';
+export * from './SchemaValidator.js';
+export * from './MembershipResolver.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/validation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA;AAChC,cAAc,uBAAuB,CAAA;AACrC,cAAc,UAAU,CAAA;AACxB,cAAc,mBAAmB,CAAA;AACjC,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/validation/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AACxC,cAAc,aAAa,CAAA;AAC3B,cAAc,sBAAsB,CAAA;AACpC,cAAc,yBAAyB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-utils",
-  "version": "2.1.0-beta.2",
+  "version": "2.2.0-alpha.2",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,11 +23,11 @@
     }
   },
   "dependencies": {
-    "@contember/schema": "2.1.0-beta.1",
-    "@contember/typesafe": "2.1.0-beta.1"
+    "@contember/schema": "2.1.0-beta.2",
+    "@contember/typesafe": "2.1.0-beta.2"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.1.0-beta.1",
+    "@contember/schema-definition": "2.1.0-beta.2",
     "@types/node": "^24.12.0"
   },
   "type": "module",

package/src/acl/PredicateDefinitionProcessor.ts

@@ -1,4 +1,4 @@
-import { acceptFieldVisitor } from '../model'
+import { acceptFieldVisitor } from '../model/index.js'
 import { Acl, Input, Model, Writable } from '@contember/schema'
 
 class PredicateDefinitionProcessor {

package/src/acl/index.ts

@@ -1,3 +1,3 @@
-export * from './AllowAllPermissionFactory'
-export * from './PredicateDefinitionProcessor'
-export * from './schemaUtils'
+export * from './AllowAllPermissionFactory.js'
+export * from './PredicateDefinitionProcessor.js'
+export * from './schemaUtils.js'

package/src/dataUtils.ts

@@ -17,6 +17,7 @@ export const resolveDefaultValue = (column: Model.AnyColumn, providers: Pick<Pro
 		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/src/definition-generator/AclDefinitionCodeGenerator.ts

@@ -1,7 +1,7 @@
-import { PredicateDefinitionProcessor } from '../acl'
-import { IndentDecider, Literal, printJsValue } from '../utils/printJsValue'
+import { PredicateDefinitionProcessor } from '../acl/index.js'
+import { IndentDecider, Literal, printJsValue } from '../utils/printJsValue.js'
 import { Acl, Model, Schema } from '@contember/schema'
-import { DefinitionNamingConventions } from './DefinitionNamingConventions'
+import { DefinitionNamingConventions } from './DefinitionNamingConventions.js'
 
 const indentFirstLevel: IndentDecider = (val, path) => path.length === 0
 

package/src/definition-generator/DefinitionCodeGenerator.ts

@@ -1,8 +1,8 @@
 import { Model, Schema, Writable } from '@contember/schema'
-import { acceptFieldVisitor, DefaultNamingConventions, isInverseRelation, NamingConventions, resolveDefaultColumnType } from '../model'
-import { printJsValue } from '../utils/printJsValue'
-import { DefinitionNamingConventions } from './DefinitionNamingConventions'
-import { AclDefinitionCodeGenerator } from './AclDefinitionCodeGenerator'
+import { acceptFieldVisitor, DefaultNamingConventions, isInverseRelation, NamingConventions, resolveDefaultColumnType } from '../model/index.js'
+import { printJsValue } from '../utils/printJsValue.js'
+import { DefinitionNamingConventions } from './DefinitionNamingConventions.js'
+import { AclDefinitionCodeGenerator } from './AclDefinitionCodeGenerator.js'
 
 export class DefinitionCodeGenerator {
 	constructor(
@@ -45,9 +45,31 @@ ${Object.values(entity.fields).map(field => this.generateField({ field, entity,
 	}
 
 	private generateIndex({ entity, index }: { entity: Model.Entity; index: Model.Index }): string {
-		const fieldsList = `${index.fields.map(it => printJsValue(it)).join(', ')}`
-
-		return `@c.Index(${fieldsList})`
+		const hasColumnOptions = index.columnOptions !== undefined && 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: Record<string, unknown> = {
+			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)})`
 	}
 
 	private generateView({ entity }: { entity: Model.Entity }): string | undefined {
@@ -190,6 +212,17 @@ ${Object.values(entity.fields).map(field => this.generateField({ field, entity,
 		let parts: string[] = []
 		if (column.type === Model.ColumnType.Enum) {
 			parts.push(`enumColumn(${column.columnType})`)
+		} else if (column.type === Model.ColumnType.Numeric) {
+			// numericColumn requires precision and scale, parsed from e.g. "numeric(10, 2)"
+			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)
@@ -210,6 +243,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 !== undefined) {
+			parts.push(`schema(${printJsValue(column.schema)})`)
+		}
 
 		// todo: sequence
 		// todo: maybe single column unique()
@@ -231,6 +267,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',

package/src/definition-generator/TsDefinitionGenerator.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@contember/schema'
-import { DefaultNamingConventions, NamingConventions } from '../model'
-import { DefinitionCodeGenerator } from './DefinitionCodeGenerator'
+import { DefaultNamingConventions, NamingConventions } from '../model/index.js'
+import { DefinitionCodeGenerator } from './DefinitionCodeGenerator.js'
 
 /**
  * @deprecated use {@link DefinitionCodeGenerator}

package/src/definition-generator/index.ts

@@ -1,4 +1,4 @@
-export * from './TsDefinitionGenerator'
-export * from './AclDefinitionCodeGenerator'
-export * from './DefinitionCodeGenerator'
-export * from './DefinitionNamingConventions'
+export * from './TsDefinitionGenerator.js'
+export * from './AclDefinitionCodeGenerator.js'
+export * from './DefinitionCodeGenerator.js'
+export * from './DefinitionNamingConventions.js'

package/src/index.ts

@@ -1,19 +1,20 @@
 import { Schema } from '@contember/schema'
-import { emptyModelSchema } from './model'
+import { emptyModelSchema } from './model/index.js'
 import * as Typesafe from '@contember/typesafe'
-import { aclSchema, modelSchema, settingsSchema, validationSchema } from './type-schema'
-import { actionsSchema } from './type-schema/actions'
+import { aclSchema, modelSchema, settingsSchema, validationSchema } from './type-schema/index.js'
+import { actionsSchema } from './type-schema/actions.js'
 
-export * from './definition-generator'
-export * from './lax'
-export * from './model'
-export * from './acl'
-export * from './dataUtils'
-export * from './validation'
-export * from './schemaNormalizer'
-export * from './schemaFilter'
-export * from './schemaChecksum'
-export { compareArraysIgnoreOrder, deepCompare } from './utils'
+export * from './definition-generator/index.js'
+export * from './json-schema/index.js'
+export * from './lax/index.js'
+export * from './model/index.js'
+export * from './acl/index.js'
+export * from './dataUtils.js'
+export * from './validation/index.js'
+export * from './schemaNormalizer.js'
+export * from './schemaFilter.js'
+export * from './schemaChecksum.js'
+export { compareArraysIgnoreOrder, deepCompare } from './utils/index.js'
 
 export const emptySchema: Schema = {
 	model: emptyModelSchema,

package/src/json-schema/collectUnsupportedKeywords.ts

@@ -0,0 +1,74 @@
+import { JSONValue } from '@contember/schema'
+import { isRecognizedJsonSchemaKeyword } from './keywords.js'
+
+export interface UnsupportedJsonSchemaKeyword {
+	/** The offending keyword, e.g. `$ref` or `format`. */
+	keyword: string
+	/** JSON pointer to the (sub)schema that contains the keyword, e.g. `` (root), `/properties/foo`. */
+	path: string
+}
+
+const isPlainObject = (value: JSONValue): value is { readonly [key: string]: JSONValue } =>
+	typeof value === 'object' && value !== null && !Array.isArray(value)
+
+/**
+ * Recursively walks a supplied JSON Schema and collects every keyword that is neither
+ * {@link SUPPORTED_JSON_SCHEMA_KEYWORDS supported} nor an
+ * {@link ALLOWED_JSON_SCHEMA_ANNOTATION_KEYWORDS allowed annotation}.
+ *
+ * Descends into the applicator keywords the validator itself understands — `properties`, `items`,
+ * `additionalProperties`, `allOf`, `anyOf`, `oneOf`, `not` — so that an unsupported keyword buried in
+ * a nested subschema is still reported (with a JSON pointer to its location).
+ *
+ * A boolean schema (`true`/`false`) is valid and yields no findings.
+ */
+export const collectUnsupportedJsonSchemaKeywords = (schema: JSONValue): UnsupportedJsonSchemaKeyword[] => {
+	const result: UnsupportedJsonSchemaKeyword[] = []
+	walk(schema, '', result)
+	return result
+}
+
+const walk = (schema: JSONValue, path: string, result: UnsupportedJsonSchemaKeyword[]): void => {
+	if (!isPlainObject(schema)) {
+		// boolean schema, or a non-schema leaf reached via a forgiving descent – nothing to check
+		return
+	}
+
+	for (const keyword of Object.keys(schema)) {
+		if (!isRecognizedJsonSchemaKeyword(keyword)) {
+			result.push({ keyword, path })
+		}
+	}
+
+	// object subschemas
+	const properties = schema.properties
+	if (isPlainObject(properties)) {
+		for (const key of Object.keys(properties)) {
+			walk(properties[key], `${path}/properties/${key}`, result)
+		}
+	}
+
+	// `additionalProperties` may be a boolean or a subschema
+	if (isPlainObject(schema.additionalProperties)) {
+		walk(schema.additionalProperties, `${path}/additionalProperties`, result)
+	}
+
+	// `items` (draft-07 single schema). Tolerate an array form too so we still descend.
+	const items = schema.items
+	if (Array.isArray(items)) {
+		items.forEach((item, index) => walk(item, `${path}/items/${index}`, result))
+	} else if (items !== undefined) {
+		walk(items, `${path}/items`, result)
+	}
+
+	// combinators
+	for (const combinator of ['allOf', 'anyOf', 'oneOf'] as const) {
+		const subSchemas = schema[combinator]
+		if (Array.isArray(subSchemas)) {
+			subSchemas.forEach((sub, index) => walk(sub, `${path}/${combinator}/${index}`, result))
+		}
+	}
+	if (schema.not !== undefined) {
+		walk(schema.not, `${path}/not`, result)
+	}
+}

package/src/json-schema/index.ts

@@ -0,0 +1,3 @@
+export * from './keywords.js'
+export * from './collectUnsupportedKeywords.js'
+export * from './jsonSchemaToTsType.js'