npm - @webiny/api-headless-cms - Versions diffs - 0.0.0-unstable.9f53ea597d → 0.0.0-unstable.a4f3e4ea8b - Mend

@webiny/api-headless-cms 0.0.0-unstable.9f53ea597d → 0.0.0-unstable.a4f3e4ea8b

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 (175) hide show

package/features/graphql/fields/base/ObjectToGraphQL.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/graphql/fields/base/ObjectToGraphQL.js","sources":["../../../../../src/features/graphql/fields/base/ObjectToGraphQL.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst.js\";\nimport { CmsModelFieldToGraphQL } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"../abstractions/CmsModelFieldToGraphQLRegistry.js\";\nimport type {\n CmsModel,\n CmsModelField,\n CmsModelFieldType,\n CmsModelFieldDefinition,\n CmsModelObjectField\n} from \"~/types/index.js\";\nimport type { ValidateChildFieldsParams } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type { CmsModelFieldAstNode, ICmsModelFieldToAst } from \"~/types/modelAst.js\";\nimport { createTypeFromFields } from \"~/utils/createTypeFromFields.js\";\n\ninterface CreateTypeNameParams {\n model: Pick<CmsModel, \"singularApiName\">;\n parents?: string[];\n field: CmsModelField;\n}\n\nconst createTypeName = (params: CreateTypeNameParams): string => {\n const { model, parents = [], field } = params;\n return [model.singularApiName]\n .concat(parents)\n .concat([field.fieldId])\n .filter(Boolean)\n .map(id => {\n return upperFirst(id);\n })\n .join(\"_\");\n};\n\ninterface CreateChildTypeDefsParams {\n model: Pick<CmsModel, \"singularApiName\">;\n field: CmsModelField;\n fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n endpointType: \"manage\" \| \"read\";\n}\n\nconst createChildTypeDefs = (params: CreateChildTypeDefsParams): string => {\n const { field, fieldRegistry, model, endpointType } = params;\n const fields = field.settings?.fields \|\| [];\n\n const typeName = createTypeName({\n model,\n field,\n parents: field.settings?.parents\n });\n\n const filters = fields\n .map(child => {\n const fieldImpl = fieldRegistry.get(child.type);\n if (!fieldImpl) {\n return null;\n }\n const api = endpointType === \"manage\" ? fieldImpl.manage : fieldImpl.read;\n const createListFilters = api.createListFilters;\n if (!createListFilters) {\n return null;\n }\n\n const filters = createListFilters({\n model,\n field: {\n ...child,\n settings: {\n ...child.settings,\n parents: (child.settings?.parents \|\| []).concat([field.fieldId])\n }\n },\n fieldRegistry\n });\n if (!filters) {\n return null;\n }\n return filters;\n })\n .filter(Boolean)\n .join(\"\\n\");\n return `input ${typeName}WhereInput {\n ${filters \|\| \"_empty: String\"}\n }\\n`;\n};\n\nconst createObjectListFilters = (\n field: CmsModelField,\n model: Pick<CmsModel, \"singularApiName\">\n): string => {\n const typeName = createTypeName({\n model,\n field,\n parents: field.settings?.parents\n });\n return `${field.fieldId}: ${typeName}WhereInput`;\n};\n\nclass ReadApi implements CmsModelFieldToGraphQL.ReadApi {\n public createTypeField({\n field,\n models,\n model,\n fieldRegistry\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition \| null {\n const result = createTypeFromFields({\n models,\n typeOfType: \"type\",\n model,\n type: \"read\",\n typeNamePrefix: createTypeName({\n model,\n field,\n parents: field.settings?.parents\n }),\n fields: field.settings?.fields \|\| [],\n fieldRegistry\n });\n\n if (!result) {\n return null;\n }\n const { fieldType, typeDefs } = result;\n\n const childTypeDefs = createChildTypeDefs({\n model,\n field,\n fieldRegistry,\n endpointType: \"read\"\n });\n\n return {\n fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,\n typeDefs: `${typeDefs}${childTypeDefs}`\n };\n }\n\n public createResolver({\n field,\n createFieldResolvers,\n graphQLType\n }: CmsModelFieldToGraphQL.ResolverParams): CmsModelFieldToGraphQL.Resolver {\n if (!field.settings?.fields \|\| field.settings.fields.length === 0) {\n return false;\n }\n\n const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n\n const typeResolvers =\n createFieldResolvers({\n graphQLType: fieldType,\n fields: field.settings.fields\n }) \|\| {};\n\n return {\n resolver: null,\n typeResolvers\n };\n }\n\n public createListFilters({ field, model }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createObjectListFilters(field, model);\n }\n}\n\nclass ManageApi implements CmsModelFieldToGraphQL.ManageApi {\n public createTypeField({\n models,\n model,\n field,\n fieldRegistry\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition \| null {\n const result = createTypeFromFields({\n typeOfType: \"type\",\n models,\n model,\n type: \"manage\",\n typeNamePrefix: createTypeName({\n model,\n field,\n parents: field.settings?.parents\n }),\n fields: field.settings?.fields \|\| [],\n fieldRegistry\n });\n\n if (!result) {\n return null;\n }\n const { fieldType, typeDefs } = result;\n\n const childTypeDefs = createChildTypeDefs({\n model,\n field,\n fieldRegistry,\n endpointType: \"manage\"\n });\n\n return {\n fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,\n typeDefs: `${typeDefs}\\n${childTypeDefs}`\n };\n }\n\n public createInputField({\n models,\n model,\n field,\n fieldRegistry\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition \| null {\n const result = createTypeFromFields({\n typeOfType: \"input\",\n models,\n model,\n type: \"manage\",\n typeNamePrefix: createTypeName({\n model,\n field,\n parents: field.settings?.parents\n }),\n fields: field.settings?.fields \|\| [],\n fieldRegistry\n });\n if (!result) {\n return null;\n }\n const { fieldType, typeDefs } = result;\n\n return {\n fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,\n typeDefs\n };\n }\n\n public createResolver({\n graphQLType,\n field,\n createFieldResolvers\n }: CmsModelFieldToGraphQL.ResolverParams): CmsModelFieldToGraphQL.Resolver {\n if (!field.settings?.fields \|\| field.settings.fields.length === 0) {\n return false;\n }\n const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n const typeResolvers = createFieldResolvers({\n graphQLType: fieldType,\n fields: field.settings.fields\n });\n return {\n resolver: null,\n typeResolvers: typeResolvers \|\| {}\n };\n }\n\n public createListFilters({ field, model }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createObjectListFilters(field, model);\n }\n}\n\nclass ObjectToGraphQL implements CmsModelFieldToGraphQL.Interface {\n public readonly read = new ReadApi();\n public readonly manage = new ManageApi();\n\n public readonly fieldType: CmsModelFieldType = \"object\";\n public readonly isSearchable: boolean = false;\n public readonly isSortable: boolean = false;\n public readonly isFullTextSearchable: boolean = false;\n\n public getReadApi(): CmsModelFieldToGraphQL.ReadApi {\n return this.read;\n }\n\n public getManageApi(): CmsModelFieldToGraphQL.ManageApi {\n return this.manage;\n }\n\n public validateChildFields(params: ValidateChildFieldsParams<CmsModelField>): void {\n const field = params.field as CmsModelObjectField;\n const originalField = params.originalField as CmsModelObjectField \| undefined;\n params.validate({\n fields: field.settings?.fields ?? [],\n originalFields: originalField?.settings?.fields \|\| []\n });\n }\n\n public getFieldAst(field: CmsModelField, converter: ICmsModelFieldToAst): CmsModelFieldAstNode {\n const objectField = field as CmsModelObjectField;\n const { fields = [], ...settings } = objectField.settings;\n return {\n type: \"field\",\n field: {\n ...objectField,\n settings: settings \|\| {}\n },\n children: fields.map(f => converter.toAst(f))\n };\n }\n}\n\nexport const ObjectFieldToGraphQL = CmsModelFieldToGraphQL.createImplementation({\n implementation: ObjectToGraphQL,\n dependencies: []\n});\n"],"names":["createTypeName","params","model","parents","field","Boolean","id","upperFirst","createChildTypeDefs","fieldRegistry","endpointType","fields","typeName","filters","child","fieldImpl","api","createListFilters","createObjectListFilters","ReadApi","models","result","createTypeFromFields","fieldType","typeDefs","childTypeDefs","createFieldResolvers","graphQLType","typeResolvers","ManageApi","ObjectToGraphQL","originalField","converter","objectField","settings","f","ObjectFieldToGraphQL","CmsModelFieldToGraphQL"],"mappings":"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"}
1	+ {"version":3,"file":"features/graphql/fields/base/ObjectToGraphQL.js","sources":["../../../../../src/features/graphql/fields/base/ObjectToGraphQL.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst.js\";\nimport { CmsModelFieldToGraphQL } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"../abstractions/CmsModelFieldToGraphQLRegistry.js\";\nimport type {\n CmsModel,\n CmsModelField,\n CmsModelFieldType,\n CmsModelFieldDefinition,\n CmsModelObjectField\n} from \"~/types/index.js\";\nimport type { ValidateChildFieldsParams } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type { CmsModelFieldAstNode, ICmsModelFieldToAst } from \"~/types/modelAst.js\";\nimport { createTypeFromFields } from \"~/utils/createTypeFromFields.js\";\n\ninterface CreateTypeNameParams {\n model: Pick<CmsModel, \"singularApiName\">;\n parents?: string[];\n field: CmsModelField;\n}\n\nconst createTypeName = (params: CreateTypeNameParams): string => {\n const { model, parents = [], field } = params;\n return [model.singularApiName]\n .concat(parents)\n .concat([field.fieldId])\n .filter(Boolean)\n .map(id => {\n return upperFirst(id);\n })\n .join(\"_\");\n};\n\ninterface CreateChildTypeDefsParams {\n model: Pick<CmsModel, \"singularApiName\">;\n field: CmsModelField;\n fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n endpointType: \"manage\" \| \"read\";\n}\n\nconst createChildTypeDefs = (params: CreateChildTypeDefsParams): string => {\n const { field, fieldRegistry, model, endpointType } = params;\n const fields = field.settings?.fields \|\| [];\n\n const typeName = createTypeName({\n model,\n field,\n parents: field.settings?.parents\n });\n\n const filters = fields\n .map(child => {\n const fieldImpl = fieldRegistry.get(child.type);\n if (!fieldImpl) {\n return null;\n }\n const api = endpointType === \"manage\" ? fieldImpl.manage : fieldImpl.read;\n const createListFilters = api.createListFilters;\n if (!createListFilters) {\n return null;\n }\n\n const filters = createListFilters({\n model,\n field: {\n ...child,\n settings: {\n ...child.settings,\n parents: (child.settings?.parents \|\| []).concat([field.fieldId])\n }\n },\n fieldRegistry\n });\n if (!filters) {\n return null;\n }\n return filters;\n })\n .filter(Boolean)\n .join(\"\\n\");\n return `input ${typeName}WhereInput {\n ${filters \|\| \"_empty: String\"}\n }\\n`;\n};\n\nconst createObjectListFilters = (\n field: CmsModelField,\n model: Pick<CmsModel, \"singularApiName\">\n): string => {\n const typeName = createTypeName({\n model,\n field,\n parents: field.settings?.parents\n });\n return `${field.fieldId}: ${typeName}WhereInput`;\n};\n\nclass ReadApi implements CmsModelFieldToGraphQL.ReadApi {\n public createTypeField({\n field,\n models,\n model,\n fieldRegistry\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition \| null {\n const result = createTypeFromFields({\n models,\n typeOfType: \"type\",\n model,\n type: \"read\",\n typeNamePrefix: createTypeName({\n model,\n field,\n parents: field.settings?.parents\n }),\n fields: field.settings?.fields \|\| [],\n fieldRegistry\n });\n\n if (!result) {\n return null;\n }\n const { fieldType, typeDefs } = result;\n\n const childTypeDefs = createChildTypeDefs({\n model,\n field,\n fieldRegistry,\n endpointType: \"read\"\n });\n\n const itemIdTypeDef = `\\nextend type ${fieldType} {\\n _id: ID\\n}\\n`;\n\n return {\n fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,\n typeDefs: `${typeDefs}${childTypeDefs}${itemIdTypeDef}`\n };\n }\n\n public createResolver({\n field,\n createFieldResolvers,\n graphQLType\n }: CmsModelFieldToGraphQL.ResolverParams): CmsModelFieldToGraphQL.Resolver {\n if (!field.settings?.fields \|\| field.settings.fields.length === 0) {\n return false;\n }\n\n const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n\n const typeResolvers =\n createFieldResolvers({\n graphQLType: fieldType,\n fields: field.settings.fields\n }) \|\| {};\n\n return {\n resolver: null,\n typeResolvers\n };\n }\n\n public createListFilters({ field, model }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createObjectListFilters(field, model);\n }\n}\n\nclass ManageApi implements CmsModelFieldToGraphQL.ManageApi {\n public createTypeField({\n models,\n model,\n field,\n fieldRegistry\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition \| null {\n const result = createTypeFromFields({\n typeOfType: \"type\",\n models,\n model,\n type: \"manage\",\n typeNamePrefix: createTypeName({\n model,\n field,\n parents: field.settings?.parents\n }),\n fields: field.settings?.fields \|\| [],\n fieldRegistry\n });\n\n if (!result) {\n return null;\n }\n const { fieldType, typeDefs } = result;\n\n const childTypeDefs = createChildTypeDefs({\n model,\n field,\n fieldRegistry,\n endpointType: \"manage\"\n });\n\n const itemIdTypeDef = `\\nextend type ${fieldType} {\\n _id: ID\\n}\\n`;\n\n return {\n fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,\n typeDefs: `${typeDefs}\\n${childTypeDefs}${itemIdTypeDef}`\n };\n }\n\n public createInputField({\n models,\n model,\n field,\n fieldRegistry\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition \| null {\n const result = createTypeFromFields({\n typeOfType: \"input\",\n models,\n model,\n type: \"manage\",\n typeNamePrefix: createTypeName({\n model,\n field,\n parents: field.settings?.parents\n }),\n fields: field.settings?.fields \|\| [],\n fieldRegistry\n });\n if (!result) {\n return null;\n }\n const { fieldType, typeDefs } = result;\n\n const itemIdTypeDef = `\\nextend input ${fieldType} {\\n _id: ID\\n}\\n`;\n\n return {\n fields: `${field.fieldId}: ${field.list ? `[${fieldType}!]` : fieldType}`,\n typeDefs: `${typeDefs}${itemIdTypeDef}`\n };\n }\n\n public createResolver({\n graphQLType,\n field,\n createFieldResolvers\n }: CmsModelFieldToGraphQL.ResolverParams): CmsModelFieldToGraphQL.Resolver {\n if (!field.settings?.fields \|\| field.settings.fields.length === 0) {\n return false;\n }\n const fieldType = `${graphQLType}_${upperFirst(field.fieldId)}`;\n const typeResolvers = createFieldResolvers({\n graphQLType: fieldType,\n fields: field.settings.fields\n });\n return {\n resolver: null,\n typeResolvers: typeResolvers \|\| {}\n };\n }\n\n public createListFilters({ field, model }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createObjectListFilters(field, model);\n }\n}\n\nclass ObjectToGraphQL implements CmsModelFieldToGraphQL.Interface {\n public readonly read = new ReadApi();\n public readonly manage = new ManageApi();\n\n public readonly fieldType: CmsModelFieldType = \"object\";\n public readonly isSearchable: boolean = false;\n public readonly isSortable: boolean = false;\n public readonly isFullTextSearchable: boolean = false;\n\n public getReadApi(): CmsModelFieldToGraphQL.ReadApi {\n return this.read;\n }\n\n public getManageApi(): CmsModelFieldToGraphQL.ManageApi {\n return this.manage;\n }\n\n public validateChildFields(params: ValidateChildFieldsParams<CmsModelField>): void {\n const field = params.field as CmsModelObjectField;\n const originalField = params.originalField as CmsModelObjectField \| undefined;\n params.validate({\n fields: field.settings?.fields ?? [],\n originalFields: originalField?.settings?.fields \|\| []\n });\n }\n\n public getFieldAst(field: CmsModelField, converter: ICmsModelFieldToAst): CmsModelFieldAstNode {\n const objectField = field as CmsModelObjectField;\n const { fields = [], ...settings } = objectField.settings;\n return {\n type: \"field\",\n field: {\n ...objectField,\n settings: settings \|\| {}\n },\n children: fields.map(f => converter.toAst(f))\n };\n }\n}\n\nexport const ObjectFieldToGraphQL = CmsModelFieldToGraphQL.createImplementation({\n implementation: ObjectToGraphQL,\n dependencies: []\n});\n"],"names":["createTypeName","params","model","parents","field","Boolean","id","upperFirst","createChildTypeDefs","fieldRegistry","endpointType","fields","typeName","filters","child","fieldImpl","api","createListFilters","createObjectListFilters","ReadApi","models","result","createTypeFromFields","fieldType","typeDefs","childTypeDefs","itemIdTypeDef","createFieldResolvers","graphQLType","typeResolvers","ManageApi","ObjectToGraphQL","originalField","converter","objectField","settings","f","ObjectFieldToGraphQL","CmsModelFieldToGraphQL"],"mappings":"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"}

