@data-fair/lib-common-types 1.11.0 → 1.12.0

package/catalog/.type/index.d.ts

@@ -65,19 +65,68 @@ export type Resource = {
    * The unique identifier of the resource, independent of the folder it is in
    */
   id: string;
+  /**
+   * The title of the resource
+   */
   title: string;
-  type: "resource";
   description?: string;
+  /**
+   * The path to the downloaded resource file.
+   */
+  filePath: string;
+  /**
+   * The format of the resource, e.g. csv, json, xml, etc. It is displayed in the UI of catalogs.
+   */
   format: string;
-  url: string;
-  fileName?: string;
-  mimeType?: string;
-  size?: number;
-  keywords?: string[];
+  /**
+   * The frequency of the resource updates, if available. It can be one of the following values: triennial, biennial, annual, semiannual, threeTimesAYear, quarterly, bimonthly, monthly, semimonthly, biweekly, threeTimesAMonth, weekly, semiweekly, threeTimesAWeek, daily, continuous or irregular.
+   */
+  frequency?:
+    | ""
+    | "triennial"
+    | "biennial"
+    | "annual"
+    | "semiannual"
+    | "threeTimesAYear"
+    | "quarterly"
+    | "bimonthly"
+    | "monthly"
+    | "semimonthly"
+    | "biweekly"
+    | "threeTimesAMonth"
+    | "weekly"
+    | "semiweekly"
+    | "threeTimesAWeek"
+    | "daily"
+    | "continuous"
+    | "irregular";
+  /**
+   * The URL of the image representing the resource, if available
+   */
   image?: string;
   license?: string;
-  frequency?: string;
-  private?: boolean;
+  /**
+   * The list of keywords associated with the resource, if available
+   */
+  keywords?: string[];
+  /**
+   * The Mime type of the resource, if available
+   */
+  mimeType?: string;
+  /**
+   * The URL where the original data can be found
+   */
+  origin?: string;
+  /**
+   * The schema of the resource, if available
+   */
+  schema?: {
+    [k: string]: unknown;
+  };
+  /**
+   * The size of the resource in bytes, if available. It is displayed in the UI of catalogs.
+   */
+  size?: number;
 }
 /**
  * A small object that contains the information needed to publish or update a dataset or a resource

package/catalog/index.d.ts

@@ -50,17 +50,17 @@ type WithImport<TCatalogConfig, TCapabilities extends Capability[]> = {
         /** The total number of items in the current folder */
         count: number;
         /** The list of folders and resources in the current folder, filtered with the search and pagination parameters */
-        results: (Folder | Resource)[];
+        results: (Folder | Pick<Resource, 'id' | 'title' | 'description' | 'format' | 'mimeType' | 'origin' | 'size'> & {
+            type: 'resource';
+        })[];
         /** The path to the current folder, including the current folder itself, used to navigate back */
         path: Folder[];
     }>;
-    /** Get informations about a specific resource. */
-    getResource: (context: GetResourceContext<TCatalogConfig>) => Promise<Resource | undefined>;
     /**
-     * Download the resource to a temporary file from a context
-     * @returns The path to the downloaded resource file, or undefined if the download failed
+     * Download the resource to a temporary file and return the metadata of the resource.
+     * @returns A promise that resolves to the metadata of the resource, including the path to the downloaded file.
      */
