@cyberismo/data-handler 0.0.14 → 0.0.16

package/dist/commands/transition.js.map

@@ -1 +1 @@
-{"version":3,"file":"transition.js","sourceRoot":"","sources":["../../src/commands/transition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transition.js","sourceRoot":"","sources":["../../src/commands/transition.ts"],"names":[],"mappings":"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"}

package/dist/commands/update.d.ts

@@ -10,18 +10,34 @@
     License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import type { OperationFor, UpdateOperations } from '../resources/resource-object.js';
-import { Project } from '../containers/project.js';
+import type { Project } from '../containers/project.js';
+import type { UpdateKey } from '../interfaces/resource-interfaces.js';
 /**
  * Class that handles 'update' commands.
  */
 export declare class Update {
     private project;
+    /**
+     * Creates an instance of Update command.
+     * @param project Project to use.
+     */
     constructor(project: Project);
+    /**
+     * Update single resource property
+     * This is similar to updateValue, but allows the operation to be fully specified
+     * @param name Name of the resource to operate on.
+     * @param updateKey Property to change in resource or in resource content.
+     * @param operation The full operation object
+     * @template Type Type of the target of the operation
+     * @template T Type of operation ('add', 'remove', 'change', 'rank')
+     * @template K Type of the key to change
+     */
+    applyResourceOperation<Type, T extends UpdateOperations, K extends string>(name: string, updateKey: UpdateKey<K>, operation: OperationFor<Type, T>): Promise<void>;
     /**
      * Updates single resource property.
      * @param name Name of the resource to operate on.
      * @param operation Operation to perform ('add', 'remove', 'change', 'rank')
-     * @param key Property to change in resource JSON
+     * @param key Property to change in resource JSON. If content, content/<property>
      * @param value Value for 'key'
      * @param optionalDetail Additional detail needed for some operations. For example, 'update' needs a new value.
      * @param mappingTable Optional mapping table for workflow state transitions (only used for workflow changes)
@@ -30,14 +46,4 @@ export declare class Update {
     mappingTable?: {
         stateMapping: Record<string, string>;
     }): Promise<void>;
-    /**
-     * Update single resource property
-     * This is similar to updateValue, but allows the operation to be fully specified
-     * @param name Name of the resource to operate on.
-     * @param key Property to change in resource JSON
-     * @param operation The full operation object
-     * @template Type Type of the target of the operation
-     * @template T Type of operation ('add', 'remove', 'change', 'rank')
-     */
-    applyResourceOperation<Type, T extends UpdateOperations>(name: string, key: string, operation: OperationFor<Type, T>): Promise<void>;
 }

package/dist/commands/update.js

@@ -9,21 +9,38 @@
     You should have received a copy of the GNU Affero General Public
     License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import { Project } from '../containers/project.js';
-import { resourceName } from '../utils/resource-utils.js';
 /**
  * Class that handles 'update' commands.
  */
 export class Update {
     project;
+    /**
+     * Creates an instance of Update command.
+     * @param project Project to use.
+     */
     constructor(project) {
         this.project = project;
     }
+    /**
+     * Update single resource property
+     * This is similar to updateValue, but allows the operation to be fully specified
+     * @param name Name of the resource to operate on.
+     * @param updateKey Property to change in resource or in resource content.
+     * @param operation The full operation object
+     * @template Type Type of the target of the operation
+     * @template T Type of operation ('add', 'remove', 'change', 'rank')
+     * @template K Type of the key to change
+     */
+    async applyResourceOperation(name, updateKey, operation) {
+        const type = this.project.resources.extractType(name);
+        const resource = this.project.resources.byType(name, type);
+        await resource?.update(updateKey, operation);
+    }
     /**
      * Updates single resource property.
      * @param name Name of the resource to operate on.
      * @param operation Operation to perform ('add', 'remove', 'change', 'rank')
-     * @param key Property to change in resource JSON
+     * @param key Property to change in resource JSON. If content, content/<property>
      * @param value Value for 'key'
      * @param optionalDetail Additional detail needed for some operations. For example, 'update' needs a new value.
      * @param mappingTable Optional mapping table for workflow state transitions (only used for workflow changes)
@@ -62,21 +79,20 @@ export class Update {
                 ? optionalDetail
                 : undefined;
         }
-        await this.applyResourceOperation(name, key, op);
-    }
-    /**
-     * Update single resource property
-     * This is similar to updateValue, but allows the operation to be fully specified
-     * @param name Name of the resource to operate on.
-     * @param key Property to change in resource JSON
-     * @param operation The full operation object
-     * @template Type Type of the target of the operation
-     * @template T Type of operation ('add', 'remove', 'change', 'rank')
-     */
-    async applyResourceOperation(name, key, operation) {
-        const resource = Project.resourceObject(this.project, resourceName(name));
-        await resource?.update(key, operation);
-        this.project.collectLocalResources();
+        const splitKey = key.split('/');
+        if (splitKey.length !== 1 && splitKey.length !== 2) {
+            throw new Error(`Invalid key format: ${key}. Use 'property' or 'content/<property>'.`);
+        }
+        if (splitKey.length === 2 && splitKey[0] !== 'content') {
+            throw new Error(`Invalid key format: ${key}. When using 'content', always use as 'content/<property>'.`);
+        }
+        const [parsedKey, subKey] = splitKey;
+        if (parsedKey === 'content') {
+            await this.applyResourceOperation(name, { key: parsedKey, subKey }, op);
+        }
+        else {
+            await this.applyResourceOperation(name, { key: parsedKey }, op);
+        }
     }
 }
 //# sourceMappingURL=update.js.map

package/dist/commands/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAWF,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D;;GAEG;AACH,MAAM,OAAO,MAAM;IACG;IAApB,YAAoB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAExC;;;;;;;;OAQG;IACI,KAAK,CAAC,WAAW,CACtB,IAAY,EACZ,SAA2B,EAC3B,GAAW,EACX,KAAW,EACX,cAAqB,EAAE,kEAAkE;IACzF,YAAuD;QAEvD,MAAM,EAAE,GAAoB;YAC1B,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,EAAU;YAClB,EAAE,EAAE,EAAU;YACd,QAAQ,EAAE,CAAW;SACtB,CAAC;QAEF,qCAAqC;QACrC,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACvB,EAAyB,CAAC,MAAM,GAAG,KAAK,CAAC;QAC5C,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YACjC,EAA4B,CAAC,MAAM,GAAG,cAAc;gBACnD,CAAC,CAAC,KAAK;gBACP,CAAC,CAAE,cAAuB,CAAC;YAC5B,EAA4B,CAAC,EAAE,GAAG,cAAc;gBAC/C,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAE,KAAc,CAAC;YACpB,uDAAuD;YACvD,IAAI,YAAY,EAAE,CAAC;gBAChB,EAA4B,CAAC,YAAY,GAAG,YAAY,CAAC;YAC5D,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAC/B,EAA0B,CAAC,QAAQ,GAAG,cAAwB,CAAC;YAC/D,EAA0B,CAAC,MAAM,GAAG,KAAK,CAAC;QAC7C,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YACjC,EAA4B,CAAC,MAAM,GAAG,KAAK,CAAC;YAC5C,EAA4B,CAAC,gBAAgB,GAAG,cAAc;gBAC7D,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,SAAS,CAAC;QAChB,CAAC;QAED,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,sBAAsB,CACjC,IAAY,EACZ,GAAW,EACX,SAAgC;QAEhC,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1E,MAAM,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;IACvC,CAAC;CACF"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAcF;;GAEG;AACH,MAAM,OAAO,MAAM;IAKG;IAJpB;;;OAGG;IACH,YAAoB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAG,CAAC;IAExC;;;;;;;;;OASG;IACI,KAAK,CAAC,sBAAsB,CAIjC,IAAY,EAAE,SAAuB,EAAE,SAAgC;QACvE,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3D,MAAM,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,WAAW,CACtB,IAAY,EACZ,SAA2B,EAC3B,GAAW,EACX,KAAW,EACX,cAAqB,EAAE,kEAAkE;IACzF,YAAuD;QAEvD,MAAM,EAAE,GAAoB;YAC1B,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,EAAU;YAClB,EAAE,EAAE,EAAU;YACd,QAAQ,EAAE,CAAW;SACtB,CAAC;QAEF,qCAAqC;QACrC,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACvB,EAAyB,CAAC,MAAM,GAAG,KAAK,CAAC;QAC5C,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YACjC,EAA4B,CAAC,MAAM,GAAG,cAAc;gBACnD,CAAC,CAAC,KAAK;gBACP,CAAC,CAAE,cAAuB,CAAC;YAC5B,EAA4B,CAAC,EAAE,GAAG,cAAc;gBAC/C,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAE,KAAc,CAAC;YACpB,uDAAuD;YACvD,IAAI,YAAY,EAAE,CAAC;gBAChB,EAA4B,CAAC,YAAY,GAAG,YAAY,CAAC;YAC5D,CAAC;QACH,CAAC;aAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YAC/B,EAA0B,CAAC,QAAQ,GAAG,cAAwB,CAAC;YAC/D,EAA0B,CAAC,MAAM,GAAG,KAAK,CAAC;QAC7C,CAAC;aAAM,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;YACjC,EAA4B,CAAC,MAAM,GAAG,KAAK,CAAC;YAC5C,EAA4B,CAAC,gBAAgB,GAAG,cAAc;gBAC7D,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,SAAS,CAAC;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG,2CAA2C,CACtE,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CACb,uBAAuB,GAAG,6DAA6D,CACxF,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC;QACrC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;CACF"}