package/features/graphql/fields/base/RefToGraphQL.js CHANGED Viewed

@@ -6,6 +6,7 @@ import { createGraphQLInputField } from "./utils/createGraphQLInputField.js";
 import { GetModelUseCase } from "../../../contentModel/GetModel/index.js";
 import { GetPublishedEntriesByIdsUseCase } from "../../../contentEntry/GetPublishedEntriesByIds/index.js";
 import { GetLatestEntriesByIdsUseCase } from "../../../contentEntry/GetLatestEntriesByIds/index.js";
+import { Logger } from "@webiny/api-core/exports/api/logger.js";
 const createUnionTypeName = (model, field)=>`${model.singularApiName}_${createTypeName(field.fieldId)}`;
 const createListFilters = (fieldId)=>`
         ${fieldId}: RefFieldWhereInput
@@ -78,6 +79,7 @@ class ReadApi {
             const getModel = container.resolve(GetModelUseCase);
             const getPublishedByIds = container.resolve(GetPublishedEntriesByIdsUseCase);
             const getLatestByIds = container.resolve(GetLatestEntriesByIdsUseCase);
+            const logger = container.resolve(Logger);
             const initialValue = getValue(parent);
             if (!initialValue) return null;
             if (false === args.populate) return initialValue;
@@ -94,14 +96,18 @@ class ReadApi {
                 const getters = Object.keys(entriesByModel).map(async (modelId)=>{
                     const idList = entriesByModel[modelId];
                     const modelResult = await getModel.execute(modelId);
+                    if (modelResult.isFail()) {
+                        logger.error(modelResult.error);
+                        return [];
+                    }
                     const model = modelResult.value;
-                    let entries;
+                    let entries = [];
                     if (cms.READ) {
                         const getPublishedResult = await getPublishedByIds.execute(model, idList);
-                        entries = getPublishedResult.value;
+                        if (getPublishedResult.isOk()) entries = getPublishedResult.value;
                     } else {
-                        const latestByIsResult = await getLatestByIds.execute(model, idList);
-                        entries = latestByIsResult.value;
+                        const latestByIdsResult = await getLatestByIds.execute(model, idList);
+                        if (latestByIdsResult.isOk()) entries = latestByIdsResult.value;
                     }
                     return appendTypename(entries, modelIdToTypeName.get(modelId));
                 });
@@ -110,18 +116,22 @@ class ReadApi {
             }
             const value = initialValue;
             const modelResult = await getModel.execute(value.modelId);
+            if (modelResult.isFail()) {
+                logger.error(modelResult.error);
+                return null;
+            }
             const model = modelResult.value;
-            let revisions;
+            let revisions = [];
             if (cms.READ) {
                 const publishedByIdsResult = await getPublishedByIds.execute(model, [
                     value.entryId
                 ]);
-                revisions = publishedByIdsResult.value;
+                if (publishedByIdsResult.isOk()) revisions = publishedByIdsResult.value;
             } else {
                 const latestByIdsResult = await getLatestByIds.execute(model, [
                     value.entryId
                 ]);
-                revisions = latestByIdsResult.value;
+                if (latestByIdsResult.isOk()) revisions = latestByIdsResult.value;
             }
             if (!revisions || 0 === revisions.length) return null;
             return {

package/features/graphql/fields/base/RefToGraphQL.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/graphql/fields/base/RefToGraphQL.js","sources":["../../../../../src/features/graphql/fields/base/RefToGraphQL.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsModelFieldToGraphQL } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type {\n CmsContext,\n CmsEntry,\n CmsModel,\n CmsModelField,\n CmsModelFieldType,\n CmsModelFieldDefinition\n} from \"~/types/index.js\";\nimport type { GraphQLSchemaDefinition } from \"@webiny/handler-graphql/types.js\";\nimport { createTypeName } from \"~/utils/createTypeName.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createGraphQLInputField } from \"./utils/createGraphQLInputField.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\nimport { GetPublishedEntriesByIdsUseCase } from \"~/features/contentEntry/GetPublishedEntriesByIds/index.js\";\nimport { GetLatestEntriesByIdsUseCase } from \"~/features/contentEntry/GetLatestEntriesByIds/index.js\";\n\ninterface RefFieldValue {\n /*\n `id` is optional for backwards compatibility with records created before this property was introduced.\n /\n id?: string;\n entryId: string;\n modelId: string;\n}\n\nconst createUnionTypeName = (model: CmsModel, field: CmsModelField) => {\n return `${model.singularApiName}_${createTypeName(field.fieldId)}`;\n};\n\nconst createListFilters = (fieldId: string): string => {\n return `\n ${fieldId}: RefFieldWhereInput\n `;\n};\n\nconst createFilteringTypeDef = () => {\n return `\n input RefFieldWhereInput {\n id: String\n id_not: String\n id_in: [String!]\n id_not_in: [String]\n entryId: String\n entryId_not: String\n entryId_in: [String!]\n entryId_not_in: [String!]\n modelId: String\n modelId_not: String\n modelId_in: [String!]\n modelId_not_in: [String!]\n }\n `;\n};\n\nconst appendTypename = (entries: CmsEntry[], typename: string): CmsEntry[] => {\n return entries.map(item => {\n return {\n ...item,\n __typename: typename\n };\n });\n};\n\nconst getFieldModels = (field: CmsModelField): Pick<CmsModel, \"modelId\">[] => {\n if (!field.settings \|\| Array.isArray(field.settings.models) === false) {\n return [];\n }\n return field.settings.models as Pick<CmsModel, \"modelId\">[];\n};\n\nconst modelIdToTypeName = new Map<string, string>();\n\ninterface GetModelParams {\n models: CmsModel[];\n modelId: string;\n}\n\nconst getModel = (params: GetModelParams): CmsModel => {\n const { models, modelId } = params;\n const model = models.find(item => item.modelId === modelId);\n if (model) {\n return model;\n }\n throw new WebinyError(\n `Could not find model with ID \"${modelId}\" in the list of models.`,\n \"MODEL_NOT_FOUND\",\n { modelId }\n );\n};\n\nconst getModelSingularApiName = (params: GetModelParams): string => {\n return getModel(params).singularApiName;\n};\n\nclass ReadApi implements CmsModelFieldToGraphQL.ReadApi {\n public createTypeField({\n model,\n field,\n models\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition {\n const fieldModels = field.settings?.models \|\| [];\n const gqlType =\n fieldModels.length > 1\n ? createUnionTypeName(model, field)\n : getModelSingularApiName({ models, modelId: fieldModels[0].modelId });\n const typeDefs =\n fieldModels.length > 1\n ? `union ${gqlType} = ${getFieldModels(field)\n .map(({ modelId }) => getModelSingularApiName({ models, modelId }))\n .join(\" \| \")}`\n : \"\";\n\n return {\n fields:\n field.fieldId +\n `(populate: Boolean = true): ${field.list ? `[${gqlType}!]` : gqlType}`,\n typeDefs\n };\n }\n\n public createListFilters({ field }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createListFilters(field.fieldId);\n }\n\n public createResolver({\n field,\n models\n }: CmsModelFieldToGraphQL.ResolverParams): CmsModelFieldToGraphQL.Resolver {\n const fieldModels = field.settings?.models \|\| [];\n for (const item of fieldModels) {\n modelIdToTypeName.set(\n item.modelId,\n getModelSingularApiName({ models, modelId: item.modelId })\n );\n }\n\n const getValue = (parent: any): RefFieldValue \| RefFieldValue[] => {\n if (parent.values) {\n return parent.values[field.fieldId];\n }\n return parent[field.fieldId];\n };\n\n / @ts-expect-error Mixed return types for createResolver. /\n return async (parent: CmsEntry, args: any, context: CmsContext) => {\n const { cms, container } = context;\n\n const getModel = container.resolve(GetModelUseCase);\n const getPublishedByIds = container.resolve(GetPublishedEntriesByIdsUseCase);\n const getLatestByIds = container.resolve(GetLatestEntriesByIdsUseCase);\n\n const initialValue = getValue(parent);\n\n if (!initialValue) {\n return null;\n }\n if (args.populate === false) {\n return initialValue;\n }\n\n if (field.list) {\n const referenceFieldValues = initialValue as RefFieldValue[];\n if (\n Array.isArray(referenceFieldValues) === false \|\|\n referenceFieldValues.length === 0\n ) {\n return [];\n }\n\n const entriesByModel = referenceFieldValues.reduce(\n (collection, ref) => {\n if (!collection[ref.modelId]) {\n collection[ref.modelId] = [];\n } else if (collection[ref.modelId].includes(ref.entryId) === true) {\n return collection;\n }\n collection[ref.modelId].push(ref.entryId);\n return collection;\n },\n {} as Record<string, string[]>\n );\n\n const getters = Object.keys(entriesByModel).map(async modelId => {\n const idList = entriesByModel[modelId];\n const modelResult = await getModel.execute(modelId);\n const model = modelResult.value;\n\n let entries: CmsEntry[];\n if (cms.READ) {\n const getPublishedResult = await getPublishedByIds.execute(model, idList);\n entries = getPublishedResult.value;\n } else {\n const latestByIsResult = await getLatestByIds.execute(model, idList);\n entries = latestByIsResult.value;\n }\n return appendTypename(entries, modelIdToTypeName.get(modelId)!);\n });\n\n const references = await Promise.all(getters).then((results: CmsEntry[][]) => {\n return results.reduce((result, item) => {\n return result.concat(item);\n }, []);\n });\n\n return referenceFieldValues\n .map(v => {\n return references.find(ref => ref.entryId === v.entryId);\n })\n .filter(Boolean);\n }\n\n const value = initialValue as RefFieldValue;\n const modelResult = await getModel.execute(value.modelId);\n const model = modelResult.value;\n\n let revisions: CmsEntry[];\n if (cms.READ) {\n const publishedByIdsResult = await getPublishedByIds.execute(model, [\n value.entryId\n ]);\n revisions = publishedByIdsResult.value;\n } else {\n const latestByIdsResult = await getLatestByIds.execute(model, [value.entryId]);\n revisions = latestByIdsResult.value;\n }\n\n if (!revisions \|\| revisions.length === 0) {\n return null;\n }\n return {\n ...revisions[0],\n __typename: modelIdToTypeName.get(value.modelId)\n };\n };\n }\n\n public createSchema(): GraphQLSchemaDefinition<CmsContext> {\n return {\n typeDefs: createFilteringTypeDef(),\n resolvers: {}\n };\n }\n}\n\nclass ManageApi implements CmsModelFieldToGraphQL.ManageApi {\n public createTypeField({ field }: CmsModelFieldToGraphQL.TypeFieldParams): string {\n if (field.list) {\n return `${field.fieldId}: [RefField!]`;\n }\n return `${field.fieldId}: RefField`;\n }\n\n public createInputField({ field }: CmsModelFieldToGraphQL.TypeFieldParams): string {\n return createGraphQLInputField(field, \"RefFieldInput\");\n }\n\n public createListFilters({ field }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createListFilters(field.fieldId);\n }\n\n public createSchema(): GraphQLSchemaDefinition<CmsContext> {\n return {\n typeDefs: / GraphQL */ `\n type RefField {\n modelId: String!\n entryId: ID!\n id: ID!\n }\n\n input RefFieldInput {\n modelId: String!\n id: RevisionId!\n }\n\n ${createFilteringTypeDef()}\n `,\n resolvers: {\n RefField: {\n entryId: (parent: RefFieldValue) => {\n const { id } = parseIdentifier(parent.entryId \|\| parent.id);\n return id;\n },\n id: (parent: RefFieldValue) => {\n return parent.id \|\| parent.entryId;\n }\n }\n }\n };\n }\n}\n\nclass RefToGraphQL implements CmsModelFieldToGraphQL.Interface {\n public readonly read = new ReadApi();\n public readonly manage = new ManageApi();\n\n public readonly fieldType: CmsModelFieldType = \"ref\";\n public readonly isSearchable: boolean = true;\n public readonly isSortable: boolean = false;\n public readonly isFullTextSearchable: boolean = false;\n\n public getReadApi(): CmsModelFieldToGraphQL.ReadApi {\n return this.read;\n }\n\n public getManageApi(): CmsModelFieldToGraphQL.ManageApi {\n return this.manage;\n }\n}\n\nexport const RefFieldToGraphQL = CmsModelFieldToGraphQL.createImplementation({\n implementation: RefToGraphQL,\n dependencies: []\n});\n"],"names":["createUnionTypeName","model","field","createTypeName","createListFilters","fieldId","createFilteringTypeDef","appendTypename","entries","typename","item","getFieldModels","Array","modelIdToTypeName","Map","getModel","params","models","modelId","WebinyError","getModelSingularApiName","ReadApi","fieldModels","gqlType","typeDefs","getValue","parent","args","context","cms","container","GetModelUseCase","getPublishedByIds","GetPublishedEntriesByIdsUseCase","getLatestByIds","GetLatestEntriesByIdsUseCase","initialValue","referenceFieldValues","entriesByModel","collection","ref","getters","Object","idList","modelResult","getPublishedResult","latestByIsResult","references","Promise","results","result","v","Boolean","value","revisions","publishedByIdsResult","latestByIdsResult","ManageApi","createGraphQLInputField","id","parseIdentifier","RefToGraphQL","RefFieldToGraphQL","CmsModelFieldToGraphQL"],"mappings":"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"}
1	+ {"version":3,"file":"features/graphql/fields/base/RefToGraphQL.js","sources":["../../../../../src/features/graphql/fields/base/RefToGraphQL.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsModelFieldToGraphQL } from \"../abstractions/CmsModelFieldToGraphQL.js\";\nimport type {\n CmsContext,\n CmsEntry,\n CmsModel,\n CmsModelField,\n CmsModelFieldType,\n CmsModelFieldDefinition\n} from \"~/types/index.js\";\nimport type { GraphQLSchemaDefinition } from \"@webiny/handler-graphql/types.js\";\nimport { createTypeName } from \"~/utils/createTypeName.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createGraphQLInputField } from \"./utils/createGraphQLInputField.js\";\nimport { GetModelUseCase } from \"~/features/contentModel/GetModel/index.js\";\nimport { GetPublishedEntriesByIdsUseCase } from \"~/features/contentEntry/GetPublishedEntriesByIds/index.js\";\nimport { GetLatestEntriesByIdsUseCase } from \"~/features/contentEntry/GetLatestEntriesByIds/index.js\";\nimport { Logger } from \"@webiny/api-core/exports/api/logger.js\";\n\ninterface RefFieldValue {\n /*\n `id` is optional for backwards compatibility with records created before this property was introduced.\n /\n id?: string;\n entryId: string;\n modelId: string;\n}\n\nconst createUnionTypeName = (model: CmsModel, field: CmsModelField) => {\n return `${model.singularApiName}_${createTypeName(field.fieldId)}`;\n};\n\nconst createListFilters = (fieldId: string): string => {\n return `\n ${fieldId}: RefFieldWhereInput\n `;\n};\n\nconst createFilteringTypeDef = () => {\n return `\n input RefFieldWhereInput {\n id: String\n id_not: String\n id_in: [String!]\n id_not_in: [String]\n entryId: String\n entryId_not: String\n entryId_in: [String!]\n entryId_not_in: [String!]\n modelId: String\n modelId_not: String\n modelId_in: [String!]\n modelId_not_in: [String!]\n }\n `;\n};\n\nconst appendTypename = (entries: CmsEntry[], typename: string): CmsEntry[] => {\n return entries.map(item => {\n return {\n ...item,\n __typename: typename\n };\n });\n};\n\nconst getFieldModels = (field: CmsModelField): Pick<CmsModel, \"modelId\">[] => {\n if (!field.settings \|\| Array.isArray(field.settings.models) === false) {\n return [];\n }\n return field.settings.models as Pick<CmsModel, \"modelId\">[];\n};\n\nconst modelIdToTypeName = new Map<string, string>();\n\ninterface GetModelParams {\n models: CmsModel[];\n modelId: string;\n}\n\nconst getModel = (params: GetModelParams): CmsModel => {\n const { models, modelId } = params;\n const model = models.find(item => item.modelId === modelId);\n if (model) {\n return model;\n }\n throw new WebinyError(\n `Could not find model with ID \"${modelId}\" in the list of models.`,\n \"MODEL_NOT_FOUND\",\n { modelId }\n );\n};\n\nconst getModelSingularApiName = (params: GetModelParams): string => {\n return getModel(params).singularApiName;\n};\n\nclass ReadApi implements CmsModelFieldToGraphQL.ReadApi {\n public createTypeField({\n model,\n field,\n models\n }: CmsModelFieldToGraphQL.TypeFieldParams): CmsModelFieldDefinition {\n const fieldModels = field.settings?.models \|\| [];\n const gqlType =\n fieldModels.length > 1\n ? createUnionTypeName(model, field)\n : getModelSingularApiName({ models, modelId: fieldModels[0].modelId });\n const typeDefs =\n fieldModels.length > 1\n ? `union ${gqlType} = ${getFieldModels(field)\n .map(({ modelId }) => getModelSingularApiName({ models, modelId }))\n .join(\" \| \")}`\n : \"\";\n\n return {\n fields:\n field.fieldId +\n `(populate: Boolean = true): ${field.list ? `[${gqlType}!]` : gqlType}`,\n typeDefs\n };\n }\n\n public createListFilters({ field }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createListFilters(field.fieldId);\n }\n\n public createResolver({\n field,\n models\n }: CmsModelFieldToGraphQL.ResolverParams): CmsModelFieldToGraphQL.Resolver {\n const fieldModels = field.settings?.models \|\| [];\n for (const item of fieldModels) {\n modelIdToTypeName.set(\n item.modelId,\n getModelSingularApiName({ models, modelId: item.modelId })\n );\n }\n\n const getValue = (parent: any): RefFieldValue \| RefFieldValue[] => {\n if (parent.values) {\n return parent.values[field.fieldId];\n }\n return parent[field.fieldId];\n };\n\n / @ts-expect-error Mixed return types for createResolver. /\n return async (parent: CmsEntry, args: any, context: CmsContext) => {\n const { cms, container } = context;\n\n const getModel = container.resolve(GetModelUseCase);\n const getPublishedByIds = container.resolve(GetPublishedEntriesByIdsUseCase);\n const getLatestByIds = container.resolve(GetLatestEntriesByIdsUseCase);\n const logger = container.resolve(Logger);\n\n const initialValue = getValue(parent);\n\n if (!initialValue) {\n return null;\n }\n if (args.populate === false) {\n return initialValue;\n }\n\n if (field.list) {\n const referenceFieldValues = initialValue as RefFieldValue[];\n if (\n Array.isArray(referenceFieldValues) === false \|\|\n referenceFieldValues.length === 0\n ) {\n return [];\n }\n\n const entriesByModel = referenceFieldValues.reduce<Record<string, string[]>>(\n (collection, ref) => {\n if (!collection[ref.modelId]) {\n collection[ref.modelId] = [];\n } else if (collection[ref.modelId].includes(ref.entryId) === true) {\n return collection;\n }\n collection[ref.modelId].push(ref.entryId);\n return collection;\n },\n {}\n );\n\n const getters = Object.keys(entriesByModel).map(async modelId => {\n const idList = entriesByModel[modelId];\n const modelResult = await getModel.execute(modelId);\n if (modelResult.isFail()) {\n logger.error(modelResult.error);\n return [];\n }\n const model = modelResult.value;\n\n let entries: CmsEntry[] = [];\n if (cms.READ) {\n const getPublishedResult = await getPublishedByIds.execute(model, idList);\n if (getPublishedResult.isOk()) {\n entries = getPublishedResult.value;\n }\n } else {\n const latestByIdsResult = await getLatestByIds.execute(model, idList);\n if (latestByIdsResult.isOk()) {\n entries = latestByIdsResult.value;\n }\n }\n return appendTypename(entries, modelIdToTypeName.get(modelId)!);\n });\n\n const references = await Promise.all(getters).then((results: CmsEntry[][]) => {\n return results.reduce((result, item) => {\n return result.concat(item);\n }, []);\n });\n\n return referenceFieldValues\n .map(v => {\n return references.find(ref => ref.entryId === v.entryId);\n })\n .filter(Boolean);\n }\n\n const value = initialValue as RefFieldValue;\n const modelResult = await getModel.execute(value.modelId);\n if (modelResult.isFail()) {\n logger.error(modelResult.error);\n return null;\n }\n const model = modelResult.value;\n\n let revisions: CmsEntry[] = [];\n if (cms.READ) {\n const publishedByIdsResult = await getPublishedByIds.execute(model, [\n value.entryId\n ]);\n if (publishedByIdsResult.isOk()) {\n revisions = publishedByIdsResult.value;\n }\n } else {\n const latestByIdsResult = await getLatestByIds.execute(model, [value.entryId]);\n if (latestByIdsResult.isOk()) {\n revisions = latestByIdsResult.value;\n }\n }\n\n if (!revisions \|\| revisions.length === 0) {\n return null;\n }\n return {\n ...revisions[0],\n __typename: modelIdToTypeName.get(value.modelId)\n };\n };\n }\n\n public createSchema(): GraphQLSchemaDefinition<CmsContext> {\n return {\n typeDefs: createFilteringTypeDef(),\n resolvers: {}\n };\n }\n}\n\nclass ManageApi implements CmsModelFieldToGraphQL.ManageApi {\n public createTypeField({ field }: CmsModelFieldToGraphQL.TypeFieldParams): string {\n if (field.list) {\n return `${field.fieldId}: [RefField!]`;\n }\n return `${field.fieldId}: RefField`;\n }\n\n public createInputField({ field }: CmsModelFieldToGraphQL.TypeFieldParams): string {\n return createGraphQLInputField(field, \"RefFieldInput\");\n }\n\n public createListFilters({ field }: CmsModelFieldToGraphQL.ListFiltersParams): string {\n return createListFilters(field.fieldId);\n }\n\n public createSchema(): GraphQLSchemaDefinition<CmsContext> {\n return {\n typeDefs: / GraphQL */ `\n type RefField {\n modelId: String!\n entryId: ID!\n id: ID!\n }\n\n input RefFieldInput {\n modelId: String!\n id: RevisionId!\n }\n\n ${createFilteringTypeDef()}\n `,\n resolvers: {\n RefField: {\n entryId: (parent: RefFieldValue) => {\n const { id } = parseIdentifier(parent.entryId \|\| parent.id);\n return id;\n },\n id: (parent: RefFieldValue) => {\n return parent.id \|\| parent.entryId;\n }\n }\n }\n };\n }\n}\n\nclass RefToGraphQL implements CmsModelFieldToGraphQL.Interface {\n public readonly read = new ReadApi();\n public readonly manage = new ManageApi();\n\n public readonly fieldType: CmsModelFieldType = \"ref\";\n public readonly isSearchable: boolean = true;\n public readonly isSortable: boolean = false;\n public readonly isFullTextSearchable: boolean = false;\n\n public getReadApi(): CmsModelFieldToGraphQL.ReadApi {\n return this.read;\n }\n\n public getManageApi(): CmsModelFieldToGraphQL.ManageApi {\n return this.manage;\n }\n}\n\nexport const RefFieldToGraphQL = CmsModelFieldToGraphQL.createImplementation({\n implementation: RefToGraphQL,\n dependencies: []\n});\n"],"names":["createUnionTypeName","model","field","createTypeName","createListFilters","fieldId","createFilteringTypeDef","appendTypename","entries","typename","item","getFieldModels","Array","modelIdToTypeName","Map","getModel","params","models","modelId","WebinyError","getModelSingularApiName","ReadApi","fieldModels","gqlType","typeDefs","getValue","parent","args","context","cms","container","GetModelUseCase","getPublishedByIds","GetPublishedEntriesByIdsUseCase","getLatestByIds","GetLatestEntriesByIdsUseCase","logger","Logger","initialValue","referenceFieldValues","entriesByModel","collection","ref","getters","Object","idList","modelResult","getPublishedResult","latestByIdsResult","references","Promise","results","result","v","Boolean","value","revisions","publishedByIdsResult","ManageApi","createGraphQLInputField","id","parseIdentifier","RefToGraphQL","RefFieldToGraphQL","CmsModelFieldToGraphQL"],"mappings":"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"}

