@elek-io/core 0.15.2 → 0.15.3

package/dist/cli/index.cli.js

@@ -40,7 +40,7 @@ var __export = (all) => {
 //#region package.json
 var package_default = {
 	name: "@elek-io/core",
-	version: "0.15.2",
+	version: "0.15.3",
 	description: "Handles core functionality of elek.io Projects like file IO and version control.",
 	homepage: "https://elek.io",
 	repository: "https://github.com/elek-io/core",
@@ -962,11 +962,10 @@ const projectSchema = projectFileSchema.extend({
 	history: z.array(gitCommitSchema).openapi({ description: "Commit history of this Project" }),
 	fullHistory: z.array(gitCommitSchema).openapi({ description: "Full commit history of this Project including all Assets, Collections, Entries and other files" })
 }).openapi("Project");
-const outdatedProjectSchema = projectFileSchema.pick({
+const migrateProjectSchema = projectFileSchema.pick({
 	id: true,
-	name: true,
 	coreVersion: true
-});
+}).loose();
 const projectExportSchema = projectSchema.extend({
 	assets: z.array(assetExportSchema),
 	collections: z.array(collectionExportSchema)
@@ -975,9 +974,6 @@ const createProjectSchema = projectSchema.pick({
 	name: true,
 	description: true,
 	settings: true
-}).partial({
-	description: true,
-	settings: true
 });
 const readProjectSchema = z.object({
 	id: uuidSchema.readonly(),
@@ -988,10 +984,6 @@ const updateProjectSchema = projectSchema.pick({
 	name: true,
 	description: true,
 	settings: true
-}).partial({
-	name: true,
-	description: true,
-	settings: true
 });
 const upgradeProjectSchema = z.object({
 	id: uuidSchema.readonly(),
@@ -3397,16 +3389,14 @@ var SynchronizeLocalChangesError = class extends Error {
 var ProjectService = class extends AbstractCrudService {
 	coreVersion;
 	jsonFileService;
-	userService;
 	gitService;
 	assetService;
 	collectionService;
 	entryService;
-	constructor(coreVersion, options, logService, jsonFileService, userService, gitService, assetService, collectionService, entryService) {
+	constructor(coreVersion, options, logService, jsonFileService, gitService, assetService, collectionService, entryService) {
 		super(serviceTypeSchema.enum.Project, options, logService);
 		this.coreVersion = coreVersion;
 		this.jsonFileService = jsonFileService;
-		this.userService = userService;
 		this.gitService = gitService;
 		this.assetService = assetService;
 		this.collectionService = collectionService;
@@ -3417,19 +3407,11 @@ var ProjectService = class extends AbstractCrudService {
 	*/
 	async create(props) {
 		createProjectSchema.parse(props);
-		const user = await this.userService.get();
-		if (!user) throw new NoCurrentUserError();
 		const id = uuid();
-		const defaultSettings = { language: {
-			default: user.language,
-			supported: [user.language]
-		} };
 		const projectFile = {
 			...props,
 			objectType: "project",
 			id,
-			description: props.description || "",
-			settings: Object.assign({}, defaultSettings, props.settings),
 			created: datetime(),
 			updated: null,
 			coreVersion: this.coreVersion,
@@ -3487,7 +3469,7 @@ var ProjectService = class extends AbstractCrudService {
 			const projectFile = await this.jsonFileService.read(pathTo.projectFile(props.id), projectFileSchema);
 			return await this.toProject(projectFile);
 		} else {
-			const projectFile = this.migrate(JSON.parse(await this.gitService.getFileContentAtCommit(pathTo.project(props.id), pathTo.projectFile(props.id), props.commitHash)));
+			const projectFile = this.migrate(migrateProjectSchema.parse(JSON.parse(await this.gitService.getFileContentAtCommit(pathTo.project(props.id), pathTo.projectFile(props.id), props.commitHash))));
 			return await this.toProject(projectFile);
 		}
 	}
@@ -3498,16 +3480,9 @@ var ProjectService = class extends AbstractCrudService {
 		updateProjectSchema.parse(props);
 		const projectPath = pathTo.project(props.id);
 		const filePath = pathTo.projectFile(props.id);
-		const prevProjectFile = await this.read(props);
 		const projectFile = {
-			...prevProjectFile,
-			name: props.name || prevProjectFile.name,
-			description: props.description || prevProjectFile.description,
-			coreVersion: this.coreVersion,
-			settings: { language: {
-				supported: props.settings?.language.supported || prevProjectFile.settings.language.supported,
-				default: props.settings?.language.default || prevProjectFile.settings.language.default
-			} },
+			...await this.read(props),
+			...props,
 			updated: datetime()
 		};
 		await this.jsonFileService.update(projectFile, filePath, projectFileSchema);
@@ -3531,7 +3506,7 @@ var ProjectService = class extends AbstractCrudService {
 		const projectPath = pathTo.project(props.id);
 		const projectFilePath = pathTo.projectFile(props.id);
 		if (await this.gitService.branches.current(projectPath) !== projectBranchSchema.enum.work) await this.gitService.branches.switch(projectPath, projectBranchSchema.enum.work);
-		const currentProjectFile = outdatedProjectSchema.passthrough().parse(await this.jsonFileService.unsafeRead(projectFilePath));
+		const currentProjectFile = migrateProjectSchema.parse(await this.jsonFileService.unsafeRead(projectFilePath));
 		if (Semver.gt(currentProjectFile.coreVersion, this.coreVersion)) throw new ProjectUpgradeError(`The Projects Core version "${currentProjectFile.coreVersion}" is higher than the current Core version "${this.coreVersion}".`);
 		if (Semver.eq(currentProjectFile.coreVersion, this.coreVersion) && props.force !== true) throw new ProjectUpgradeError(`The Projects Core version "${currentProjectFile.coreVersion}" is already up to date.`);
 		const assetReferences = await this.listReferences("asset", props.id);
@@ -3673,7 +3648,7 @@ var ProjectService = class extends AbstractCrudService {
 		const projectReferences = await this.listReferences(objectTypeSchema.enum.project);
 		return (await Promise.all(projectReferences.map(async (reference) => {
 			const json = await this.jsonFileService.unsafeRead(pathTo.projectFile(reference.id));
-			const projectFile = outdatedProjectSchema.parse(json);
+			const projectFile = migrateProjectSchema.parse(json);
 			if (projectFile.coreVersion !== this.coreVersion) return projectFile;
 			return null;
 		}))).filter(isNotEmpty);
@@ -3706,8 +3681,9 @@ var ProjectService = class extends AbstractCrudService {
 	/**
 	* Migrates an potentially outdated Project file to the current schema
 	*/
-	migrate(potentiallyOutdatedProjectFile) {
-		return projectFileSchema.parse(potentiallyOutdatedProjectFile);
+	migrate(props) {
+		props.coreVersion = this.coreVersion;
+		return projectFileSchema.parse(props);
 	}
 	/**
 	* Creates a Project from given ProjectFile
@@ -3896,7 +3872,7 @@ var ElekIoCore = class {
 		this.assetService = new AssetService(this.options, this.logService, this.jsonFileService, this.gitService);
 		this.collectionService = new CollectionService(this.options, this.logService, this.jsonFileService, this.gitService);
 		this.entryService = new EntryService(this.options, this.logService, this.jsonFileService, this.gitService, this.collectionService);
-		this.projectService = new ProjectService(this.coreVersion, this.options, this.logService, this.jsonFileService, this.userService, this.gitService, this.assetService, this.collectionService, this.entryService);
+		this.projectService = new ProjectService(this.coreVersion, this.options, this.logService, this.jsonFileService, this.gitService, this.assetService, this.collectionService, this.entryService);
 		this.localApi = new LocalApi(this.logService, this.projectService, this.collectionService, this.entryService, this.assetService);
 		this.logService.info({
 			source: "core",

package/dist/node/index.node.d.ts

@@ -9879,12 +9879,11 @@ declare const projectSchema: z.ZodObject<{
   }, z.core.$strip>>;
 }, z.core.$strip>;
 type Project = z.infer<typeof projectSchema>;
-declare const outdatedProjectSchema: z.ZodObject<{
+declare const migrateProjectSchema: z.ZodObject<{
   id: z.ZodReadonly<z.ZodUUID>;
-  name: z.ZodString;
   coreVersion: z.ZodString;
-}, z.core.$strip>;
-type OutdatedProject = z.infer<typeof outdatedProjectSchema>;
+}, z.core.$loose>;
+type MigrateProjectProps = z.infer<typeof migrateProjectSchema>;
 declare const projectExportSchema: z.ZodObject<{
   id: z.ZodReadonly<z.ZodUUID>;
   created: z.ZodReadonly<z.ZodString>;
@@ -11324,8 +11323,8 @@ declare const projectExportSchema: z.ZodObject<{
 type ProjectExport = z.infer<typeof projectExportSchema>;
 declare const createProjectSchema: z.ZodObject<{
   name: z.ZodString;
-  description: z.ZodOptional<z.ZodString>;
-  settings: z.ZodOptional<z.ZodObject<{
+  description: z.ZodString;
+  settings: z.ZodObject<{
     language: z.ZodObject<{
       default: z.ZodEnum<{
         bg: "bg";
@@ -11380,7 +11379,7 @@ declare const createProjectSchema: z.ZodObject<{
         zh: "zh";
       }>>;
     }, z.core.$strip>;
-  }, z.core.$strip>>;
+  }, z.core.$strip>;
 }, z.core.$strip>;
 type CreateProjectProps = z.infer<typeof createProjectSchema>;
 declare const readProjectSchema: z.ZodObject<{
@@ -11390,9 +11389,9 @@ declare const readProjectSchema: z.ZodObject<{
 type ReadProjectProps = z.infer<typeof readProjectSchema>;
 declare const updateProjectSchema: z.ZodObject<{
   id: z.ZodReadonly<z.ZodUUID>;
-  name: z.ZodOptional<z.ZodString>;
-  description: z.ZodOptional<z.ZodString>;
-  settings: z.ZodOptional<z.ZodObject<{
+  name: z.ZodString;
+  description: z.ZodString;
+  settings: z.ZodObject<{
     language: z.ZodObject<{
       default: z.ZodEnum<{
         bg: "bg";
@@ -11447,7 +11446,7 @@ declare const updateProjectSchema: z.ZodObject<{
         zh: "zh";
       }>>;
     }, z.core.$strip>;
-  }, z.core.$strip>>;
+  }, z.core.$strip>;
 }, z.core.$strip>;
 type UpdateProjectProps = z.infer<typeof updateProjectSchema>;
 declare const upgradeProjectSchema: z.ZodObject<{
@@ -12568,8 +12567,8 @@ declare function getUpdateEntrySchemaFromFieldDefinitions(fieldDefinitions: Fiel
 //#region src/schema/serviceSchema.d.ts
 declare const serviceTypeSchema: z.ZodEnum<{
   Asset: "Asset";
-  Collection: "Collection";
   Entry: "Entry";
+  Collection: "Collection";
   Project: "Project";
   Git: "Git";
   GitTag: "GitTag";
@@ -14377,12 +14376,11 @@ declare class EntryService extends AbstractCrudService implements CrudServiceWit
 declare class ProjectService extends AbstractCrudService implements CrudServiceWithListCount<Project> {
   private coreVersion;
   private jsonFileService;
-  private userService;
   private gitService;
   private assetService;
   private collectionService;
   private entryService;
-  constructor(coreVersion: Version, options: ElekIoCoreOptions, logService: LogService, jsonFileService: JsonFileService, userService: UserService, gitService: GitService, assetService: AssetService, collectionService: CollectionService, entryService: EntryService);
+  constructor(coreVersion: Version, options: ElekIoCoreOptions, logService: LogService, jsonFileService: JsonFileService, gitService: GitService, assetService: AssetService, collectionService: CollectionService, entryService: EntryService);
   /**
    * Creates a new Project
    */
@@ -14498,7 +14496,7 @@ declare class ProjectService extends AbstractCrudService implements CrudServiceW
   /**
    * Lists outdated Projects that need to be upgraded
    */
-  listOutdated(): Promise<OutdatedProject[]>;
+  listOutdated(): Promise<MigrateProjectProps[]>;
   list(props?: ListProjectsProps): Promise<PaginatedList<Project>>;
   count(): Promise<number>;
   /**
@@ -14508,7 +14506,7 @@ declare class ProjectService extends AbstractCrudService implements CrudServiceW
   /**
    * Migrates an potentially outdated Project file to the current schema
    */
-  migrate(potentiallyOutdatedProjectFile: unknown): {
+  migrate(props: MigrateProjectProps): {
     id: string;
     created: string;
     updated: string | null;
@@ -14725,5 +14723,5 @@ declare class ElekIoCore {
   get api(): LocalApi;
 }
 //#endregion
-export { ApiStartProps, Asset, AssetExport, AssetFieldDefinition, AssetFile, BaseFile, BaseUser, BooleanFieldDefinitionBaseSchema, CloneProjectProps, CloudUser, Collection, CollectionExport, CollectionFile, ConstructorElekIoCoreProps, CountAssetsProps, CountCollectionsProps, CountEntriesProps, CountGitTagsProps, CreateAssetProps, CreateCollectionProps, CreateEntryProps, CreateGitTagProps, CreateProjectProps, CrudService, CrudServiceWithListCount, CurrentBranchProjectProps, DateFieldDefinition, DatetimeFieldDefinition, DeleteAssetProps, DeleteCollectionProps, DeleteEntryProps, DeleteGitTagProps, DeleteProjectProps, DirectBooleanValue, DirectNumberValue, DirectStringValue, DirectValue, ElekIoCoreOptions, EmailFieldDefinition, Entry, EntryExport, EntryFieldDefinition, EntryFile, ExportProps, FieldDefinition, FieldDefinitionBase, FieldDefinitionBaseSchema, FieldType, FieldTypeSchema, FieldWidthSchema, FileReference, GenerateApiClientProps, GetChangesProjectProps, GetRemoteOriginUrlProjectProps, GitCloneOptions, GitCommit, GitInitOptions, GitLogOptions, GitMergeOptions, GitMessage, GitSignature, GitSwitchOptions, GitTag, Ipv4FieldDefinition, ListAssetsProps, ListBranchesProjectProps, ListCollectionsProps, ListEntriesProps, ListGitTagsProps, ListProjectsProps, LocalUser, LogConsoleTransportProps, LogProps, LogSource, NumberFieldDefinition, NumberFieldDefinitionBaseSchema, ObjectType, OutdatedProject, PaginatedList, PaginationOptions, Project, ProjectBranch, ProjectExport, ProjectFile, ProjectFolder, ProjectSettings, ProjectStatus, ProjectUpgrade, RangeFieldDefinition, ReadAssetProps, ReadCollectionProps, ReadEntryProps, ReadGitTagProps, ReadProjectProps, ReferenceFieldDefinitionBaseSchema, ReferencedValue, SaveAssetProps, SearchProjectProps, ServiceType, SetRemoteOriginUrlProjectProps, SetUserProps, StringFieldDefinition, StringFieldDefinitionBaseSchema, SupportedIcon, SupportedLanguage, SwitchBranchProjectProps, SynchronizeProjectProps, TelephoneFieldDefinition, TextFieldDefinition, TextareaFieldDefinition, TimeFieldDefinition, ToggleFieldDefinition, TranslatableBoolean, TranslatableNumber, TranslatableString, UpdateAssetProps, UpdateCollectionProps, UpdateEntryProps, UpdateProjectProps, UpgradeProjectProps, UrlFieldDefinition, User, UserFile, UserTypeSchema, Uuid, Value, ValueContentReference, ValueContentReferenceToAsset, ValueContentReferenceToCollection, ValueContentReferenceToEntry, ValueType, ValueTypeSchema, Version, apiStartSchema, assetExportSchema, assetFieldDefinitionSchema, assetFileSchema, assetSchema, baseFileSchema, baseUserSchema, cloneProjectSchema, cloudUserSchema, collectionExportSchema, collectionFileSchema, collectionSchema, constructorElekIoCoreSchema, countAssetsSchema, countCollectionsSchema, countEntriesSchema, countGitTagsSchema, createAssetSchema, createCollectionSchema, createEntrySchema, createGitTagSchema, createProjectSchema, currentBranchProjectSchema, dateFieldDefinitionSchema, datetime, datetimeFieldDefinitionSchema, ElekIoCore as default, deleteAssetSchema, deleteCollectionSchema, deleteEntrySchema, deleteGitTagSchema, deleteProjectSchema, directBooleanValueSchema, directNumberValueSchema, directStringValueSchema, directValueBaseSchema, directValueSchema, elekIoCoreOptionsSchema, emailFieldDefinitionSchema, entryExportSchema, entryFieldDefinitionSchema, entryFileSchema, entrySchema, exportSchema, fieldDefinitionSchema, fileReferenceSchema, generateApiClientSchema, getChangesProjectSchema, getCreateEntrySchemaFromFieldDefinitions, getEntrySchemaFromFieldDefinitions, getRemoteOriginUrlProjectSchema, getUpdateEntrySchemaFromFieldDefinitions, getValueSchemaFromFieldDefinition, gitCloneOptionsSchema, gitCommitSchema, gitInitOptionsSchema, gitLogOptionsSchema, gitMergeOptionsSchema, gitMessageSchema, gitSignatureSchema, gitSwitchOptionsSchema, gitTagSchema, ipv4FieldDefinitionSchema, listAssetsSchema, listBranchesProjectSchema, listCollectionsSchema, listEntriesSchema, listGitTagsSchema, listProjectsSchema, localUserSchema, logConsoleTransportSchema, logLevelSchema, logSchema, logSourceSchema, numberFieldDefinitionSchema, objectTypeSchema, outdatedProjectSchema, paginatedListOf, projectBranchSchema, projectExportSchema, projectFileSchema, projectFolderSchema, projectSchema, projectSettingsSchema, projectStatusSchema, projectUpgradeSchema, rangeFieldDefinitionSchema, readAssetSchema, readCollectionSchema, readEntrySchema, readGitTagSchema, readProjectSchema, referencedValueSchema, saveAssetSchema, searchProjectSchema, serviceTypeSchema, setRemoteOriginUrlProjectSchema, setUserSchema, slug, stringFieldDefinitionSchema, supportedIconSchema, supportedLanguageSchema, switchBranchProjectSchema, synchronizeProjectSchema, telephoneFieldDefinitionSchema, textFieldDefinitionSchema, textareaFieldDefinitionSchema, timeFieldDefinitionSchema, toggleFieldDefinitionSchema, translatableArrayOf, translatableBooleanSchema, translatableNumberSchema, translatableStringSchema, updateAssetSchema, updateCollectionSchema, updateEntrySchema, updateProjectSchema, upgradeProjectSchema, urlFieldDefinitionSchema, userFileSchema, userSchema, uuid, uuidSchema, valueContentReferenceBase, valueContentReferenceSchema, valueContentReferenceToAssetSchema, valueContentReferenceToCollectionSchema, valueContentReferenceToEntrySchema, valueSchema, versionSchema };
+export { ApiStartProps, Asset, AssetExport, AssetFieldDefinition, AssetFile, BaseFile, BaseUser, BooleanFieldDefinitionBaseSchema, CloneProjectProps, CloudUser, Collection, CollectionExport, CollectionFile, ConstructorElekIoCoreProps, CountAssetsProps, CountCollectionsProps, CountEntriesProps, CountGitTagsProps, CreateAssetProps, CreateCollectionProps, CreateEntryProps, CreateGitTagProps, CreateProjectProps, CrudService, CrudServiceWithListCount, CurrentBranchProjectProps, DateFieldDefinition, DatetimeFieldDefinition, DeleteAssetProps, DeleteCollectionProps, DeleteEntryProps, DeleteGitTagProps, DeleteProjectProps, DirectBooleanValue, DirectNumberValue, DirectStringValue, DirectValue, ElekIoCoreOptions, EmailFieldDefinition, Entry, EntryExport, EntryFieldDefinition, EntryFile, ExportProps, FieldDefinition, FieldDefinitionBase, FieldDefinitionBaseSchema, FieldType, FieldTypeSchema, FieldWidthSchema, FileReference, GenerateApiClientProps, GetChangesProjectProps, GetRemoteOriginUrlProjectProps, GitCloneOptions, GitCommit, GitInitOptions, GitLogOptions, GitMergeOptions, GitMessage, GitSignature, GitSwitchOptions, GitTag, Ipv4FieldDefinition, ListAssetsProps, ListBranchesProjectProps, ListCollectionsProps, ListEntriesProps, ListGitTagsProps, ListProjectsProps, LocalUser, LogConsoleTransportProps, LogProps, LogSource, MigrateProjectProps, NumberFieldDefinition, NumberFieldDefinitionBaseSchema, ObjectType, PaginatedList, PaginationOptions, Project, ProjectBranch, ProjectExport, ProjectFile, ProjectFolder, ProjectSettings, ProjectStatus, ProjectUpgrade, RangeFieldDefinition, ReadAssetProps, ReadCollectionProps, ReadEntryProps, ReadGitTagProps, ReadProjectProps, ReferenceFieldDefinitionBaseSchema, ReferencedValue, SaveAssetProps, SearchProjectProps, ServiceType, SetRemoteOriginUrlProjectProps, SetUserProps, StringFieldDefinition, StringFieldDefinitionBaseSchema, SupportedIcon, SupportedLanguage, SwitchBranchProjectProps, SynchronizeProjectProps, TelephoneFieldDefinition, TextFieldDefinition, TextareaFieldDefinition, TimeFieldDefinition, ToggleFieldDefinition, TranslatableBoolean, TranslatableNumber, TranslatableString, UpdateAssetProps, UpdateCollectionProps, UpdateEntryProps, UpdateProjectProps, UpgradeProjectProps, UrlFieldDefinition, User, UserFile, UserTypeSchema, Uuid, Value, ValueContentReference, ValueContentReferenceToAsset, ValueContentReferenceToCollection, ValueContentReferenceToEntry, ValueType, ValueTypeSchema, Version, apiStartSchema, assetExportSchema, assetFieldDefinitionSchema, assetFileSchema, assetSchema, baseFileSchema, baseUserSchema, cloneProjectSchema, cloudUserSchema, collectionExportSchema, collectionFileSchema, collectionSchema, constructorElekIoCoreSchema, countAssetsSchema, countCollectionsSchema, countEntriesSchema, countGitTagsSchema, createAssetSchema, createCollectionSchema, createEntrySchema, createGitTagSchema, createProjectSchema, currentBranchProjectSchema, dateFieldDefinitionSchema, datetime, datetimeFieldDefinitionSchema, ElekIoCore as default, deleteAssetSchema, deleteCollectionSchema, deleteEntrySchema, deleteGitTagSchema, deleteProjectSchema, directBooleanValueSchema, directNumberValueSchema, directStringValueSchema, directValueBaseSchema, directValueSchema, elekIoCoreOptionsSchema, emailFieldDefinitionSchema, entryExportSchema, entryFieldDefinitionSchema, entryFileSchema, entrySchema, exportSchema, fieldDefinitionSchema, fileReferenceSchema, generateApiClientSchema, getChangesProjectSchema, getCreateEntrySchemaFromFieldDefinitions, getEntrySchemaFromFieldDefinitions, getRemoteOriginUrlProjectSchema, getUpdateEntrySchemaFromFieldDefinitions, getValueSchemaFromFieldDefinition, gitCloneOptionsSchema, gitCommitSchema, gitInitOptionsSchema, gitLogOptionsSchema, gitMergeOptionsSchema, gitMessageSchema, gitSignatureSchema, gitSwitchOptionsSchema, gitTagSchema, ipv4FieldDefinitionSchema, listAssetsSchema, listBranchesProjectSchema, listCollectionsSchema, listEntriesSchema, listGitTagsSchema, listProjectsSchema, localUserSchema, logConsoleTransportSchema, logLevelSchema, logSchema, logSourceSchema, migrateProjectSchema, numberFieldDefinitionSchema, objectTypeSchema, paginatedListOf, projectBranchSchema, projectExportSchema, projectFileSchema, projectFolderSchema, projectSchema, projectSettingsSchema, projectStatusSchema, projectUpgradeSchema, rangeFieldDefinitionSchema, readAssetSchema, readCollectionSchema, readEntrySchema, readGitTagSchema, readProjectSchema, referencedValueSchema, saveAssetSchema, searchProjectSchema, serviceTypeSchema, setRemoteOriginUrlProjectSchema, setUserSchema, slug, stringFieldDefinitionSchema, supportedIconSchema, supportedLanguageSchema, switchBranchProjectSchema, synchronizeProjectSchema, telephoneFieldDefinitionSchema, textFieldDefinitionSchema, textareaFieldDefinitionSchema, timeFieldDefinitionSchema, toggleFieldDefinitionSchema, translatableArrayOf, translatableBooleanSchema, translatableNumberSchema, translatableStringSchema, updateAssetSchema, updateCollectionSchema, updateEntrySchema, updateProjectSchema, upgradeProjectSchema, urlFieldDefinitionSchema, userFileSchema, userSchema, uuid, uuidSchema, valueContentReferenceBase, valueContentReferenceSchema, valueContentReferenceToAssetSchema, valueContentReferenceToCollectionSchema, valueContentReferenceToEntrySchema, valueSchema, versionSchema };
 //# sourceMappingURL=index.node.d.ts.map

package/dist/node/index.node.js

@@ -23,7 +23,7 @@ import Semver from "semver";
 //#region package.json
 var package_default = {
 	name: "@elek-io/core",
-	version: "0.15.2",
+	version: "0.15.3",
 	description: "Handles core functionality of elek.io Projects like file IO and version control.",
 	homepage: "https://elek.io",
 	repository: "https://github.com/elek-io/core",
@@ -681,11 +681,10 @@ const projectSchema = projectFileSchema.extend({
 	history: z.array(gitCommitSchema).openapi({ description: "Commit history of this Project" }),
 	fullHistory: z.array(gitCommitSchema).openapi({ description: "Full commit history of this Project including all Assets, Collections, Entries and other files" })
 }).openapi("Project");
-const outdatedProjectSchema = projectFileSchema.pick({
+const migrateProjectSchema = projectFileSchema.pick({
 	id: true,
-	name: true,
 	coreVersion: true
-});
+}).loose();
 const projectExportSchema = projectSchema.extend({
 	assets: z.array(assetExportSchema),
 	collections: z.array(collectionExportSchema)
@@ -694,9 +693,6 @@ const createProjectSchema = projectSchema.pick({
 	name: true,
 	description: true,
 	settings: true
-}).partial({
-	description: true,
-	settings: true
 });
 const readProjectSchema = z.object({
 	id: uuidSchema.readonly(),
@@ -707,10 +703,6 @@ const updateProjectSchema = projectSchema.pick({
 	name: true,
 	description: true,
 	settings: true
-}).partial({
-	name: true,
-	description: true,
-	settings: true
 });
 const upgradeProjectSchema = z.object({
 	id: uuidSchema.readonly(),
@@ -3128,16 +3120,14 @@ var SynchronizeLocalChangesError = class extends Error {
 var ProjectService = class extends AbstractCrudService {
 	coreVersion;
 	jsonFileService;
-	userService;
 	gitService;
 	assetService;
 	collectionService;
 	entryService;
-	constructor(coreVersion, options, logService, jsonFileService, userService, gitService, assetService, collectionService, entryService) {
+	constructor(coreVersion, options, logService, jsonFileService, gitService, assetService, collectionService, entryService) {
 		super(serviceTypeSchema.enum.Project, options, logService);
 		this.coreVersion = coreVersion;
 		this.jsonFileService = jsonFileService;
-		this.userService = userService;
 		this.gitService = gitService;
 		this.assetService = assetService;
 		this.collectionService = collectionService;
@@ -3148,19 +3138,11 @@ var ProjectService = class extends AbstractCrudService {
 	*/
 	async create(props) {
 		createProjectSchema.parse(props);
-		const user = await this.userService.get();
-		if (!user) throw new NoCurrentUserError();
 		const id = uuid();
-		const defaultSettings = { language: {
-			default: user.language,
-			supported: [user.language]
-		} };
 		const projectFile = {
 			...props,
 			objectType: "project",
 			id,
-			description: props.description || "",
-			settings: Object.assign({}, defaultSettings, props.settings),
 			created: datetime(),
 			updated: null,
 			coreVersion: this.coreVersion,
@@ -3218,7 +3200,7 @@ var ProjectService = class extends AbstractCrudService {
 			const projectFile = await this.jsonFileService.read(pathTo.projectFile(props.id), projectFileSchema);
 			return await this.toProject(projectFile);
 		} else {
-			const projectFile = this.migrate(JSON.parse(await this.gitService.getFileContentAtCommit(pathTo.project(props.id), pathTo.projectFile(props.id), props.commitHash)));
+			const projectFile = this.migrate(migrateProjectSchema.parse(JSON.parse(await this.gitService.getFileContentAtCommit(pathTo.project(props.id), pathTo.projectFile(props.id), props.commitHash))));
 			return await this.toProject(projectFile);
 		}
 	}
@@ -3229,16 +3211,9 @@ var ProjectService = class extends AbstractCrudService {
 		updateProjectSchema.parse(props);
 		const projectPath = pathTo.project(props.id);
 		const filePath = pathTo.projectFile(props.id);
-		const prevProjectFile = await this.read(props);
 		const projectFile = {
-			...prevProjectFile,
-			name: props.name || prevProjectFile.name,
-			description: props.description || prevProjectFile.description,
-			coreVersion: this.coreVersion,
-			settings: { language: {
-				supported: props.settings?.language.supported || prevProjectFile.settings.language.supported,
-				default: props.settings?.language.default || prevProjectFile.settings.language.default
-			} },
+			...await this.read(props),
+			...props,
 			updated: datetime()
 		};
 		await this.jsonFileService.update(projectFile, filePath, projectFileSchema);
@@ -3262,7 +3237,7 @@ var ProjectService = class extends AbstractCrudService {
 		const projectPath = pathTo.project(props.id);
 		const projectFilePath = pathTo.projectFile(props.id);
 		if (await this.gitService.branches.current(projectPath) !== projectBranchSchema.enum.work) await this.gitService.branches.switch(projectPath, projectBranchSchema.enum.work);
-		const currentProjectFile = outdatedProjectSchema.passthrough().parse(await this.jsonFileService.unsafeRead(projectFilePath));
+		const currentProjectFile = migrateProjectSchema.parse(await this.jsonFileService.unsafeRead(projectFilePath));
 		if (Semver.gt(currentProjectFile.coreVersion, this.coreVersion)) throw new ProjectUpgradeError(`The Projects Core version "${currentProjectFile.coreVersion}" is higher than the current Core version "${this.coreVersion}".`);
 		if (Semver.eq(currentProjectFile.coreVersion, this.coreVersion) && props.force !== true) throw new ProjectUpgradeError(`The Projects Core version "${currentProjectFile.coreVersion}" is already up to date.`);
 		const assetReferences = await this.listReferences("asset", props.id);
@@ -3404,7 +3379,7 @@ var ProjectService = class extends AbstractCrudService {
 		const projectReferences = await this.listReferences(objectTypeSchema.enum.project);
 		return (await Promise.all(projectReferences.map(async (reference) => {
 			const json = await this.jsonFileService.unsafeRead(pathTo.projectFile(reference.id));
-			const projectFile = outdatedProjectSchema.parse(json);
+			const projectFile = migrateProjectSchema.parse(json);
 			if (projectFile.coreVersion !== this.coreVersion) return projectFile;
 			return null;
 		}))).filter(isNotEmpty);
@@ -3437,8 +3412,9 @@ var ProjectService = class extends AbstractCrudService {
 	/**
 	* Migrates an potentially outdated Project file to the current schema
 	*/
-	migrate(potentiallyOutdatedProjectFile) {
-		return projectFileSchema.parse(potentiallyOutdatedProjectFile);
+	migrate(props) {
+		props.coreVersion = this.coreVersion;
+		return projectFileSchema.parse(props);
 	}
 	/**
 	* Creates a Project from given ProjectFile
@@ -3627,7 +3603,7 @@ var ElekIoCore = class {
 		this.assetService = new AssetService(this.options, this.logService, this.jsonFileService, this.gitService);
 		this.collectionService = new CollectionService(this.options, this.logService, this.jsonFileService, this.gitService);
 		this.entryService = new EntryService(this.options, this.logService, this.jsonFileService, this.gitService, this.collectionService);
-		this.projectService = new ProjectService(this.coreVersion, this.options, this.logService, this.jsonFileService, this.userService, this.gitService, this.assetService, this.collectionService, this.entryService);
+		this.projectService = new ProjectService(this.coreVersion, this.options, this.logService, this.jsonFileService, this.gitService, this.assetService, this.collectionService, this.entryService);
 		this.localApi = new LocalApi(this.logService, this.projectService, this.collectionService, this.entryService, this.assetService);
 		this.logService.info({
 			source: "core",
@@ -3696,5 +3672,5 @@ var ElekIoCore = class {
 };
 
 //#endregion
-export { BooleanFieldDefinitionBaseSchema, FieldDefinitionBaseSchema, FieldTypeSchema, FieldWidthSchema, NumberFieldDefinitionBaseSchema, ReferenceFieldDefinitionBaseSchema, StringFieldDefinitionBaseSchema, UserTypeSchema, ValueTypeSchema, apiStartSchema, assetExportSchema, assetFieldDefinitionSchema, assetFileSchema, assetSchema, baseFileSchema, baseUserSchema, cloneProjectSchema, cloudUserSchema, collectionExportSchema, collectionFileSchema, collectionSchema, constructorElekIoCoreSchema, countAssetsSchema, countCollectionsSchema, countEntriesSchema, countGitTagsSchema, createAssetSchema, createCollectionSchema, createEntrySchema, createGitTagSchema, createProjectSchema, currentBranchProjectSchema, dateFieldDefinitionSchema, datetime, datetimeFieldDefinitionSchema, ElekIoCore as default, deleteAssetSchema, deleteCollectionSchema, deleteEntrySchema, deleteGitTagSchema, deleteProjectSchema, directBooleanValueSchema, directNumberValueSchema, directStringValueSchema, directValueBaseSchema, directValueSchema, elekIoCoreOptionsSchema, emailFieldDefinitionSchema, entryExportSchema, entryFieldDefinitionSchema, entryFileSchema, entrySchema, exportSchema, fieldDefinitionSchema, fileReferenceSchema, generateApiClientSchema, getChangesProjectSchema, getCreateEntrySchemaFromFieldDefinitions, getEntrySchemaFromFieldDefinitions, getRemoteOriginUrlProjectSchema, getUpdateEntrySchemaFromFieldDefinitions, getValueSchemaFromFieldDefinition, gitCloneOptionsSchema, gitCommitSchema, gitInitOptionsSchema, gitLogOptionsSchema, gitMergeOptionsSchema, gitMessageSchema, gitSignatureSchema, gitSwitchOptionsSchema, gitTagSchema, ipv4FieldDefinitionSchema, listAssetsSchema, listBranchesProjectSchema, listCollectionsSchema, listEntriesSchema, listGitTagsSchema, listProjectsSchema, localUserSchema, logConsoleTransportSchema, logLevelSchema, logSchema, logSourceSchema, numberFieldDefinitionSchema, objectTypeSchema, outdatedProjectSchema, paginatedListOf, projectBranchSchema, projectExportSchema, projectFileSchema, projectFolderSchema, projectSchema, projectSettingsSchema, projectStatusSchema, projectUpgradeSchema, rangeFieldDefinitionSchema, readAssetSchema, readCollectionSchema, readEntrySchema, readGitTagSchema, readProjectSchema, referencedValueSchema, saveAssetSchema, searchProjectSchema, serviceTypeSchema, setRemoteOriginUrlProjectSchema, setUserSchema, slug, stringFieldDefinitionSchema, supportedIconSchema, supportedLanguageSchema, switchBranchProjectSchema, synchronizeProjectSchema, telephoneFieldDefinitionSchema, textFieldDefinitionSchema, textareaFieldDefinitionSchema, timeFieldDefinitionSchema, toggleFieldDefinitionSchema, translatableArrayOf, translatableBooleanSchema, translatableNumberSchema, translatableStringSchema, updateAssetSchema, updateCollectionSchema, updateEntrySchema, updateProjectSchema, upgradeProjectSchema, urlFieldDefinitionSchema, userFileSchema, userSchema, uuid, uuidSchema, valueContentReferenceBase, valueContentReferenceSchema, valueContentReferenceToAssetSchema, valueContentReferenceToCollectionSchema, valueContentReferenceToEntrySchema, valueSchema, versionSchema };
+export { BooleanFieldDefinitionBaseSchema, FieldDefinitionBaseSchema, FieldTypeSchema, FieldWidthSchema, NumberFieldDefinitionBaseSchema, ReferenceFieldDefinitionBaseSchema, StringFieldDefinitionBaseSchema, UserTypeSchema, ValueTypeSchema, apiStartSchema, assetExportSchema, assetFieldDefinitionSchema, assetFileSchema, assetSchema, baseFileSchema, baseUserSchema, cloneProjectSchema, cloudUserSchema, collectionExportSchema, collectionFileSchema, collectionSchema, constructorElekIoCoreSchema, countAssetsSchema, countCollectionsSchema, countEntriesSchema, countGitTagsSchema, createAssetSchema, createCollectionSchema, createEntrySchema, createGitTagSchema, createProjectSchema, currentBranchProjectSchema, dateFieldDefinitionSchema, datetime, datetimeFieldDefinitionSchema, ElekIoCore as default, deleteAssetSchema, deleteCollectionSchema, deleteEntrySchema, deleteGitTagSchema, deleteProjectSchema, directBooleanValueSchema, directNumberValueSchema, directStringValueSchema, directValueBaseSchema, directValueSchema, elekIoCoreOptionsSchema, emailFieldDefinitionSchema, entryExportSchema, entryFieldDefinitionSchema, entryFileSchema, entrySchema, exportSchema, fieldDefinitionSchema, fileReferenceSchema, generateApiClientSchema, getChangesProjectSchema, getCreateEntrySchemaFromFieldDefinitions, getEntrySchemaFromFieldDefinitions, getRemoteOriginUrlProjectSchema, getUpdateEntrySchemaFromFieldDefinitions, getValueSchemaFromFieldDefinition, gitCloneOptionsSchema, gitCommitSchema, gitInitOptionsSchema, gitLogOptionsSchema, gitMergeOptionsSchema, gitMessageSchema, gitSignatureSchema, gitSwitchOptionsSchema, gitTagSchema, ipv4FieldDefinitionSchema, listAssetsSchema, listBranchesProjectSchema, listCollectionsSchema, listEntriesSchema, listGitTagsSchema, listProjectsSchema, localUserSchema, logConsoleTransportSchema, logLevelSchema, logSchema, logSourceSchema, migrateProjectSchema, numberFieldDefinitionSchema, objectTypeSchema, paginatedListOf, projectBranchSchema, projectExportSchema, projectFileSchema, projectFolderSchema, projectSchema, projectSettingsSchema, projectStatusSchema, projectUpgradeSchema, rangeFieldDefinitionSchema, readAssetSchema, readCollectionSchema, readEntrySchema, readGitTagSchema, readProjectSchema, referencedValueSchema, saveAssetSchema, searchProjectSchema, serviceTypeSchema, setRemoteOriginUrlProjectSchema, setUserSchema, slug, stringFieldDefinitionSchema, supportedIconSchema, supportedLanguageSchema, switchBranchProjectSchema, synchronizeProjectSchema, telephoneFieldDefinitionSchema, textFieldDefinitionSchema, textareaFieldDefinitionSchema, timeFieldDefinitionSchema, toggleFieldDefinitionSchema, translatableArrayOf, translatableBooleanSchema, translatableNumberSchema, translatableStringSchema, updateAssetSchema, updateCollectionSchema, updateEntrySchema, updateProjectSchema, upgradeProjectSchema, urlFieldDefinitionSchema, userFileSchema, userSchema, uuid, uuidSchema, valueContentReferenceBase, valueContentReferenceSchema, valueContentReferenceToAssetSchema, valueContentReferenceToCollectionSchema, valueContentReferenceToEntrySchema, valueSchema, versionSchema };
 //# sourceMappingURL=index.node.js.map