package/dist/commands/validate.d.ts

@@ -13,7 +13,7 @@
 import { Validator as JSONValidator } from 'jsonschema';
 import { Validator as DirectoryValidator } from 'directory-schema-validator';
 import type { Card, ResourceTypes } from '../interfaces/project-interfaces.js';
-import { Project } from '../containers/project.js';
+import type { Project } from '../containers/project.js';
 import { type ResourceName } from '../utils/resource-utils.js';
 export interface LengthProvider {
     length: number;
@@ -37,12 +37,14 @@ export declare class Validate {
     static cardMetadataFile: string;
     static dotSchemaSchemaId: string;
     static parameterSchemaFile: string;
+    /**
+     * Creates an instance of Validate command.
+     */
     constructor();
     private length;
     private addChildSchemas;
     private checkResourceName;
     private fullPath;
-    private getAndCacheResource;
     private parseValidatorMessage;
     private readAndValidateContentFiles;
     private removeDuplicateEntries;
@@ -53,7 +55,7 @@ export declare class Validate {
     private validType;
     /**
      * Validates that new identifier of a resource is according to naming convention.
-     * @param identifier: resource identifier
+     * @param identifier Resource identifier
      * returns true if identifier is valid, and false otherwise.
      */
     static isValidIdentifierName(identifier: string): boolean;
@@ -100,9 +102,12 @@ export declare class Validate {
      * @param resourceType Type of resource
      * @param name Name of resource
      * @param prefixes currently used project prefixes
+     * @throws when resource is not from given prefixes,
+     *         or when actual resource does not match the type,
+     *         or when identifier name is not valid
      * @returns resource name as valid resource name; throws in error cases.
      */
-    validResourceName(resourceType: ResourceTypes, name: string, prefixes: string[]): Promise<string>;
+    validResourceName(resourceType: ResourceTypes, name: string, prefixes: string[]): string;
     /**
      * Validates that 'prefix' is valid project prefix.
      * @param prefix project prefix
@@ -113,26 +118,29 @@ export declare class Validate {
      * Validates that card's custom fields are according to schema and have correct data in them.
      * @param project currently used Project
      * @param card specific card
-     * @returns string containing all validation errors
+     * @throws when card does not have metadata
+     * @returns validation errors, if any.
      */
-    validateCustomFields(project: Project, card: Card): Promise<string>;
+    validateCustomFields(project: Project, card: Card, prefixes: string[]): Promise<string>;
     /**
      * Validates the labels of a card
      * @param card card to validate. Card must have metadata.
+     * @returns validation errors, if any.
      */
-    validateCardLabels(card: Card): Promise<string>;
+    validateCardLabels(card: Card): string;
     /**
      * Checks if card's current workflow state matches workflow that card's card type is using.
      * Template cards are expected to have empty workflow state.
      * @param project Project object.
      * @param card Card object to validate
-     * @returns string containing all validation errors
+     * @returns validation errors, if any.
      */
     validateWorkflowState(project: Project, card: Card): Promise<string>;
     /**
      * Validates a single resource.
-     * @param resource Resource to validate
-     * @returns string containing all validation errors
+     * @param resourceName Resource to validate
+     * @param project Project instance to use.
+     * @returns validation errors, if any.
      */
     validateResource(resourceName: ResourceName, project: Project): Promise<string>;
     /**

package/dist/commands/validate.js

@@ -18,15 +18,15 @@ import { Validator as DirectoryValidator } from 'directory-schema-validator';
 import { parentSchema, schemas } from '@cyberismo/assets';
 import { errorFunction } from '../utils/error-utils.js';
 import { isTemplateCard } from '../utils/card-utils.js';
+import { isPredefinedField } from '../utils/constants.js';
 import { pathExists } from '../utils/file-utils.js';
-import { Project } from '../containers/project.js';
 import { readJsonFile } from '../utils/json.js';
 import { resourceName } from '../utils/resource-utils.js';
 const invalidNames = new RegExp('[<>:"/\\|?*\x00-\x1F]|^(?:aux|con|clock$|nul|prn|com[1-9]|lpt[1-9])$');
 const SHORT_TEXT_MAX_LENGTH = 80;
 import * as EmailValidator from 'email-validator';
 import { evaluateMacros } from '../macros/index.js';
-const baseDir = import.meta.dirname;
+const baseDir = import.meta.dirname ?? new URL('.', import.meta.url).pathname;
 const subFoldersToValidate = ['.cards', 'cardRoot'];
 /**
  * Validates content.
@@ -47,6 +47,9 @@ export class Validate {
     static cardMetadataFile = 'index.json';
     static dotSchemaSchemaId = '/dotSchema';
     static parameterSchemaFile = 'parameterSchema.json';
+    /**
+     * Creates an instance of Validate command.
+     */
     constructor() {
         Validate.baseFolder = pathExists(join(process.cwd(), '../../schema', 'cardTreeDirectorySchema.json'))
             ? join(process.cwd(), '../../schema')
@@ -102,18 +105,7 @@ export class Validate {
     fullPath(file) {
         return join(file.parentPath, file.name);
     }
-    // Puts resource to a local cache if found and returns the resource.
-    // If value is already cached, returns from cache.
-    async getAndCacheResource(project, cachedValues, valueName) {
-        return (cachedValues.get(valueName) ||
-            project.resource(valueName).then((resource) => {
-                if (!resource) {
-                    return undefined;
-                }
-                cachedValues.set(valueName, resource);
-                return resource;
-            }));
-    }
+    // Parses validator messages
     parseValidatorMessage(errorObject) {
         let parsedErrorMessage = '';
         // todo: get schema name here?
@@ -155,7 +147,7 @@ export class Validate {
     async readAndValidateContentFiles(project, path) {
         const message = [];
         try {
-            const prefixes = await project.projectPrefixes();
+            const prefixes = project.projectPrefixes();
             const files = await readdir(path, {
                 withFileTypes: true,
             });
@@ -266,7 +258,13 @@ export class Validate {
         const errors = [];
         if (cardType && fieldArray) {
             const validationPromises = fieldArray.map(async (field) => {
-                const fieldType = await this.getAndCacheResource(project, this.validatedFieldTypes, field);
+                let fieldType;
+                try {
+                    fieldType = project.resources.byType(field, 'fieldTypes').show();
+                }
+                catch {
+                    fieldType = undefined;
+                }
                 if (!fieldType) {
                     return `Card type '${cardType.name}' has invalid reference to unknown ${nameOfArray} '${field}'`;
                 }
@@ -329,7 +327,7 @@ export class Validate {
     }
     /**
      * Validates that new identifier of a resource is according to naming convention.
-     * @param identifier: resource identifier
+     * @param identifier Resource identifier
      * returns true if identifier is valid, and false otherwise.
      */
     static isValidIdentifierName(identifier) {
@@ -391,15 +389,17 @@ export class Validate {
             else {
                 const errorMsg = [];
                 const project = projectFn();
+                await project.populateCaches();
                 // Then, validate that each 'contentSchema' children as well.
                 const result = await this.readAndValidateContentFiles(project, projectPath);
                 if (result.length > 0) {
                     errorMsg.push(...result);
                 }
                 // Finally, validate that each card is correct
-                const cards = await project.cards();
-                cards.push(...(await project.allTemplateCards()));
+                const cards = project.cards();
+                cards.push(...project.allTemplateCards());
                 const cardIds = new Map();
+                const allPrefixes = await project.projectPrefixes();
                 for (const card of cards) {
                     if (cardIds.has(card.key)) {
                         cardIds.set(card.key, (cardIds.get(card.key) || 0) + 1);
@@ -408,7 +408,6 @@ export class Validate {
                         cardIds.set(card.key, 1);
                     }
                     if (card.metadata) {
-                        // validate card's workflow
                         if (!isTemplateCard(card)) {
                             const validWorkflow = await this.validateWorkflowState(project, card);
                             if (validWorkflow.length !== 0) {
@@ -416,7 +415,7 @@ export class Validate {
                             }
                         }
                     }
-                    const validCustomFields = await this.validateCustomFields(project, card);
+                    const validCustomFields = await this.validateCustomFields(project, card, allPrefixes);
                     if (validCustomFields.length !== 0) {
                         errorMsg.push(validCustomFields);
                     }
@@ -429,7 +428,7 @@ export class Validate {
                         await evaluateMacros(card.content, {
                             context: 'localApp',
                             mode: 'validate',
-                            project,
+                            project: project,
                             cardKey: card.key,
                         });
                     }
@@ -492,17 +491,16 @@ export class Validate {
      * @param resourceType Type of resource
      * @param name Name of resource
      * @param prefixes currently used project prefixes
+     * @throws when resource is not from given prefixes,
+     *         or when actual resource does not match the type,
+     *         or when identifier name is not valid
      * @returns resource name as valid resource name; throws in error cases.
      */
-    async validResourceName(resourceType, name, prefixes) {
+    validResourceName(resourceType, name, prefixes) {
         const resource = resourceName(name);
         resource.type = resource.type ? resource.type : resourceType;
-        // a bit shaky way to ensure that prefix is set; first of the project prefixes should be the actual project prefix.
         if (resource.prefix === '') {
-            resource.prefix = prefixes.length > 0 ? prefixes.at(0) || '' : '';
-            if (resource.prefix === '') {
-                throw new Error(`Project prefix cannot be empty string`);
-            }
+            throw new Error(`Project prefix cannot be empty string`);
         }
         if (!prefixes.includes(resource.prefix)) {
             throw new Error(`Resource name can only refer to project that it is part of. Prefix '${resource.prefix}' is not included in '[${prefixes.join(',')}]'`);
@@ -530,14 +528,23 @@ export class Validate {
      * Validates that card's custom fields are according to schema and have correct data in them.
      * @param project currently used Project
      * @param card specific card
-     * @returns string containing all validation errors
+     * @throws when card does not have metadata
+     * @returns validation errors, if any.
      */
-    async validateCustomFields(project, card) {
+    async validateCustomFields(project, card, prefixes) {
         const validationErrors = [];
         if (!card.metadata) {
             throw new Error(`Card '${card.key}' has no metadata. Card object needs to be instantiated with '{metadata: true}'`);
         }
-        const cardType = await this.getAndCacheResource(project, this.validatedCardTypes, card.metadata?.cardType);
+        let cardType;
+        try {
+            cardType = project.resources
+                .byType(card.metadata?.cardType, 'cardTypes')
+                .show();
+        }
+        catch {
+            cardType = undefined;
+        }
         if (!cardType) {
             validationErrors.push(`Card '${card.key}' has invalid card type '${card.metadata?.cardType}'`);
             return validationErrors.join('\n');
@@ -548,9 +555,18 @@ export class Validate {
         fieldErrors = await this.validateArrayOfFields(project, cardType, cardType.alwaysVisibleFields, 'always visible fields');
         validationErrors.push(...fieldErrors);
         for (const field of cardType.customFields) {
-            const found = await project.resourceExists('fieldTypes', field.name);
-            if (!found) {
-                validationErrors.push(`Custom field '${field.name}' from card type '${cardType.name}' not found from project`);
+            let fieldType;
+            try {
+                fieldType = await project.resources
+                    .byType(field.name, 'fieldTypes')
+                    .show();
+            }
+            catch {
+                fieldType = undefined;
+            }
+            if (!fieldType) {
+                validationErrors.push(`In card '${card.key}' field '${field.name}' is missing from project\n`);
+                continue;
             }
             if (field.isCalculated) {
                 if (card.metadata[field.name] !== undefined) {
@@ -564,11 +580,6 @@ export class Validate {
                     continue;
                 }
             }
-            const fieldType = await this.getAndCacheResource(project, this.validatedFieldTypes, field.name);
-            if (!fieldType) {
-                validationErrors.push(`In card '${card.key}' field '${field.name}' is missing from project\n`);
-                continue;
-            }
             if (!this.validType(card.metadata[field.name], fieldType)) {
                 const typeOfValue = typeof card.metadata[field.name];
                 let fieldValue = card.metadata[field.name];
@@ -589,13 +600,40 @@ export class Validate {
                 validationErrors.push(`In card '${card.key}' field '${field.name}' is defined as '${fieldType.dataType}', but it is '${typeOfValue}' with value of ${fieldValue}\n`);
             }
         }
+        // Validate that all metadata keys are either predefined fields or valid field type names
+        for (const key of Object.keys(card.metadata)) {
+            if (isPredefinedField(key) ||
+                key === 'labels' ||
+                key === 'links') {
+                continue;
+            }
+            try {
+                this.validResourceName('fieldTypes', key, prefixes);
+            }
+            catch {
+                validationErrors.push(`Card '${card.key}' has invalid metadata key '${key}'`);
+                continue;
+            }
+            // Check that the card's fieldType exists in the project
+            let fieldType;
+            try {
+                fieldType = await project.resources.byType(key, 'fieldTypes').show();
+            }
+            catch {
+                fieldType = undefined;
+            }
+            if (!fieldType) {
+                validationErrors.push(`Card '${card.key}' has field '${key}' that does not exist in the project`);
+            }
+        }
         return validationErrors.join('\n');
     }
     /**
      * Validates the labels of a card
      * @param card card to validate. Card must have metadata.
+     * @returns validation errors, if any.
      */
-    async validateCardLabels(card) {
+    validateCardLabels(card) {
         const validationErrors = [];
         if (!card.metadata) {
             validationErrors.push(`Card '${card.key}' has no metadata. Card object needs to be instantiated with '{metadata: true}'`);
@@ -621,15 +659,22 @@ export class Validate {
      * Template cards are expected to have empty workflow state.
      * @param project Project object.
      * @param card Card object to validate
-     * @returns string containing all validation errors
+     * @returns validation errors, if any.
      */
     async validateWorkflowState(project, card) {
         const validationErrors = [];
         if (!card.metadata) {
             validationErrors.push(`Card '${card.key}' has no metadata. Card object needs to be instantiated with '{metadata: true}'`);
         }
-        // Use caches for cardTypes and workflows, to avoid re-reading the same JSON files multiple times.
-        const cardType = await this.getAndCacheResource(project, this.validatedCardTypes, card.metadata?.cardType || '');
+        let cardType;
+        try {
+            cardType = card.metadata?.cardType
+                ? project.resources.byType(card.metadata?.cardType, 'cardTypes').show()
+                : undefined;
+        }
+        catch {
+            cardType = undefined;
+        }
         if (!cardType) {
             validationErrors.push(`Card '${card.key}' has invalid card type '${card.metadata?.cardType}'`);
             return validationErrors.join('\n');
@@ -638,7 +683,15 @@ export class Validate {
             validationErrors.push(`Card type '${card.metadata?.cardType}' does not have 'workflow'`);
             return validationErrors.join('\n');
         }
-        const workflow = await this.getAndCacheResource(project, this.validatedWorkflows, cardType.workflow);
+        let workflow;
+        try {
+            workflow = project.resources
+                .byType(cardType.workflow, 'workflows')
+                .show();
+        }
+        catch {
+            workflow = undefined;
+        }
         if (!workflow) {
             validationErrors.push(`Workflow of '${cardType.workflow}' card type '${card.metadata?.cardType}' does not exist in the project`);
             return validationErrors.join('\n');
@@ -659,12 +712,13 @@ export class Validate {
     }
     /**
      * Validates a single resource.
-     * @param resource Resource to validate
-     * @returns string containing all validation errors
+     * @param resourceName Resource to validate
+     * @param project Project instance to use.
+     * @returns validation errors, if any.
      */
     async validateResource(resourceName, project) {
         try {
-            const resource = Project.resourceObject(project, resourceName);
+            const resource = project.resources.byType(resourceName);
             await resource.validate();
             return '';
         }