package/features/modelBuilder/abstractions.d.ts CHANGED Viewed

@@ -7,8 +7,7 @@ import type { IModelBuilderPrivateInput, IModelBuilderPublicInput } from "./mode
  */
 export interface IModelSettings {
     aiEntryWizard?: boolean;
-    previewPrefix?: string;
-    previewSlug?: string;
+    previewPath?: string;
     [key: string]: any;
 }
 /**

package/features/modelBuilder/abstractions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/modelBuilder/abstractions.js","sources":["../../../src/features/modelBuilder/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { PrivateModelBuilder } from \"./models/PrivateModelBuilder.js\";\nimport type { PublicModelBuilder } from \"./models/PublicModelBuilder.js\";\nimport type { IModelBuilderPrivateInput, IModelBuilderPublicInput } from \"./models/ModelBuilder.js\";\n\n/*\n Augmentable model settings interface.\n * External packages can extend this via module augmentation.\n /\nexport interface IModelSettings {\n aiEntryWizard?: boolean;\n ~~previewPrefix~~?: string;\n ~~previewSlug?: string;\n~~ [key: string]: any;\n}\n\n/\n Augmentable field builder registry. Provides access to all registered field types.\n /\nexport interface IFieldBuilderRegistry {\n /\n Mark the next field creation as an extension.\n * When extending, the registry will create a temporary builder marked with _extendMode,\n * and BaseModelBuilder will merge its operations into the existing field.\n /\n extend(): this;\n\n // Field types will be added via module augmentation by field type implementations\n // Example: text(): ITextFieldBuilder;\n}\n\n/\n @internal Do not export this abstraction. We don't want external developers to use it.\n /\nexport const FieldBuilderRegistry =\n createAbstraction<FieldBuilderRegistry.Interface>(\"FieldBuilderRegistry\");\n\nexport namespace FieldBuilderRegistry {\n export interface Interface extends IFieldBuilderRegistry {}\n}\n\n/\n Unified Model abstraction\n * External developers implement this to provide both public and private models\n /\n\nexport interface IModelBuilder {\n private(input: IModelBuilderPrivateInput): PrivateModelBuilder;\n public(input: IModelBuilderPublicInput): PublicModelBuilder;\n}\n\nexport interface IModelFactory {\n execute(builder: IModelBuilder): Promise<PrivateModelBuilder[] \| PublicModelBuilder[]>;\n}\n\n/* Provide code-defined content models. */\nexport const ModelFactory = createAbstraction<IModelFactory>(\"Cms/ModelFactory\");\nexport namespace ModelFactory {\n export type Interface = IModelFactory;\n export type Return = Promise<PrivateModelBuilder[] \| PublicModelBuilder[]>;\n export type Builder = IModelBuilder;\n export type FieldBuilder = FieldBuilderRegistry.Interface;\n}\n"],"names":["FieldBuilderRegistry","createAbstraction","ModelFactory"],"mappings":";~~AAkCO~~,MAAMA,uBACTC,kBAAkD;AAqB/C,MAAMC,eAAeD,kBAAiC"}
1	+ {"version":3,"file":"features/modelBuilder/abstractions.js","sources":["../../../src/features/modelBuilder/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { PrivateModelBuilder } from \"./models/PrivateModelBuilder.js\";\nimport type { PublicModelBuilder } from \"./models/PublicModelBuilder.js\";\nimport type { IModelBuilderPrivateInput, IModelBuilderPublicInput } from \"./models/ModelBuilder.js\";\n\n/*\n Augmentable model settings interface.\n * External packages can extend this via module augmentation.\n /\nexport interface IModelSettings {\n aiEntryWizard?: boolean;\n previewPath?: string;\n [key: string]: any;\n}\n\n/\n Augmentable field builder registry. Provides access to all registered field types.\n /\nexport interface IFieldBuilderRegistry {\n /\n Mark the next field creation as an extension.\n * When extending, the registry will create a temporary builder marked with _extendMode,\n * and BaseModelBuilder will merge its operations into the existing field.\n /\n extend(): this;\n\n // Field types will be added via module augmentation by field type implementations\n // Example: text(): ITextFieldBuilder;\n}\n\n/\n @internal Do not export this abstraction. We don't want external developers to use it.\n /\nexport const FieldBuilderRegistry =\n createAbstraction<FieldBuilderRegistry.Interface>(\"FieldBuilderRegistry\");\n\nexport namespace FieldBuilderRegistry {\n export interface Interface extends IFieldBuilderRegistry {}\n}\n\n/\n Unified Model abstraction\n * External developers implement this to provide both public and private models\n /\n\nexport interface IModelBuilder {\n private(input: IModelBuilderPrivateInput): PrivateModelBuilder;\n public(input: IModelBuilderPublicInput): PublicModelBuilder;\n}\n\nexport interface IModelFactory {\n execute(builder: IModelBuilder): Promise<PrivateModelBuilder[] \| PublicModelBuilder[]>;\n}\n\n/* Provide code-defined content models. */\nexport const ModelFactory = createAbstraction<IModelFactory>(\"Cms/ModelFactory\");\nexport namespace ModelFactory {\n export type Interface = IModelFactory;\n export type Return = Promise<PrivateModelBuilder[] \| PublicModelBuilder[]>;\n export type Builder = IModelBuilder;\n export type FieldBuilder = FieldBuilderRegistry.Interface;\n}\n"],"names":["FieldBuilderRegistry","createAbstraction","ModelFactory"],"mappings":";AAiCO,MAAMA,uBACTC,kBAAkD;AAqB/C,MAAMC,eAAeD,kBAAiC"}

