@cyberismo/data-handler 0.0.15 → 0.0.16

package/src/resources/workflow-resource.ts

@@ -13,29 +13,24 @@
 */
 
 import type {
-  CardType,
   UpdateKey,
   Workflow,
   WorkflowState,
   WorkflowTransition,
 } from '../interfaces/resource-interfaces.js';
-import { CardTypeResource } from './card-type-resource.js';
+import { DefaultContent } from './create-defaults.js';
+import { FileResource } from './file-resource.js';
+import { resourceNameToString } from '../utils/resource-utils.js';
+import { sortCards } from '../utils/card-utils.js';
+
+import type { Card } from '../interfaces/project-interfaces.js';
 import type {
-  Card,
   ChangeOperation,
   Operation,
-  Project,
   RemoveOperation,
-  ResourceName,
-} from './file-resource.js';
-import {
-  DefaultContent,
-  FileResource,
-  resourceNameToString,
-  sortCards,
-} from './folder-resource.js';
-import { ResourcesFrom } from '../containers/project.js';
-import { resourceName } from './file-resource.js';
+} from './resource-object.js';
+import type { Project } from '../containers/project.js';
+import type { ResourceName } from '../utils/resource-utils.js';
 
 /**
  * Workflow resource class.
@@ -50,19 +45,11 @@ export class WorkflowResource extends FileResource<Workflow> {
 
   // Collect all cards that use this workflow.
   private async collectCardsUsingWorkflow(): Promise<Card[]> {
-    const cardTypes = await this.project.cardTypes(ResourcesFrom.localOnly);
+    const cardTypes = this.project.resources.cardTypes();
     const promises: Promise<Card[]>[] = [];
     for (const cardType of cardTypes) {
-      const object = new CardTypeResource(
-        this.project,
-        resourceName(cardType.name),
-      );
-      if (
-        object.data &&
-        object.data.workflow === resourceNameToString(this.resourceName)
-      ) {
-        // fetch all cards with card type
-        promises.push(this.collectCards(cardType.name));
+      if (cardType.data?.workflow === resourceNameToString(this.resourceName)) {
+        promises.push(this.collectCards(cardType.data.name));
       }
     }
     return (await Promise.all(promises)).flat();
@@ -199,25 +186,19 @@ export class WorkflowResource extends FileResource<Workflow> {
 
   // Update dependant card types.
   private async updateCardTypes(oldName: string) {
-    const cardTypes = await this.project.cardTypes(ResourcesFrom.localOnly);
+    const cardTypes = this.project.resources.cardTypes();
     const op = {
       name: 'change',
       target: oldName,
       to: this.content.name,
     } as ChangeOperation<string>;
     for (const cardType of cardTypes) {
-      const object = new CardTypeResource(
-        this.project,
-        resourceName(cardType.name),
+      await cardType.update(
+        {
+          key: 'workflow',
+        },
+        op,
       );
-      if (object.data && object.data.workflow === oldName) {
-        await object.update(
-          {
-            key: 'workflow',
-          },
-          op,
-        );
-      }
     }
   }
 
@@ -366,13 +347,13 @@ export class WorkflowResource extends FileResource<Workflow> {
   public async usage(cards?: Card[]): Promise<string[]> {
     const resourceName = resourceNameToString(this.resourceName);
     const allCards = cards ?? super.cards();
-    const cardTypes = await this.project.cardTypes(ResourcesFrom.all);
-    const cardTypeReferences = await Promise.all(
-      cardTypes.map(async (cardType) => {
-        const metadata = await this.project.resource<CardType>(cardType.name);
-        return metadata?.workflow === resourceName ? cardType.name : null;
-      }),
-    );
+    const cardTypes = this.project.resources.cardTypes();
+    const cardTypeReferences = [];
+    for (const cardType of cardTypes) {
+      if (cardType.data?.workflow === resourceName) {
+        cardTypeReferences.push(cardType.data.name);
+      }
+    }
 
     const [relevantCards, calculations] = await Promise.all([
       super.usage(allCards),

package/src/utils/card-utils.ts

@@ -18,7 +18,7 @@ import type {
   Card,
   CardWithChildrenCards,
 } from '../interfaces/project-interfaces.js';
-import type { Project } from '../resources/folder-resource.js';
+import type { Project } from '../containers/project.js';
 
 /**
  * Builds card hierarchy from flat card list with nested card objects.
@@ -165,7 +165,7 @@ export const findParentPath = (cardPath: string): string | null => {
 /**
  * Flattens card tree so that children are shown on same level regardless of nesting level.
  * @param array Card tree to flatten
- * @parent project Project to use
+ * @param project Project to use
  * @returns Flattened card tree.
  */
 export const flattenCardArray = (array: Card[], project: Project) => {

package/src/utils/clingo-fact-builder.ts

@@ -1,17 +1,19 @@
-import { INT32_MAX } from './constants.js';
-import { getChildLogger } from './log-utils.js';
-
 /**
-    Cyberismo
-    Copyright © Cyberismo Ltd and contributors 2024
-
-    This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License version 3 as published by the Free Software Foundation.
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2024
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. 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/>.
+*/
 
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
+import { INT32_MAX } from './constants.js';
+import { getChildLogger } from './log-utils.js';
 
-    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/>.
-*/
 export type AllowedClingoType = string | number | boolean;
 
 export type NestedBuilder = (builder: ClingoFactBuilder) => ClingoFactBuilder;
@@ -26,6 +28,8 @@ export type ClingoArgument = ClingoArgumentInternal | NestedBuilder;
 /**
  * This function takes care of encoding chars, which might produce issues in clingo
  * This should be done for user provided values
+ * @param value Clingo value to encode.
+ * @returns Encoded clingo value.
  */
 export function encodeClingoValue(value: string) {
   return value.replace(/[\n\\"]/g, (char) => {
@@ -36,6 +40,9 @@ export function encodeClingoValue(value: string) {
   });
 }
 
+/**
+ * Clingo fact builder.
+ */
 export class ClingoFactBuilder {
   protected predicate: string;
   private end: string;
@@ -46,6 +53,11 @@ export class ClingoFactBuilder {
     });
   }
 
+  /**
+   * Constructs an instance of ClingoFactBuilder.
+   * @param predicate Predicate
+   * @param end End character; by default a dot ('.')
+   */
   constructor(predicate: string, end: string = '.') {
     this.predicate = predicate;
     this.end = end;
@@ -71,8 +83,8 @@ export class ClingoFactBuilder {
 
   /**
    * Helper for adding multiple arguments, because it's common
-   * @param args
-   * @returns this for chaining
+   * @param args Arguments array
+   * @returns 'this' for chaining
    */
   addArguments(...args: (ClingoArgument | null)[]): ClingoFactBuilder {
     args.forEach((arg) => this.addArgument(arg));
@@ -82,7 +94,7 @@ export class ClingoFactBuilder {
   /**
    * Adds a literal argument, which means that it will not have quotes
    * @param literal The literal argument to add
-   * @returns this for chaining
+   * @returns 'this' for chaining
    */
   addLiteralArgument(literal: string): ClingoFactBuilder {
     this.arguments.push(new LiteralBuilder(literal));
@@ -91,8 +103,8 @@ export class ClingoFactBuilder {
 
   /**
    * Helper for adding multiple literal arguments, because it's common
-   * @param literal
-   * @returns this for chaining
+   * @param literals Array of literals
+   * @returns 'this' for chaining
    */
   addLiteralArguments(...literals: string[]): ClingoFactBuilder {
     literals.forEach((literal) => this.addLiteralArgument(literal));

package/src/utils/clingo-facts.ts

@@ -243,10 +243,9 @@ export const createCardFacts = async (card: Card, project: Project) => {
 
         if (!isPredefinedField(field)) {
           // field is a custom field, find it
-          const fieldType = await project.resource<FieldType>(field);
-          if (!fieldType) {
-            continue;
-          }
+          const fieldType = project.resources
+            .byType(field, 'fieldTypes')
+            .show();
 
           // if it's a list, let's generate multiple values
           if (fieldType.dataType === 'list') {

package/src/utils/resource-utils.ts

@@ -88,6 +88,7 @@ export function resourceName(
  * Converts resource name to path.
  * @param project Project
  * @param resourceName Name of the resource (e.g. <prefix>/<type>/<name>)
+ * @param extension Extension of resource. By default '.json'.
  * @returns path to resource metadata file
  */
 export function resourceNameToPath(
@@ -204,7 +205,7 @@ export function resourceNameToString(resourceName: ResourceName): string {
   ) {
     throw new Error(`Not a valid resource name. Prefix is missing.`);
   }
-  return resourceName.prefix && resourceName.type && resourceName.prefix
+  return resourceName.prefix && resourceName.type && resourceName.identifier
     ? `${resourceName.prefix}/${resourceName.type}/${resourceName.identifier}`
     : `${resourceName.identifier}`;
 }

package/dist/containers/project/resource-collector.d.ts

@@ -1,110 +0,0 @@
-/**
-  Cyberismo
-  Copyright © Cyberismo Ltd and contributors 2024
-
-  This program is free software: you can redistribute it and/or modify it under
-  the terms of the GNU Affero General Public License version 3 as published by
-  the Free Software Foundation. This program is distributed in the hope that it
-  will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the GNU Affero General Public License for more details.
-  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 type { Project } from '../project.js';
-import type { Resource, ResourceFolderType } from '../../interfaces/project-interfaces.js';
-/**
- * Defines where resources are collected from.
- * all - everywhere
- * importOnly - only from imported modules
- * localOnly - only from the project itself; excluding imported modules
- */
-export declare enum ResourcesFrom {
-    all = "all",
-    importedOnly = "imported",
-    localOnly = "local"
-}
-declare class ResourceCollection {
-    calculations: Resource[];
-    cardTypes: Resource[];
-    fieldTypes: Resource[];
-    graphModels: Resource[];
-    graphViews: Resource[];
-    linkTypes: Resource[];
-    reports: Resource[];
-    templates: Resource[];
-    workflows: Resource[];
-    /**
-     * Returns resource array of a give type.
-     * @param type Resource array type to return.
-     * @param moduleName Name of a module. If given, returns just resources from that module.
-     * @returns resource array of a give type.
-     */
-    resourceArray(type: ResourceFolderType, moduleName?: string): Resource[];
-}
-/**
- * This class handles local and modules resources.
- */
-export declare class ResourceCollector {
-    private project;
-    private local;
-    private modules;
-    private modulesCollected;
-    private paths;
-    constructor(project: Project);
-    private addResources;
-    private addModuleResources;
-    private addResourcesFromModules;
-    private joinResources;
-    private localResources;
-    private resourcesSync;
-    /**
-     * Collects all local resources.
-     */
-    collectLocalResources(): void;
-    /**
-     * Collect specific resource from modules.
-     * @param type Type of resource (e.g. 'templates').
-     * @param moduleName Name of the module to collect resources from
-     * @returns array of collected items.
-     */
-    collectResourcesFromModules(type: ResourceFolderType, moduleName?: string): Promise<string[]>;
-    /**
-     * Add a given 'resource' to the local resource arrays.
-     * @param resource Resource to add.
-     */
-    add(resource: Resource): void;
-    /**
-     * Re-collects local resources.
-     */
-    changed(): void;
-    /**
-     * Re-collects imported module resources.
-     */
-    moduleImported(): void;
-    /**
-     * Getter. Provide access for owner to browse module resources.
-     */
-    get moduleResources(): ResourceCollection;
-    /**
-     * Removes a resource from Project.
-     * @param resource Resource to remove.
-     * @returns the modified array.
-     */
-    remove(resource: Resource): Resource[];
-    /**
-     * Checks if resource of 'type' with 'name' exists.
-     * @param type Type of resource (e.g. 'templates').
-     * @param name Name of the resource.
-     * @returns true, if resource exits, false otherwise.
-     */
-    resourceExists(type: ResourceFolderType, name: string): Promise<boolean>;
-    /**
-     * Returns resources of 'type'. Returned resources are either local, or from modules or all of them.
-     * @param type Type of resource (e.g. 'templates').
-     * @param from Defines where resources are collected from.
-     * @returns Array of resources.
-     */
-    resources(type: ResourceFolderType, from?: ResourcesFrom): Promise<Resource[]>;
-}
-export {};