-    downloadResource: (context: DownloadResourceContext<TCatalogConfig>) => Promise<string | undefined>;
+    getResource: (context: GetResourceContext<TCatalogConfig>) => Promise<Resource | undefined>;
 } & (Includes<TCapabilities, 'additionalFilters'> extends true ? {
     listFiltersSchema: Record<string, any>;
 } : {}) & (Includes<TCapabilities, 'importConfig'> extends true ? {
@@ -133,22 +133,7 @@ type PaginationParams = {
     size?: number;
 };
 /**
- * Context for getting a resource.
- * @template TCatalogConfig - The type of the catalog configuration.
- * @property catalogConfig - The catalog configuration.
- * @property secrets - The deciphered secrets of the catalog.
- * @property resourceId - The ID of the remote resource to get.
- */
-export type GetResourceContext<TCatalogConfig> = {
-    /** The catalog configuration */
-    catalogConfig: TCatalogConfig;
-    /** The deciphered secrets of the catalog */
-    secrets: Record<string, string>;
-    /** The ID of the remote resource to get */
-    resourceId: string;
-};
-/**
- * Context for downloading a resource.
+ * Context for get and downloading a resource.
  * @template TCatalogConfig - The type of the catalog configuration.
  * @property catalogConfig - The catalog configuration.
  * @property secrets - The deciphered secrets of the catalog.
@@ -156,7 +141,7 @@ export type GetResourceContext<TCatalogConfig> = {
  * @property resourceId - The ID of the remote resource to download.
  * @property tmpDir - The path to the working directory where the resource will be downloaded.
  */
-export type DownloadResourceContext<TCatalogConfig> = {
+export type GetResourceContext<TCatalogConfig> = {
     /** The catalog configuration */
     catalogConfig: TCatalogConfig;
     /** The deciphered secrets of the catalog */

package/catalog/schema.d.ts

@@ -61,45 +61,54 @@ declare const _default: {
                 };
                 title: {
                     type: string;
-                };
-                type: {
-                    const: string;
+                    description: string;
                 };
                 description: {
                     type: string;
                 };
-                format: {
+                filePath: {
                     type: string;
+                    description: string;
                 };
-                url: {
+                format: {
                     type: string;
+                    description: string;
                 };
-                fileName: {
+                frequency: {
                     type: string;
+                    description: string;
+                    enum: string[];
                 };
-                mimeType: {
+                image: {
                     type: string;
+                    description: string;
                 };
-                size: {
+                license: {
                     type: string;
                 };
                 keywords: {
                     type: string;
+                    description: string;
                     items: {
                         type: string;
                     };
                 };
-                image: {
+                mimeType: {
                     type: string;
+                    description: string;
                 };
-                license: {
+                origin: {
                     type: string;
+                    description: string;
                 };
-                frequency: {
+                schema: {
                     type: string;
+                    additionalProperties: boolean;
+                    description: string;
                 };
-                private: {
+                size: {
                     type: string;
+                    description: string;
                 };
             };
         };

package/catalog/schema.js

@@ -67,7 +67,7 @@ export default {
     resource: {
       type: 'object',
       description: 'The normalized resource to import from a remote catalog to Data Fair',
-      required: ['id', 'title', 'type', 'format', 'url'],
+      required: ['id', 'title', 'filePath', 'format'],
       additionalProperties: false,
       properties: {
         id: {
@@ -75,46 +75,56 @@ export default {
           description: 'The unique identifier of the resource, independent of the folder it is in'
         },
         title: {
-          type: 'string'
-        },
-        type: {
-          const: 'resource',
+          type: 'string',
+          description: 'The title of the resource'
         },
         description: {
           type: 'string',
         },
+        filePath: {
+          type: 'string',
+          description: 'The path to the downloaded resource file.',
+        },
         format: {
-          type: 'string'
+          type: 'string',
+          description: 'The format of the resource, e.g. csv, json, xml, etc. It is displayed in the UI of catalogs.',
         },
-        url: {
-          type: 'string'
+        // https://www.w3.org/TR/vocab-dcat-2/#Property:dataset_frequency and https://www.dublincore.org/specifications/dublin-core/collection-description/frequency/
+        frequency: {
+          type: 'string',
+          description: 'The frequency of the resource updates, if available. It can be one of the following values: triennial, biennial, annual, semiannual, threeTimesAYear, quarterly, bimonthly, monthly, semimonthly, biweekly, threeTimesAMonth, weekly, semiweekly, threeTimesAWeek, daily, continuous or irregular.',
+          enum: ['', 'triennial', 'biennial', 'annual', 'semiannual', 'threeTimesAYear', 'quarterly', 'bimonthly', 'monthly', 'semimonthly', 'biweekly', 'threeTimesAMonth', 'weekly', 'semiweekly', 'threeTimesAWeek', 'daily', 'continuous', 'irregular']
         },
-        fileName: {
-          type: 'string'
+        image: {
+          type: 'string',
+          description: 'The URL of the image representing the resource, if available'
         },
-        mimeType: {
+        license: {
           type: 'string'
         },
-        size: {
-          type: 'number'
-        },
         keywords: {
           type: 'array',
+          description: 'The list of keywords associated with the resource, if available',
           items: {
             type: 'string'
           }
         },
-        image: {
-          type: 'string'
+        mimeType: {
+          type: 'string',
+          description: 'The Mime type of the resource, if available'
         },
-        license: {
-          type: 'string'
+        origin: {
+          type: 'string',
+          description: 'The URL where the original data can be found'
         },
-        frequency: {
-          type: 'string'
+        schema: {
+          type: 'object',
+          additionalProperties: true,
+          description: 'The schema of the resource, if available'
         },
-        private: {
-          type: 'boolean'
+        size: {
+          type: 'number',
+          description: 'The size of the resource in bytes, if available. It is displayed in the UI of catalogs.'
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-common-types",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "description": "Shared schemas and built type definitions in the data-fair stack.",
   "main": "index.js",
   "scripts": {