package/features/runtimeTenant/RuntimeTenant.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { RuntimeTenant as Abstraction } from "./abstractions.js";
+import { TenantContext } from "@webiny/api-core/exports/api/tenancy.js";
+declare class RuntimeTenantImpl implements Abstraction.Interface {
+    private tenantContext;
+    constructor(tenantContext: TenantContext.Interface);
+    assign<T extends {
+        tenant: string;
+    }>(obj: T): T;
+}
+export declare const RuntimeTenant: typeof RuntimeTenantImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").IRuntimeTenant>;
+};
+export {};

package/features/runtimeTenant/RuntimeTenant.js ADDED Viewed

@@ -0,0 +1,22 @@
+import { RuntimeTenant } from "./abstractions.js";
+import { TenantContext } from "@webiny/api-core/exports/api/tenancy.js";
+class RuntimeTenantImpl {
+    constructor(tenantContext){
+        this.tenantContext = tenantContext;
+    }
+    assign(obj) {
+        return structuredClone({
+            ...obj,
+            tenant: this.tenantContext.getTenant().id
+        });
+    }
+}
+const RuntimeTenant_RuntimeTenant = RuntimeTenant.createImplementation({
+    implementation: RuntimeTenantImpl,
+    dependencies: [
+        TenantContext
+    ]
+});
+export { RuntimeTenant_RuntimeTenant as RuntimeTenant };
+//# sourceMappingURL=RuntimeTenant.js.map

