@static-suite/static-suite-data-server 0.0.10 → 0.0.11

package/README.md

@@ -358,6 +358,7 @@ Received parameters:
   - `toUniqueId`: a unique id representing the date until which those changes are obtained.
   - `updated`: a list of updated files (both newly added and changed files).
   - `deleted`: a list of deleted files.
+  - `all`: a list of all updated and deleted files, sorted by its unique id.
 
 #### `onStoreItemBeforeUpdate({ store, logger, dependencyTagger, relativeFilepath, storeItem }): void`
 
@@ -406,11 +407,11 @@ Received parameters:
 - `logger`: the logger service width several functions to log messages: `error()`, `warn()`, `info()`, `error()`
 - `dependencyTagger`: the dependency tagger service. See [Dependency Tags](#dependency-tags) section.
 - `changedFiles`: a group of changed files in Static Suite's data dir, an object with the following keys:
-
   - `fromUniqueId`: a unique id representing the date from which those changes are obtained.
   - `toUniqueId`: a unique id representing the date until which those changes are obtained.
   - `updated`: a list of updated files (both newly added and changed files).
   - `deleted`: a list of deleted files.
+  - `all`: a list of all updated and deleted files, sorted by its unique id.
 
 #### `onDumpCreate(options: OnDumpHookOptions): Dump`
 

package/dist/http/README.md

@@ -358,6 +358,7 @@ Received parameters:
   - `toUniqueId`: a unique id representing the date until which those changes are obtained.
   - `updated`: a list of updated files (both newly added and changed files).
   - `deleted`: a list of deleted files.
+  - `all`: a list of all updated and deleted files, sorted by its unique id.
 
 #### `onStoreItemBeforeUpdate({ store, logger, dependencyTagger, relativeFilepath, storeItem }): void`
 
@@ -406,11 +407,11 @@ Received parameters:
 - `logger`: the logger service width several functions to log messages: `error()`, `warn()`, `info()`, `error()`
 - `dependencyTagger`: the dependency tagger service. See [Dependency Tags](#dependency-tags) section.
 - `changedFiles`: a group of changed files in Static Suite's data dir, an object with the following keys:
-
   - `fromUniqueId`: a unique id representing the date from which those changes are obtained.
   - `toUniqueId`: a unique id representing the date until which those changes are obtained.
   - `updated`: a list of updated files (both newly added and changed files).
   - `deleted`: a list of deleted files.
+  - `all`: a list of all updated and deleted files, sorted by its unique id.
 
 #### `onDumpCreate(options: OnDumpHookOptions): Dump`
 

package/dist/lib/store/dataDir/dataDirManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataDirManager.d.ts","sourceRoot":"","sources":["../../../../src/lib/store/dataDir/dataDirManager.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMjD,eAAO,MAAM,cAAc,EAAE,cAuH5B,CAAC"}
+{"version":3,"file":"dataDirManager.d.ts","sourceRoot":"","sources":["../../../../src/lib/store/dataDir/dataDirManager.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAMjD,eAAO,MAAM,cAAc,EAAE,cA0H5B,CAAC"}

package/dist/lib/store/dataDir/dataDirManager.js

@@ -56,6 +56,7 @@ exports.dataDirManager = {
     update: () => {
         const dataDirModificationUniqueId = exports.dataDirManager.getModificationUniqueId();
         let changedFiles = {
+            all: [],
             updated: [],
             deleted: [],
             fromUniqueId: store_1.store.currentUniqueId,
@@ -73,13 +74,15 @@ exports.dataDirManager = {
                 dependencyManager_1.dependencyManager.trackInvalidatedFilepaths();
                 changedFiles = workDir_1.workDirHelper.getChangedFilesBetween(storeLastUniqueId, dataDirModificationUniqueId);
                 hook_1.hookManager.invokeOnStoreChangeStart(changedFiles);
-                changedFiles.updated.forEach(file => {
-                    storeManager_1.storeManager.update(file);
-                    const fileContent = store_1.store.data.get(file);
-                    storeManager_1.storeManager.parseSingleFileIncludes(file, fileContent);
-                });
-                changedFiles.deleted.forEach(file => {
-                    storeManager_1.storeManager.remove(file);
+                changedFiles.all.forEach(changedData => {
+                    if (changedData.type === 'updated') {
+                        storeManager_1.storeManager.update(changedData.file);
+                        const fileContent = store_1.store.data.get(changedData.file);
+                        storeManager_1.storeManager.parseSingleFileIncludes(changedData.file, fileContent);
+                    }
+                    else {
+                        storeManager_1.storeManager.remove(changedData.file);
+                    }
                 });
                 // Clear all store subsets and queries, since they are stale.
                 // In fact, the subset cache should be cleared only when files

package/dist/lib/store/workDir/workDir.types.d.ts

@@ -1,3 +1,10 @@
+/**
+ * An item for all changed files in Static Suite's data dir.
+ */
+export type allChangesItem = {
+    file: string;
+    type: 'updated' | 'deleted';
+};
 /**
  * A group of changed files in Static Suite's data dir.
  */
@@ -18,6 +25,10 @@ export type ChangedFiles = {
      * A list of deleted files.
      */
     deleted: string[];
+    /**
+     * A list of all changed files, sorted by its timestamp.
+     */
+    all: allChangesItem[];
 };
 /**
  * Information from a Static Suite's log line.

package/dist/lib/store/workDir/workDir.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workDir.types.d.ts","sourceRoot":"","sources":["../../../../src/lib/store/workDir/workDir.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,SAAS,EAAE,OAAO,GAAG,QAAQ,CAAC;IAE9B;;OAEG;IACH,IAAI,EAAE;QACJ;;WAEG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QAEd;;WAEG;QACH,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH,CAAC"}
+{"version":3,"file":"workDir.types.d.ts","sourceRoot":"","sources":["../../../../src/lib/store/workDir/workDir.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,GAAG,EAAE,cAAc,EAAE,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,SAAS,EAAE,OAAO,GAAG,QAAQ,CAAC;IAE9B;;OAEG;IACH,IAAI,EAAE;QACJ;;WAEG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QAEd;;WAEG;QACH,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;CACH,CAAC"}

package/dist/lib/store/workDir/workDirHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workDirHelper.d.ts","sourceRoot":"","sources":["../../../../src/lib/store/workDir/workDirHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAe,MAAM,iBAAiB,CAAC;AAO5D;;GAEG;AACH,eAAO,MAAM,iBAAiB,qCAAqC,CAAC;AAEpE,eAAO,MAAM,aAAa;IACxB;;;;OAIG;mCAC0B,MAAM,GAAG,IAAI;IAsB1C;;;;;;;;;;;OAWG;2CAEa,MAAM,cACR,MAAM,KACjB,YAAY;CAkChB,CAAC"}
+{"version":3,"file":"workDirHelper.d.ts","sourceRoot":"","sources":["../../../../src/lib/store/workDir/workDirHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkB,YAAY,EAAe,MAAM,iBAAiB,CAAC;AAO5E;;GAEG;AACH,eAAO,MAAM,iBAAiB,qCAAqC,CAAC;AAEpE,eAAO,MAAM,aAAa;IACxB;;;;OAIG;mCAC0B,MAAM,GAAG,IAAI;IAsB1C;;;;;;;;;;;OAWG;2CAEa,MAAM,cACR,MAAM,KACjB,YAAY;CAmDhB,CAAC"}

package/dist/lib/store/workDir/workDirHelper.js

@@ -61,19 +61,34 @@ exports.workDirHelper = {
             }
         });
         const lineDataArray = Object.values(lineData);
+        const lineDataByUniqueId = {};
+        lineDataArray.forEach(lineDataGroup => {
+            if (!lineDataByUniqueId[lineDataGroup.uniqueId]) {
+                lineDataByUniqueId[lineDataGroup.uniqueId] = [];
+            }
+            lineDataByUniqueId[lineDataGroup.uniqueId].push(lineDataGroup);
+        });
+        const sortedUniqueIds = Object.keys(lineDataByUniqueId).sort();
+        const all = [];
+        sortedUniqueIds.forEach(sortedUniqueId => {
+            lineDataByUniqueId[sortedUniqueId].forEach(data => {
+                all.push({
+                    file: data.file.relativePath,
+                    type: data.operation === 'write' ? 'updated' : 'deleted',
+                });
+            });
+        });
+        all.forEach(data => {
+            logger_1.logger.debug(`Found ${data.type} file "${data.file}"`);
+        });
         const updated = lineDataArray
             .filter(data => data.operation === 'write')
             .map(data => data.file.relativePath);
-        updated.forEach(file => {
-            logger_1.logger.debug(`Found updated file "${file}"`);
-        });
         const deleted = lineDataArray
             .filter(data => data.operation === 'delete')
             .map(data => data.file.relativePath);
-        deleted.forEach(file => {
-            logger_1.logger.debug(`Found deleted file "${file}"`);
-        });
         return {
+            all,
             updated,
             deleted,
             fromUniqueId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@static-suite/static-suite-data-server",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A flexible, fast and developer friendly Data Server for Static Suite",
   "main": "./dist/lib/index.js",
   "typings": "./dist/lib/index.d.ts",

package/src/lib/store/dataDir/dataDirManager.ts

@@ -75,6 +75,7 @@ export const dataDirManager: DataDirManager = {
       dataDirManager.getModificationUniqueId();
 
     let changedFiles: ChangedFiles = {
+      all: [],
       updated: [],
       deleted: [],
       fromUniqueId: store.currentUniqueId,
@@ -100,14 +101,16 @@ export const dataDirManager: DataDirManager = {
           dataDirModificationUniqueId,
         );
         hookManager.invokeOnStoreChangeStart(changedFiles);
-        changedFiles.updated.forEach(file => {
-          storeManager.update(file);
-          const fileContent = store.data.get(file);
-          storeManager.parseSingleFileIncludes(file, fileContent);
-        });
-        changedFiles.deleted.forEach(file => {
-          storeManager.remove(file);
+        changedFiles.all.forEach(changedData => {
+          if (changedData.type === 'updated') {
+            storeManager.update(changedData.file);
+            const fileContent = store.data.get(changedData.file);
+            storeManager.parseSingleFileIncludes(changedData.file, fileContent);
+          } else {
+            storeManager.remove(changedData.file);
+          }
         });
+
         // Clear all store subsets and queries, since they are stale.
         // In fact, the subset cache should be cleared only when files
         // are added or deleted, but not when they are simply updated.

package/src/lib/store/workDir/__tests__/workDirHelper.test.ts

@@ -24,6 +24,18 @@ describe('workDirHelper test', () => {
           'es/config/static_export.settings.json',
           'es/entity/node/recipe/9.json',
         ],
+        all: [
+          { file: 'es/entity/node/article/10.json', type: 'deleted' },
+          { file: 'en/entity/node/article/10.json', type: 'updated' },
+          {
+            file: 'es/config/static_export.settings.json',
+            type: 'updated',
+          },
+          {
+            file: 'es/entity/node/recipe/9.json',
+            type: 'updated',
+          },
+        ],
       });
     });
   });

package/src/lib/store/workDir/workDir.types.ts

@@ -1,3 +1,11 @@
+/**
+ * An item for all changed files in Static Suite's data dir.
+ */
+export type allChangesItem = {
+  file: string;
+  type: 'updated' | 'deleted';
+};
+
 /**
  * A group of changed files in Static Suite's data dir.
  */
@@ -16,10 +24,16 @@ export type ChangedFiles = {
    * A list of updated files (both newly added and changed files).
    */
   updated: string[];
+
   /**
    * A list of deleted files.
    */
   deleted: string[];
+
+  /**
+   * A list of all changed files, sorted by its timestamp.
+   */
+  all: allChangesItem[];
 };
 
 /**

package/src/lib/store/workDir/workDirHelper.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import { logger } from '../../utils/logger';
 import { isUniqueId } from '../../utils/string';
-import { ChangedFiles, LogLineData } from './workDir.types';
+import { allChangesItem, ChangedFiles, LogLineData } from './workDir.types';
 import {
   getLogFile,
   getChangedLinesBetween,
@@ -69,21 +69,38 @@ export const workDirHelper = {
     });
     const lineDataArray: LogLineData[] = Object.values(lineData);
 
+    const lineDataByUniqueId: Record<string, LogLineData[]> = {};
+    lineDataArray.forEach(lineDataGroup => {
+      if (!lineDataByUniqueId[lineDataGroup.uniqueId]) {
+        lineDataByUniqueId[lineDataGroup.uniqueId] = [];
+      }
+      lineDataByUniqueId[lineDataGroup.uniqueId].push(lineDataGroup);
+    });
+    const sortedUniqueIds = Object.keys(lineDataByUniqueId).sort();
+    const all: allChangesItem[] = [];
+    sortedUniqueIds.forEach(sortedUniqueId => {
+      lineDataByUniqueId[sortedUniqueId].forEach(data => {
+        all.push({
+          file: data.file.relativePath,
+          type: data.operation === 'write' ? 'updated' : 'deleted',
+        });
+      });
+    });
+
+    all.forEach(data => {
+      logger.debug(`Found ${data.type} file "${data.file}"`);
+    });
+
     const updated = lineDataArray
       .filter(data => data.operation === 'write')
       .map(data => data.file.relativePath);
-    updated.forEach(file => {
-      logger.debug(`Found updated file "${file}"`);
-    });
 
     const deleted = lineDataArray
       .filter(data => data.operation === 'delete')
       .map(data => data.file.relativePath);
-    deleted.forEach(file => {
-      logger.debug(`Found deleted file "${file}"`);
-    });
 
     return {
+      all,
       updated,
       deleted,
       fromUniqueId,