package/features/runtimeTenant/RuntimeTenant.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"features/runtimeTenant/RuntimeTenant.js","sources":["../../../src/features/runtimeTenant/RuntimeTenant.ts"],"sourcesContent":["import { RuntimeTenant as Abstraction } from \"./abstractions.js\";\nimport { TenantContext } from \"@webiny/api-core/exports/api/tenancy.js\";\n\nclass RuntimeTenantImpl implements Abstraction.Interface {\n public constructor(private tenantContext: TenantContext.Interface) {}\n\n public assign<T extends { tenant: string }>(obj: T): T {\n return structuredClone({ ...obj, tenant: this.tenantContext.getTenant().id });\n }\n}\n\nexport const RuntimeTenant = Abstraction.createImplementation({\n implementation: RuntimeTenantImpl,\n dependencies: [TenantContext]\n});\n"],"names":["RuntimeTenantImpl","tenantContext","obj","structuredClone","RuntimeTenant","Abstraction","TenantContext"],"mappings":";;AAGA,MAAMA;IACF,YAA2BC,aAAsC,CAAE;aAAxCA,aAAa,GAAbA;IAAyC;IAE7D,OAAqCC,GAAM,EAAK;QACnD,OAAOC,gBAAgB;YAAE,GAAGD,GAAG;YAAE,QAAQ,IAAI,CAAC,aAAa,CAAC,SAAS,GAAG,EAAE;QAAC;IAC/E;AACJ;AAEO,MAAME,8BAAgBC,cAAAA,oBAAgC,CAAC;IAC1D,gBAAgBL;IAChB,cAAc;QAACM;KAAc;AACjC"}

package/features/runtimeTenant/abstractions.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+interface HasTenant {
+    tenant: string;
+}
+export interface IRuntimeTenant {
+    assign<T extends HasTenant>(obj: T): T;
+}
+export declare const RuntimeTenant: import("@webiny/di").Abstraction<IRuntimeTenant>;
+export declare namespace RuntimeTenant {
+    type Interface = IRuntimeTenant;
+}
+export {};

package/features/runtimeTenant/abstractions.js ADDED Viewed

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/api";
+const RuntimeTenant = createAbstraction("Cms/RuntimeTenant");
+export { RuntimeTenant };
+//# sourceMappingURL=abstractions.js.map

package/features/runtimeTenant/abstractions.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"features/runtimeTenant/abstractions.js","sources":["../../../src/features/runtimeTenant/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\n\ninterface HasTenant {\n tenant: string;\n}\n\nexport interface IRuntimeTenant {\n assign<T extends HasTenant>(obj: T): T;\n}\n\nexport const RuntimeTenant = createAbstraction<IRuntimeTenant>(\"Cms/RuntimeTenant\");\n\nexport namespace RuntimeTenant {\n export type Interface = IRuntimeTenant;\n}\n"],"names":["RuntimeTenant","createAbstraction"],"mappings":";AAUO,MAAMA,gBAAgBC,kBAAkC"}

package/features/runtimeTenant/index.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { RuntimeTenant } from "./abstractions.js";
2	+ export { RuntimeTenant as RuntimeTenantImplementation } from "./RuntimeTenant.js";

package/features/runtimeTenant/index.js ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { RuntimeTenant } from "./abstractions.js";
2	+ export { RuntimeTenant as RuntimeTenantImplementation } from "./RuntimeTenant.js";

package/features/sortMapper/SortMapper.js CHANGED Viewed

@@ -4,10 +4,7 @@ class SortImpl {
         const { fields: modelFields, input } = params;
         if (!input) return;
         const fields = modelFields.map((field)=>field.fieldId);
-        const isField = (key)=>{
-            const field = key.split("_")[0];
-            return fields.includes(field);
-        };
+        const isField = (key)=>fields.includes(key);
         return this.mapSort({
             input,
             isField
@@ -16,7 +13,7 @@ class SortImpl {
     mapSort(params) {
         const { input, isField } = params;
         return input.map((sort)=>{
-            const match = sort.match(/^(values_)?([a-zA-Z][a-zA-Z0-9]*)_(ASC|DESC)$/);
+            const match = sort.match(/^(values_)?([a-zA-Z][a-zA-Z0-9_]*)_(ASC|DESC)$/);
             if (!match) return null;
             const [, hasValues, field, direction] = match;
             if (hasValues) return sort;

package/features/sortMapper/SortMapper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/sortMapper/SortMapper.js","sources":["../../../src/features/sortMapper/SortMapper.ts"],"sourcesContent":["/*\n Used to map sorting for custom CMS Models.\n /\nimport { type CmsEntryListSort } from \"~/types/types.js\";\nimport { CmsSortMapper, ICmsSortMapperParams } from \"./abstractions.js\";\n\ninterface IMapSortParams {\n input: CmsEntryListSort;\n isField: (key: string) => boolean;\n}\n\nclass SortImpl implements CmsSortMapper.Interface {\n map(params: ICmsSortMapperParams): CmsEntryListSort \| undefined {\n const { fields: modelFields, input } = params;\n if (!input) {\n return undefined;\n }\n\n const fields = modelFields.map(field => {\n return field.fieldId;\n });\n\n const isField = (key: string): boolean => {\n ~~const field = key.split(\"_\")[0];\n~~ return fields.includes(~~field~~);\n };\n\n return this.mapSort({\n input,\n isField\n });\n }\n\n private mapSort(params: IMapSortParams): CmsEntryListSort {\n const { input, isField } = params;\n\n return input\n .map(sort => {\n const match = sort.match(/^(values_)?([a-zA-Z][a-zA-Z0-9])_(ASC\|DESC)$/);\n if (!match) {\n return null;\n }\n\n const [, hasValues, field, direction] = match;\n\n if (hasValues) {\n return sort;\n }\n\n if (isField(field)) {\n return `values_${field}_${direction}` as unknown as CmsEntryListSort[0];\n }\n\n return sort;\n })\n .filter((item): item is CmsEntryListSort[0] => !!item);\n }\n}\n\nexport const SortMapper = CmsSortMapper.createImplementation({\n implementation: SortImpl,\n dependencies: []\n});\n"],"names":["SortImpl","params","modelFields","input","fields","field","isField","key","sort","match","hasValues","direction","item","SortMapper","CmsSortMapper"],"mappings":";AAWA,MAAMA;IACF,IAAIC,MAA4B,EAAgC;QAC5D,MAAM,EAAE,QAAQC,WAAW,EAAEC,KAAK,EAAE,GAAGF;QACvC,IAAI,CAACE,OACD;QAGJ,MAAMC,SAASF,YAAY,GAAG,CAACG,CAAAA,QACpBA,MAAM,OAAO;~~QAGxB~~,MAAMC,UAAU,CAACC~~;YACb~~,~~MAAMF~~,~~QAAQE,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAOH,~~OAAO,QAAQ,~~CAACC~~;~~QAC3B;QAEA~~,OAAO,IAAI,CAAC,OAAO,CAAC;~~YAChBF~~;YACAG;QACJ;IACJ;IAEQ,QAAQL,MAAsB,EAAoB;QACtD,MAAM,EAAEE,KAAK,EAAEG,OAAO,EAAE,GAAGL;QAE3B,OAAOE,MACF,GAAG,CAACK,CAAAA;~~YACD~~,MAAMC,QAAQD,KAAK,KAAK,CAAC;YACzB,IAAI,CAACC,OACD,OAAO;YAGX,MAAM,GAAGC,WAAWL,OAAOM,UAAU,GAAGF;YAExC,IAAIC,WACA,OAAOF;YAGX,IAAIF,QAAQD,QACR,OAAO,CAAC,OAAO,EAAEA,MAAM,CAAC,EAAEM,WAAW;YAGzC,OAAOH;QACX,GACC,MAAM,CAAC,CAACI,OAAsC,CAAC,CAACA;IACzD;AACJ;AAEO,MAAMC,aAAaC,cAAc,oBAAoB,CAAC;IACzD,gBAAgBd;IAChB,cAAc,EAAE;AACpB"}
1	+ {"version":3,"file":"features/sortMapper/SortMapper.js","sources":["../../../src/features/sortMapper/SortMapper.ts"],"sourcesContent":["/*\n Used to map sorting for custom CMS Models.\n /\nimport { type CmsEntryListSort } from \"~/types/types.js\";\nimport { CmsSortMapper, ICmsSortMapperParams } from \"./abstractions.js\";\n\ninterface IMapSortParams {\n input: CmsEntryListSort;\n isField: (key: string) => boolean;\n}\n\nclass SortImpl implements CmsSortMapper.Interface {\n map(params: ICmsSortMapperParams): CmsEntryListSort \| undefined {\n const { fields: modelFields, input } = params;\n if (!input) {\n return undefined;\n }\n\n const fields = modelFields.map(field => {\n return field.fieldId;\n });\n\n /\n * `mapSort` has already stripped the direction, so what arrives here is a bare fieldId and\n * is compared whole. Taking the segment before the first `_` would fail every fieldId that\n * contains one: `on_sale` would be looked up as `on`.\n /\n const isField = (key: string): boolean => {\n return fields.includes(key);\n };\n\n return this.mapSort({\n input,\n isField\n });\n }\n\n private mapSort(params: IMapSortParams): CmsEntryListSort {\n const { input, isField } = params;\n\n return input\n .map(sort => {\n // `_` is allowed inside the fieldId: excluding it made `on_sale_DESC` unmatchable,\n // and an unmatched directive is dropped from the sort entirely.\n const match = sort.match(/^(values_)?([a-zA-Z][a-zA-Z0-9_])_(ASC\|DESC)$/);\n if (!match) {\n return null;\n }\n\n const [, hasValues, field, direction] = match;\n\n if (hasValues) {\n return sort;\n }\n\n if (isField(field)) {\n return `values_${field}_${direction}` as unknown as CmsEntryListSort[0];\n }\n\n return sort;\n })\n .filter((item): item is CmsEntryListSort[0] => !!item);\n }\n}\n\nexport const SortMapper = CmsSortMapper.createImplementation({\n implementation: SortImpl,\n dependencies: []\n});\n"],"names":["SortImpl","params","modelFields","input","fields","field","isField","key","sort","match","hasValues","direction","item","SortMapper","CmsSortMapper"],"mappings":";AAWA,MAAMA;IACF,IAAIC,MAA4B,EAAgC;QAC5D,MAAM,EAAE,QAAQC,WAAW,EAAEC,KAAK,EAAE,GAAGF;QACvC,IAAI,CAACE,OACD;QAGJ,MAAMC,SAASF,YAAY,GAAG,CAACG,CAAAA,QACpBA,MAAM,OAAO;QAQxB,MAAMC,UAAU,CAACC,MACNH,OAAO,QAAQ,CAACG;QAG3B,OAAO,IAAI,CAAC,OAAO,CAAC;YAChBJ;YACAG;QACJ;IACJ;IAEQ,QAAQL,MAAsB,EAAoB;QACtD,MAAM,EAAEE,KAAK,EAAEG,OAAO,EAAE,GAAGL;QAE3B,OAAOE,MACF,GAAG,CAACK,CAAAA;YAGD,MAAMC,QAAQD,KAAK,KAAK,CAAC;YACzB,IAAI,CAACC,OACD,OAAO;YAGX,MAAM,GAAGC,WAAWL,OAAOM,UAAU,GAAGF;YAExC,IAAIC,WACA,OAAOF;YAGX,IAAIF,QAAQD,QACR,OAAO,CAAC,OAAO,EAAEA,MAAM,CAAC,EAAEM,WAAW;YAGzC,OAAOH;QACX,GACC,MAAM,CAAC,CAACI,OAAsC,CAAC,CAACA;IACzD;AACJ;AAEO,MAAMC,aAAaC,cAAc,oBAAoB,CAAC;IACzD,gBAAgBd;IAChB,cAAc,EAAE;AACpB"}

package/features/storage/fields/ObjectStorageTransform.js CHANGED Viewed

@@ -26,20 +26,30 @@ class StorageTransformImpl {
         const { value, field, getStorageTransform, model } = params;
         if (!value) return null;
         const fields = field.settings?.fields || [];
-        if (field.list) return await p_map(value, (value)=>processValue({
-                sourceValue: value,
+        if (field.list) return await p_map(value, async (itemValue)=>{
+            const processed = await processValue({
+                sourceValue: itemValue,
                 getStorageTransform,
                 model,
                 operation: "toStorage",
                 fields
-            }));
-        return await processValue({
+            });
+            return itemValue._id ? {
+                _id: itemValue._id,
+                ...processed
+            } : processed;
+        });
+        const processed = await processValue({
             sourceValue: value,
             getStorageTransform,
             model,
             operation: "toStorage",
             fields
         });
+        return value._id ? {
+            _id: value._id,
+            ...processed
+        } : processed;
     }
     async fromStorage(params) {
         const { field, value: input, getStorageTransform, model } = params;
@@ -47,21 +57,31 @@ class StorageTransformImpl {
         const fields = field.settings?.fields || [];
         if (field.list) {
             const values = input;
-            return await Promise.all(values.map(async (value)=>await processValue({
+            return await Promise.all(values.map(async (value)=>{
+                const processed = await processValue({
                     sourceValue: value,
                     getStorageTransform,
                     model,
                     operation: "fromStorage",
                     fields
-                })));
+                });
+                return value._id ? {
+                    _id: value._id,
+                    ...processed
+                } : processed;
+            }));
         }
-        return await processValue({
+        const processed = await processValue({
             sourceValue: input,
             getStorageTransform,
             model,
             operation: "fromStorage",
             fields
         });
+        return input._id ? {
+            _id: input._id,
+            ...processed
+        } : processed;
     }
     constructor(){
         this.fieldType = "object";

package/features/storage/fields/ObjectStorageTransform.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/storage/fields/ObjectStorageTransform.js","sources":["../../../../src/features/storage/fields/ObjectStorageTransform.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport pMap from \"p-map\";\nimport type { CmsModel, CmsModelField } from \"~/types/index.js\";\nimport { StorageTransform } from \"../abstractions/StorageTransform.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ninterface ProcessValueParams {\n fields: CmsModelField[];\n sourceValue: GenericRecord;\n getStorageTransform: (fieldType: string) => StorageTransform.Interface;\n model: CmsModel;\n operation: \"toStorage\" \| \"fromStorage\";\n}\ninterface ProcessValue {\n (params: ProcessValueParams): Promise<GenericRecord>;\n}\n\nconst processValue: ProcessValue = async params => {\n const { fields, sourceValue, getStorageTransform, model, operation } = params;\n return await pReduce(\n fields,\n async (values, field) => {\n const baseType = getBaseFieldType(field);\n const storageTransform = getStorageTransform(baseType);\n if (!storageTransform) {\n throw new Error(`Missing storage transform for field type \"${baseType}\".`);\n }\n const input = sourceValue[field.fieldId];\n const value = await storageTransform[operation]({\n model,\n field,\n value: input,\n getStorageTransform\n });\n return { ...values, [field.fieldId]: value };\n },\n {}\n );\n};\n\nclass StorageTransformImpl implements StorageTransform.Interface {\n public readonly fieldType = \"object\";\n\n public async toStorage(\n params: StorageTransform.ToStorageParams\n ): StorageTransform.ToStorageResponse {\n const { value, field, getStorageTransform, model } = params;\n if (!value) {\n return null;\n }\n\n const fields = (field.settings?.fields \|\| []) as CmsModelField[];\n\n if (field.list) {\n return await pMap(value as GenericRecord[], ~~value~~ ~~=>\~~n processValue({\n sourceValue: ~~value~~,\n getStorageTransform,\n model,\n operation: \"toStorage\",\n fields\n })\n );\n }\n\n ~~return~~ await processValue({\n sourceValue: value,\n getStorageTransform,\n model,\n operation: \"toStorage\",\n fields\n });\n }\n\n public async fromStorage(\n params: StorageTransform.FromStorageParams\n ): StorageTransform.FromStorageResponse {\n const { field, value: input, getStorageTransform, model } = params;\n if (!input) {\n return null;\n }\n\n const fields = (field.settings?.fields \|\| []) as CmsModelField[];\n\n if (field.list) {\n const values = input as GenericRecord[];\n\n return await Promise.all(\n values.map(async value => {\n ~~return~~ await processValue({\n sourceValue: value,\n getStorageTransform,\n model,\n operation: \"fromStorage\",\n fields\n });\n })\n );\n }\n\n ~~return~~ await processValue({\n sourceValue: input,\n getStorageTransform,\n model,\n operation: \"fromStorage\",\n fields\n });\n }\n}\n\nexport const ObjectStorageTransform = StorageTransform.createImplementation({\n implementation: StorageTransformImpl,\n dependencies: []\n});\n"],"names":["processValue","params","fields","sourceValue","getStorageTransform","model","operation","pReduce","values","field","baseType","getBaseFieldType","storageTransform","Error","input","value","StorageTransformImpl","pMap","Promise","ObjectStorageTransform","StorageTransform"],"mappings":";;;;AAkBA,MAAMA,eAA6B,OAAMC;IACrC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,mBAAmB,EAAEC,KAAK,EAAEC,SAAS,EAAE,GAAGL;IACvE,OAAO,MAAMM,SACTL,QACA,OAAOM,QAAQC;QACX,MAAMC,WAAWC,iBAAiBF;QAClC,MAAMG,mBAAmBR,oBAAoBM;QAC7C,IAAI,CAACE,kBACD,MAAM,IAAIC,MAAM,CAAC,0CAA0C,EAAEH,SAAS,EAAE,CAAC;QAE7E,MAAMI,QAAQX,WAAW,CAACM,MAAM,OAAO,CAAC;QACxC,MAAMM,QAAQ,MAAMH,gBAAgB,CAACN,UAAU,CAAC;YAC5CD;YACAI;YACA,OAAOK;YACPV;QACJ;QACA,OAAO;YAAE,GAAGI,MAAM;YAAE,CAACC,MAAM,OAAO,CAAC,EAAEM;QAAM;IAC/C,GACA,CAAC;AAET;AAEA,MAAMC;IAGF,MAAa,UACTf,MAAwC,EACN;QAClC,MAAM,EAAEc,KAAK,EAAEN,KAAK,EAAEL,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QACrD,IAAI,CAACc,OACD,OAAO;QAGX,MAAMb,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EACV,OAAO,MAAMQ,MAAKF,~~OAA0BA~~,~~CAAAA~~,~~QACxCf~~,aAAa;~~gBACT~~,~~aAAae~~;~~gBACbX~~;gBACAC;gBACA,WAAW;gBACXH;YACJ;~~QAIR~~,~~OAAO~~,~~MAAMF~~,aAAa;~~YACtB~~,aAAae;YACbX;YACAC;YACA,WAAW;YACXH;QACJ;~~IACJ~~;IAEA,MAAa,~~YACTD~~,MAA0C,EACN;QACpC,MAAM,EAAEQ,KAAK,EAAE,OAAOK,KAAK,EAAEV,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QAC5D,IAAI,CAACa,OACD,OAAO;QAGX,MAAMZ,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EAAE;YACZ,MAAMD,SAASM;YAEf,OAAO,~~MAAMI~~,QAAQ,GAAG,~~CACpBV~~,OAAO,GAAG,CAAC,OAAMO,~~QACN~~,~~MAAMf~~,aAAa;~~oBACtB~~,aAAae;oBACbX;oBACAC;oBACA,WAAW;oBACXH;gBACJ;~~QAGZ~~;QAEA,~~OAAO~~,~~MAAMF~~,aAAa;~~YACtB~~,aAAac;YACbV;YACAC;YACA,WAAW;YACXH;QACJ;~~IACJ~~;;~~aAlEgB~~,SAAS,GAAG;;~~AAmEhC~~;AAEO,~~MAAMiB~~,yBAAyBC,iBAAiB,oBAAoB,CAAC;IACxE,~~gBAAgBJ~~;IAChB,cAAc,EAAE;AACpB"}
1	+ {"version":3,"file":"features/storage/fields/ObjectStorageTransform.js","sources":["../../../../src/features/storage/fields/ObjectStorageTransform.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport pMap from \"p-map\";\nimport type { CmsModel, CmsModelField } from \"~/types/index.js\";\nimport { StorageTransform } from \"../abstractions/StorageTransform.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ninterface ProcessValueParams {\n fields: CmsModelField[];\n sourceValue: GenericRecord;\n getStorageTransform: (fieldType: string) => StorageTransform.Interface;\n model: CmsModel;\n operation: \"toStorage\" \| \"fromStorage\";\n}\ninterface ProcessValue {\n (params: ProcessValueParams): Promise<GenericRecord>;\n}\n\nconst processValue: ProcessValue = async params => {\n const { fields, sourceValue, getStorageTransform, model, operation } = params;\n return await pReduce(\n fields,\n async (values, field) => {\n const baseType = getBaseFieldType(field);\n const storageTransform = getStorageTransform(baseType);\n if (!storageTransform) {\n throw new Error(`Missing storage transform for field type \"${baseType}\".`);\n }\n const input = sourceValue[field.fieldId];\n const value = await storageTransform[operation]({\n model,\n field,\n value: input,\n getStorageTransform\n });\n return { ...values, [field.fieldId]: value };\n },\n {}\n );\n};\n\nclass StorageTransformImpl implements StorageTransform.Interface {\n public readonly fieldType = \"object\";\n\n public async toStorage(\n params: StorageTransform.ToStorageParams\n ): StorageTransform.ToStorageResponse {\n const { value, field, getStorageTransform, model } = params;\n if (!value) {\n return null;\n }\n\n const fields = (field.settings?.fields \|\| []) as CmsModelField[];\n\n if (field.list) {\n return await pMap(value as GenericRecord[], async itemValue => {\n const processed = await processValue({\n sourceValue: itemValue,\n getStorageTransform,\n model,\n operation: \"toStorage\",\n fields\n });\n return itemValue._id ? { _id: itemValue._id, ...processed } : processed;\n });\n }\n\n const processed = await processValue({\n sourceValue: value,\n getStorageTransform,\n model,\n operation: \"toStorage\",\n fields\n });\n return value._id ? { _id: value._id, ...processed } : processed;\n }\n\n public async fromStorage(\n params: StorageTransform.FromStorageParams\n ): StorageTransform.FromStorageResponse {\n const { field, value: input, getStorageTransform, model } = params;\n if (!input) {\n return null;\n }\n\n const fields = (field.settings?.fields \|\| []) as CmsModelField[];\n\n if (field.list) {\n const values = input as GenericRecord[];\n\n return await Promise.all(\n values.map(async value => {\n const processed = await processValue({\n sourceValue: value,\n getStorageTransform,\n model,\n operation: \"fromStorage\",\n fields\n });\n return value._id ? { _id: value._id, ...processed } : processed;\n })\n );\n }\n\n const processed = await processValue({\n sourceValue: input,\n getStorageTransform,\n model,\n operation: \"fromStorage\",\n fields\n });\n return input._id ? { _id: input._id, ...processed } : processed;\n }\n}\n\nexport const ObjectStorageTransform = StorageTransform.createImplementation({\n implementation: StorageTransformImpl,\n dependencies: []\n});\n"],"names":["processValue","params","fields","sourceValue","getStorageTransform","model","operation","pReduce","values","field","baseType","getBaseFieldType","storageTransform","Error","input","value","StorageTransformImpl","pMap","itemValue","processed","Promise","ObjectStorageTransform","StorageTransform"],"mappings":";;;;AAkBA,MAAMA,eAA6B,OAAMC;IACrC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,mBAAmB,EAAEC,KAAK,EAAEC,SAAS,EAAE,GAAGL;IACvE,OAAO,MAAMM,SACTL,QACA,OAAOM,QAAQC;QACX,MAAMC,WAAWC,iBAAiBF;QAClC,MAAMG,mBAAmBR,oBAAoBM;QAC7C,IAAI,CAACE,kBACD,MAAM,IAAIC,MAAM,CAAC,0CAA0C,EAAEH,SAAS,EAAE,CAAC;QAE7E,MAAMI,QAAQX,WAAW,CAACM,MAAM,OAAO,CAAC;QACxC,MAAMM,QAAQ,MAAMH,gBAAgB,CAACN,UAAU,CAAC;YAC5CD;YACAI;YACA,OAAOK;YACPV;QACJ;QACA,OAAO;YAAE,GAAGI,MAAM;YAAE,CAACC,MAAM,OAAO,CAAC,EAAEM;QAAM;IAC/C,GACA,CAAC;AAET;AAEA,MAAMC;IAGF,MAAa,UACTf,MAAwC,EACN;QAClC,MAAM,EAAEc,KAAK,EAAEN,KAAK,EAAEL,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QACrD,IAAI,CAACc,OACD,OAAO;QAGX,MAAMb,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EACV,OAAO,MAAMQ,MAAKF,OAA0B,OAAMG;YAC9C,MAAMC,YAAY,MAAMnB,aAAa;gBACjC,aAAakB;gBACbd;gBACAC;gBACA,WAAW;gBACXH;YACJ;YACA,OAAOgB,UAAU,GAAG,GAAG;gBAAE,KAAKA,UAAU,GAAG;gBAAE,GAAGC,SAAS;YAAC,IAAIA;QAClE;QAGJ,MAAMA,YAAY,MAAMnB,aAAa;YACjC,aAAae;YACbX;YACAC;YACA,WAAW;YACXH;QACJ;QACA,OAAOa,MAAM,GAAG,GAAG;YAAE,KAAKA,MAAM,GAAG;YAAE,GAAGI,SAAS;QAAC,IAAIA;IAC1D;IAEA,MAAa,YACTlB,MAA0C,EACN;QACpC,MAAM,EAAEQ,KAAK,EAAE,OAAOK,KAAK,EAAEV,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QAC5D,IAAI,CAACa,OACD,OAAO;QAGX,MAAMZ,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EAAE;YACZ,MAAMD,SAASM;YAEf,OAAO,MAAMM,QAAQ,GAAG,CACpBZ,OAAO,GAAG,CAAC,OAAMO;gBACb,MAAMI,YAAY,MAAMnB,aAAa;oBACjC,aAAae;oBACbX;oBACAC;oBACA,WAAW;oBACXH;gBACJ;gBACA,OAAOa,MAAM,GAAG,GAAG;oBAAE,KAAKA,MAAM,GAAG;oBAAE,GAAGI,SAAS;gBAAC,IAAIA;YAC1D;QAER;QAEA,MAAMA,YAAY,MAAMnB,aAAa;YACjC,aAAac;YACbV;YACAC;YACA,WAAW;YACXH;QACJ;QACA,OAAOY,MAAM,GAAG,GAAG;YAAE,KAAKA,MAAM,GAAG;YAAE,GAAGK,SAAS;QAAC,IAAIA;IAC1D;;aAtEgB,SAAS,GAAG;;AAuEhC;AAEO,MAAME,yBAAyBC,iBAAiB,oBAAoB,CAAC;IACxE,gBAAgBN;IAChB,cAAc,EAAE;AACpB"}

package/features/validation/validators/PatternValidator.js CHANGED Viewed

@@ -15,7 +15,7 @@ class PatternValidatorImpl {
             if (patternValidator) pattern = patternValidator.pattern;
         }
         if (!pattern) return true;
-        return new RegExp(pattern.regex, pattern.flags).test(value);
+        return new RegExp(pattern.regex, pattern.flags || void 0).test(value);
     }
 }
 const PatternValidator = CmsModelFieldValidator.createImplementation({

package/features/validation/validators/PatternValidator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/validation/validators/PatternValidator.js","sources":["../../../../src/features/validation/validators/PatternValidator.ts"],"sourcesContent":["import { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport { CmsModelFieldPatternValidatorRegistry } from \"../abstractions/CmsModelFieldPatternValidatorRegistry.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass PatternValidatorImpl implements CmsModelFieldValidator.Interface {\n public readonly name = \"pattern\";\n\n public constructor(\n private readonly patternRegistry: CmsModelFieldPatternValidatorRegistry.Interface\n ) {}\n\n public async validate({\n value,\n validator\n }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n if (typeof value !== \"string\" \|\| !value) {\n return true;\n }\n\n const { settings } = validator;\n\n let pattern;\n if (settings?.preset === \"custom\") {\n pattern = settings;\n } else if (settings?.preset) {\n const patternValidator = this.patternRegistry.get(settings.preset);\n if (patternValidator) {\n pattern = patternValidator.pattern;\n }\n }\n\n if (!pattern) {\n return true;\n }\n\n return new RegExp(pattern.regex, pattern.flags).test(value);\n }\n}\n\nexport const PatternValidator = CmsModelFieldValidator.createImplementation({\n implementation: PatternValidatorImpl,\n dependencies: [CmsModelFieldPatternValidatorRegistry]\n});\n"],"names":["PatternValidatorImpl","patternRegistry","value","validator","settings","pattern","patternValidator","RegExp","PatternValidator","CmsModelFieldValidator","CmsModelFieldPatternValidatorRegistry"],"mappings":";;AAIA,MAAMA;IAGF,YACqBC,eAAgE,CACnF;aADmBA,eAAe,GAAfA;aAHL,IAAI,GAAG;IAIpB;IAEH,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,IAAI,AAAiB,YAAjB,OAAOD,SAAsB,CAACA,OAC9B,OAAO;QAGX,MAAM,EAAEE,QAAQ,EAAE,GAAGD;QAErB,IAAIE;QACJ,IAAID,UAAU,WAAW,UACrBC,UAAUD;aACP,IAAIA,UAAU,QAAQ;YACzB,MAAME,mBAAmB,IAAI,CAAC,eAAe,CAAC,GAAG,CAACF,SAAS,MAAM;YACjE,IAAIE,kBACAD,UAAUC,iBAAiB,OAAO;QAE1C;QAEA,IAAI,CAACD,SACD,OAAO;QAGX,OAAO,IAAIE,OAAOF,QAAQ,KAAK,EAAEA,QAAQ,KAAK,~~EAAE~~,IAAI,~~CAACH~~;~~IACzD~~;AACJ;AAEO,~~MAAMM~~,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,~~gBAAgBT~~;IAChB,cAAc;~~QAACU~~;KAAsC;AACzD"}
1	+ {"version":3,"file":"features/validation/validators/PatternValidator.js","sources":["../../../../src/features/validation/validators/PatternValidator.ts"],"sourcesContent":["import { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport { CmsModelFieldPatternValidatorRegistry } from \"../abstractions/CmsModelFieldPatternValidatorRegistry.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass PatternValidatorImpl implements CmsModelFieldValidator.Interface {\n public readonly name = \"pattern\";\n\n public constructor(\n private readonly patternRegistry: CmsModelFieldPatternValidatorRegistry.Interface\n ) {}\n\n public async validate({\n value,\n validator\n }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n if (typeof value !== \"string\" \|\| !value) {\n return true;\n }\n\n const { settings } = validator;\n\n let pattern;\n if (settings?.preset === \"custom\") {\n pattern = settings;\n } else if (settings?.preset) {\n const patternValidator = this.patternRegistry.get(settings.preset);\n if (patternValidator) {\n pattern = patternValidator.pattern;\n }\n }\n\n if (!pattern) {\n return true;\n }\n\n return new RegExp(pattern.regex, pattern.flags \|\| undefined).test(value);\n }\n}\n\nexport const PatternValidator = CmsModelFieldValidator.createImplementation({\n implementation: PatternValidatorImpl,\n dependencies: [CmsModelFieldPatternValidatorRegistry]\n});\n"],"names":["PatternValidatorImpl","patternRegistry","value","validator","settings","pattern","patternValidator","RegExp","undefined","PatternValidator","CmsModelFieldValidator","CmsModelFieldPatternValidatorRegistry"],"mappings":";;AAIA,MAAMA;IAGF,YACqBC,eAAgE,CACnF;aADmBA,eAAe,GAAfA;aAHL,IAAI,GAAG;IAIpB;IAEH,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,IAAI,AAAiB,YAAjB,OAAOD,SAAsB,CAACA,OAC9B,OAAO;QAGX,MAAM,EAAEE,QAAQ,EAAE,GAAGD;QAErB,IAAIE;QACJ,IAAID,UAAU,WAAW,UACrBC,UAAUD;aACP,IAAIA,UAAU,QAAQ;YACzB,MAAME,mBAAmB,IAAI,CAAC,eAAe,CAAC,GAAG,CAACF,SAAS,MAAM;YACjE,IAAIE,kBACAD,UAAUC,iBAAiB,OAAO;QAE1C;QAEA,IAAI,CAACD,SACD,OAAO;QAGX,OAAO,IAAIE,OAAOF,QAAQ,KAAK,EAAEA,QAAQ,KAAK,IAAIG,QAAW,IAAI,CAACN;IACtE;AACJ;AAEO,MAAMO,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBV;IAChB,cAAc;QAACW;KAAsC;AACzD"}

package/features/whereMapper/WhereMapper.js CHANGED Viewed

@@ -9,11 +9,8 @@ class WhereMapperImpl {
     map(params) {
         const { fields: modelFields, input } = params;
         if (!input) return;
-        const fields = modelFields.map((field)=>field.fieldId);
-        const isField = (key)=>{
-            const field = key.split("_")[0];
-            return fields.includes(field);
-        };
+        const fields = modelFields.map((field)=>field.fieldId).sort((a, b)=>b.length - a.length);
+        const isField = (key)=>fields.some((fieldId)=>key === fieldId || key.startsWith(`${fieldId}_`));
         return this.mapWhere({
             input,
             isField
@@ -33,6 +30,11 @@ class WhereMapperImpl {
                     }));
                 continue;
             }
+            if ("values" === key && isPlainObject(value)) {
+                if (!out.values) out.values = {};
+                Object.assign(out.values, value);
+                continue;
+            }
             if (isField(key)) {
                 if (!out.values) out.values = {};
                 out.values[key] = value;

package/features/whereMapper/WhereMapper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"features/whereMapper/WhereMapper.js","sources":["../../../src/features/whereMapper/WhereMapper.ts"],"sourcesContent":["/*\n Used to map a model with custom schema with fields in a root to values object.\n * eg. File Manager File model has \"title\" and \"tags\" fields in the root, but they should be\n * mapped to \"values.title\" and \"values.tags\" when creating the entry.\n */\nimport { GenericRecord } from \"@webiny/api/types.js\";\nimport { CmsEntryListWhere } from \"~/types/types.js\";\nimport { CmsWhereMapper, ICmsWhereMapperParams } from \"./abstractions.js\";\n\nconst isPlainObject = (value: unknown): value is Record<string, unknown> => {\n if (!value \|\| typeof value !== \"object\") {\n return false;\n } else if (Array.isArray(value)) {\n return false;\n }\n return true;\n};\n\nconst isLogicalKey = (key: string): key is \"AND\" \| \"OR\" => {\n return key === \"AND\" \|\| key === \"OR\";\n};\n\ninterface IMapNodeWhereParams {\n input: GenericRecord;\n isField: (key: string) => boolean;\n}\n\nclass WhereMapperImpl implements CmsWhereMapper.Interface {\n map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere \| undefined {\n const { fields: modelFields, input } = params;\n if (!input) {\n return undefined;\n }\n\n const fields = modelFields.map(field => ~~{\n return~~ field.fieldId~~;\n }~~);\n\n const isField = (key: string): boolean => {\n ~~const~~ ~~field~~ = key.~~split~~(\"_\")~~[0];\n return fields.includes(field~~);\n };\n\n return this.mapWhere({\n input,\n isField\n });\n }\n\n private mapWhere(params: IMapNodeWhereParams) {\n const { input, isField } = params;\n const out: CmsEntryListWhere = {};\n\n const keys = Object.keys(input) as (keyof typeof out)[];\n if (keys.length === 0) {\n return out;\n }\n\n for (const key of keys) {\n const value = input[key];\n\n if (isLogicalKey(key)) {\n if (Array.isArray(value)) {\n out[key] = value.filter(isPlainObject).map(child => {\n return this.mapWhere({\n input: child,\n isField\n });\n });\n }\n continue;\n } else if (isField(key)) {\n if (!out.values) {\n out.values = {};\n }\n out.values[key] = value;\n continue;\n }\n\n out[key] = value;\n }\n\n return out;\n }\n}\n\nexport const WhereMapper = CmsWhereMapper.createImplementation({\n implementation: WhereMapperImpl,\n dependencies: []\n});\n"],"names":["isPlainObject","value","Array","isLogicalKey","key","WhereMapperImpl","params","modelFields","input","fields","field","isField","out","keys","Object","child","WhereMapper","CmsWhereMapper"],"mappings":";AASA,MAAMA,gBAAgB,CAACC;IACnB,IAAI,CAACA,SAAS,AAAiB,YAAjB,OAAOA,OACjB,OAAO;IACJ,IAAIC,MAAM,OAAO,CAACD,QACrB,OAAO;IAEX,OAAO;AACX;AAEA,MAAME,eAAe,CAACC,MACXA,AAAQ,UAARA,OAAiBA,AAAQ,SAARA;AAQ5B,MAAMC;IACF,IAA6BC,MAAgC,EAAiC;QAC1F,MAAM,EAAE,QAAQC,WAAW,EAAEC,KAAK,EAAE,GAAGF;QACvC,IAAI,CAACE,OACD;~~QAGJ~~,MAAMC,SAASF,YAAY,GAAG,CAACG,CAAAA,~~QACpBA~~,MAAM,OAAO;~~QAGxB~~,~~MAAMC~~,UAAU,~~CAACP;YACb~~,~~MAAMM~~,~~QAAQN~~,IAAI,~~KAAK~~,~~CAAC~~,IAAI,CAAC,~~EAAE;YAC/B~~,~~OAAOK~~,~~OAAO~~,~~QAAQ,CAACC~~;~~QAC3B;QAEA~~,OAAO,IAAI,CAAC,QAAQ,CAAC;~~YACjBF~~;~~YACAG~~;QACJ;IACJ;IAEQ,~~SAASL~~,MAA2B,EAAE;QAC1C,MAAM,EAAEE,KAAK,~~EAAEG~~,OAAO,EAAE,~~GAAGL~~;QAC3B,~~MAAMM~~,MAAyB,CAAC;QAEhC,MAAMC,OAAOC,OAAO,IAAI,~~CAACN~~;QACzB,~~IAAIK~~,AAAgB,MAAhBA,KAAK,MAAM,EACX,OAAOD;QAGX,KAAK,~~MAAMR~~,~~OAAOS~~,KAAM;YACpB,~~MAAMZ~~,QAAQO,KAAK,CAACJ,IAAI;YAExB,IAAID,aAAaC,MAAM;gBACnB,IAAIF,MAAM,OAAO,CAACD,~~QACdW~~,GAAG,~~CAACR~~,IAAI,GAAGH,MAAM,MAAM,CAACD,eAAe,GAAG,~~CAACe~~,CAAAA,QAChC,IAAI,CAAC,QAAQ,CAAC;wBACjB,OAAOA;~~wBACPJ~~;oBACJ;gBAGR;YACJ;YAAO,~~IAAIA~~,~~QAAQP~~,MAAM;gBACrB,IAAI,~~CAACQ~~,IAAI,MAAM,EACXA,IAAI,MAAM,GAAG,CAAC;gBAElBA,IAAI,MAAM,~~CAACR~~,IAAI,GAAGH;gBAClB;YACJ;~~YAEAW~~,GAAG,~~CAACR~~,IAAI,GAAGH;QACf;QAEA,~~OAAOW~~;IACX;AACJ;AAEO,MAAMI,cAAcC,eAAe,oBAAoB,CAAC;IAC3D,~~gBAAgBZ~~;IAChB,cAAc,EAAE;AACpB"}
1	+ {"version":3,"file":"features/whereMapper/WhereMapper.js","sources":["../../../src/features/whereMapper/WhereMapper.ts"],"sourcesContent":["/*\n Used to map a model with custom schema with fields in a root to values object.\n * eg. File Manager File model has \"title\" and \"tags\" fields in the root, but they should be\n * mapped to \"values.title\" and \"values.tags\" when creating the entry.\n /\nimport { GenericRecord } from \"@webiny/api/types.js\";\nimport { CmsEntryListWhere } from \"~/types/types.js\";\nimport { CmsWhereMapper, ICmsWhereMapperParams } from \"./abstractions.js\";\n\nconst isPlainObject = (value: unknown): value is Record<string, unknown> => {\n if (!value \|\| typeof value !== \"object\") {\n return false;\n } else if (Array.isArray(value)) {\n return false;\n }\n return true;\n};\n\nconst isLogicalKey = (key: string): key is \"AND\" \| \"OR\" => {\n return key === \"AND\" \|\| key === \"OR\";\n};\n\ninterface IMapNodeWhereParams {\n input: GenericRecord;\n isField: (key: string) => boolean;\n}\n\nclass WhereMapperImpl implements CmsWhereMapper.Interface {\n map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere \| undefined {\n const { fields: modelFields, input } = params;\n if (!input) {\n return undefined;\n }\n\n /\n * Longest fieldId first, so a key is attributed to the longest field it could belong to.\n * Taking the segment before the first `_` misreads any fieldId that contains one:\n * `on_sale_contains` resolves to a field named `on`, which does not exist, so the filter\n * silently stays at the top level and the CMS rejects it. Longest-first also keeps a model\n * with both `price` and `price_range` from being mis-routed.\n /\n const fields = modelFields.map(field => field.fieldId).sort((a, b) => b.length - a.length);\n\n const isField = (key: string): boolean => {\n return fields.some(fieldId => key === fieldId \|\| key.startsWith(`${fieldId}_`));\n };\n\n return this.mapWhere({\n input,\n isField\n });\n }\n\n private mapWhere(params: IMapNodeWhereParams) {\n const { input, isField } = params;\n const out: CmsEntryListWhere = {};\n\n const keys = Object.keys(input) as (keyof typeof out)[];\n if (keys.length === 0) {\n return out;\n }\n\n for (const key of keys) {\n const value = input[key];\n\n if (isLogicalKey(key)) {\n if (Array.isArray(value)) {\n out[key] = value.filter(isPlainObject).map(child => {\n return this.mapWhere({\n input: child,\n isField\n });\n });\n }\n continue;\n } else if (key === \"values\" && isPlainObject(value)) {\n /\n * A caller that already nested its model fields is taken at its word. Merged rather\n * than assigned, so an explicit `values` object and flat field keys can coexist:\n * assigning would drop whichever of the two arrived first.\n */\n if (!out.values) {\n out.values = {};\n }\n Object.assign(out.values, value);\n continue;\n } else if (isField(key)) {\n if (!out.values) {\n out.values = {};\n }\n out.values[key] = value;\n continue;\n }\n\n out[key] = value;\n }\n\n return out;\n }\n}\n\nexport const WhereMapper = CmsWhereMapper.createImplementation({\n implementation: WhereMapperImpl,\n dependencies: []\n});\n"],"names":["isPlainObject","value","Array","isLogicalKey","key","WhereMapperImpl","params","modelFields","input","fields","field","a","b","isField","fieldId","out","keys","Object","child","WhereMapper","CmsWhereMapper"],"mappings":";AASA,MAAMA,gBAAgB,CAACC;IACnB,IAAI,CAACA,SAAS,AAAiB,YAAjB,OAAOA,OACjB,OAAO;IACJ,IAAIC,MAAM,OAAO,CAACD,QACrB,OAAO;IAEX,OAAO;AACX;AAEA,MAAME,eAAe,CAACC,MACXA,AAAQ,UAARA,OAAiBA,AAAQ,SAARA;AAQ5B,MAAMC;IACF,IAA6BC,MAAgC,EAAiC;QAC1F,MAAM,EAAE,QAAQC,WAAW,EAAEC,KAAK,EAAE,GAAGF;QACvC,IAAI,CAACE,OACD;QAUJ,MAAMC,SAASF,YAAY,GAAG,CAACG,CAAAA,QAASA,MAAM,OAAO,EAAE,IAAI,CAAC,CAACC,GAAGC,IAAMA,EAAE,MAAM,GAAGD,EAAE,MAAM;QAEzF,MAAME,UAAU,CAACT,MACNK,OAAO,IAAI,CAACK,CAAAA,UAAWV,QAAQU,WAAWV,IAAI,UAAU,CAAC,GAAGU,QAAQ,CAAC,CAAC;QAGjF,OAAO,IAAI,CAAC,QAAQ,CAAC;YACjBN;YACAK;QACJ;IACJ;IAEQ,SAASP,MAA2B,EAAE;QAC1C,MAAM,EAAEE,KAAK,EAAEK,OAAO,EAAE,GAAGP;QAC3B,MAAMS,MAAyB,CAAC;QAEhC,MAAMC,OAAOC,OAAO,IAAI,CAACT;QACzB,IAAIQ,AAAgB,MAAhBA,KAAK,MAAM,EACX,OAAOD;QAGX,KAAK,MAAMX,OAAOY,KAAM;YACpB,MAAMf,QAAQO,KAAK,CAACJ,IAAI;YAExB,IAAID,aAAaC,MAAM;gBACnB,IAAIF,MAAM,OAAO,CAACD,QACdc,GAAG,CAACX,IAAI,GAAGH,MAAM,MAAM,CAACD,eAAe,GAAG,CAACkB,CAAAA,QAChC,IAAI,CAAC,QAAQ,CAAC;wBACjB,OAAOA;wBACPL;oBACJ;gBAGR;YACJ;YAAO,IAAIT,AAAQ,aAARA,OAAoBJ,cAAcC,QAAQ;gBAMjD,IAAI,CAACc,IAAI,MAAM,EACXA,IAAI,MAAM,GAAG,CAAC;gBAElBE,OAAO,MAAM,CAACF,IAAI,MAAM,EAAEd;gBAC1B;YACJ;YAAO,IAAIY,QAAQT,MAAM;gBACrB,IAAI,CAACW,IAAI,MAAM,EACXA,IAAI,MAAM,GAAG,CAAC;gBAElBA,IAAI,MAAM,CAACX,IAAI,GAAGH;gBAClB;YACJ;YAEAc,GAAG,CAACX,IAAI,GAAGH;QACf;QAEA,OAAOc;IACX;AACJ;AAEO,MAAMI,cAAcC,eAAe,oBAAoB,CAAC;IAC3D,gBAAgBf;IAChB,cAAc,EAAE;AACpB"}

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js CHANGED Viewed

@@ -47,7 +47,10 @@ class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlug
             Object.assign(values, converted);
             return values;
         }, {
-            _templateId: template.id
+            _templateId: template.id,
+            ...value._id ? {
+                _id: value._id
+            } : {}
         });
     }
     convertFromStorage(params) {
@@ -61,7 +64,7 @@ class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlug
                         templates,
                         converterCollection,
                         value: item
-                    }))
+                    })).filter(Boolean)
             };
         }
         if (Array.isArray(value)) throw new error(`Dynamic zone field "${field.fieldId}" is expecting a non-array value.`, "DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE", {
@@ -82,8 +85,12 @@ class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlug
         if (null == value) return;
         const { _templateId } = value;
         const template = templates.find((t)=>t.id === _templateId);
-        if (!template) throw new error("Unknown template - converting from storage.", "UNKNOWN_TEMPLATE", {
-            templateId: _templateId
+        if (!template) return void console.warn({
+            message: "Unknown template - converting from storage.",
+            code: "UNKNOWN_TEMPLATE",
+            data: {
+                templateId: _templateId
+            }
         });
         return template.fields.reduce((values, field)=>{
             const converter = converterCollection.getConverter(field.type);
@@ -94,7 +101,10 @@ class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlug
             Object.assign(values, converted);
             return values;
         }, {
-            _templateId: template.id
+            _templateId: template.id,
+            ...value._id ? {
+                _id: value._id
+            } : {}
         });
     }
     constructor(...args){