@lage-run/cache 0.3.0 → 0.4.0

package/CHANGELOG.json

@@ -2,7 +2,34 @@
   "name": "@lage-run/cache",
   "entries": [
     {
-      "date": "Tue, 21 Feb 2023 21:30:26 GMT",
+      "date": "Wed, 08 Mar 2023 00:05:07 GMT",
+      "tag": "@lage-run/cache_v0.4.0",
+      "version": "0.4.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cache",
+            "commit": "e2eb2c00d1b23e2c65943e9c64134c14e04f985f",
+            "comment": "allows global script cache"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cache",
+            "comment": "Bump @lage-run/hasher to v0.2.0",
+            "commit": "e2eb2c00d1b23e2c65943e9c64134c14e04f985f"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cache",
+            "comment": "Bump @lage-run/target-graph to v0.7.0",
+            "commit": "e2eb2c00d1b23e2c65943e9c64134c14e04f985f"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 21 Feb 2023 21:30:37 GMT",
       "tag": "@lage-run/cache_v0.3.0",
       "version": "0.3.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Change Log - @lage-run/cache
 
-This log was last generated on Tue, 21 Feb 2023 21:30:26 GMT and should not be manually modified.
+This log was last generated on Wed, 08 Mar 2023 00:05:07 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.4.0
+
+Wed, 08 Mar 2023 00:05:07 GMT
+
+### Minor changes
+
+- allows global script cache (kchau@microsoft.com)
+- Bump @lage-run/hasher to v0.2.0
+- Bump @lage-run/target-graph to v0.7.0
+
 ## 0.3.0
 
-Tue, 21 Feb 2023 21:30:26 GMT
+Tue, 21 Feb 2023 21:30:37 GMT
 
 ### Minor changes
 

package/lib/TargetHasher.js

@@ -8,11 +8,33 @@ Object.defineProperty(exports, "TargetHasher", {
 });
 const _hasher = require("@lage-run/hasher");
 const _saltJs = require("./salt.js");
+const _globHasher = require("glob-hasher");
+const _hashStringsJs = require("./hashStrings.js");
+function sortObject(unordered) {
+    return Object.keys(unordered).sort((a, b)=>a.localeCompare(b)).reduce((obj, key)=>{
+        obj[key] = unordered[key];
+        return obj;
+    }, {});
+}
 class TargetHasher {
     async hash(target) {
+        const { root  } = this.options;
         const hashKey = await (0, _saltJs.salt)(target.environmentGlob ?? this.options.environmentGlob ?? [
             "lage.config.js"
         ], `${target.id}|${JSON.stringify(this.options.cliArgs)}`, this.options.root, this.options.cacheKey || "");
+        if (target.cwd === root && target.cache) {
+            if (!target.inputs) {
+                throw new Error("Root-level targets must have `inputs` defined if it has cache enabled.");
+            }
+            const hashes = (0, _globHasher.hashGlobGit)(target.inputs, {
+                cwd: root,
+                gitignore: false
+            }) ?? {};
+            const sortedHashMap = sortObject(hashes);
+            const sortedHashes = Object.values(sortedHashMap);
+            sortedHashes.push(hashKey);
+            return (0, _hashStringsJs.hashStrings)(sortedHashes);
+        }
         const hasher = new _hasher.Hasher(target.cwd);
         return hasher.createPackageHash(hashKey);
     }

package/lib/hashStrings.d.ts

@@ -0,0 +1 @@
+export declare function hashStrings(strings: string | string[]): string;

package/lib/hashStrings.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "hashStrings", {
+    enumerable: true,
+    get: ()=>hashStrings
+});
+const _crypto = /*#__PURE__*/ _interopRequireDefault(require("crypto"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function hashStrings(strings) {
+    const hasher = _crypto.default.createHash("sha1");
+    const anArray = typeof strings === "string" ? [
+        strings
+    ] : strings;
+    const elements = [
+        ...anArray
+    ];
+    elements.sort((a, b)=>a.localeCompare(b));
+    elements.forEach((element)=>hasher.update(element));
+    return hasher.digest("hex");
+}

package/lib/salt.js

@@ -12,49 +12,8 @@ _export(exports, {
     "_testResetEnvHash": ()=>_testResetEnvHash,
     salt: ()=>salt
 });
-const _path = /*#__PURE__*/ _interopRequireWildcard(require("path"));
-const _crypto = /*#__PURE__*/ _interopRequireWildcard(require("crypto"));
-const _fastGlob = /*#__PURE__*/ _interopRequireWildcard(require("fast-glob"));
-const _promises = /*#__PURE__*/ _interopRequireWildcard(require("fs/promises"));
-function _getRequireWildcardCache(nodeInterop) {
-    if (typeof WeakMap !== "function") return null;
-    var cacheBabelInterop = new WeakMap();
-    var cacheNodeInterop = new WeakMap();
-    return (_getRequireWildcardCache = function(nodeInterop) {
-        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
-    })(nodeInterop);
-}
-function _interopRequireWildcard(obj, nodeInterop) {
-    if (!nodeInterop && obj && obj.__esModule) {
-        return obj;
-    }
-    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-        return {
-            default: obj
-        };
-    }
-    var cache = _getRequireWildcardCache(nodeInterop);
-    if (cache && cache.has(obj)) {
-        return cache.get(obj);
-    }
-    var newObj = {};
-    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-    for(var key in obj){
-        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-            if (desc && (desc.get || desc.set)) {
-                Object.defineProperty(newObj, key, desc);
-            } else {
-                newObj[key] = obj[key];
-            }
-        }
-    }
-    newObj.default = obj;
-    if (cache) {
-        cache.set(obj, newObj);
-    }
-    return newObj;
-}
+const _globHasher = require("glob-hasher");
+const _hashStringsJs = require("./hashStrings.js");
 let envHashes = {};
 // A promise to guarantee the getEnvHashes is done one at a time
 let oneAtATime = Promise.resolve();
@@ -63,7 +22,7 @@ function _testResetEnvHash() {
 }
 async function salt(environmentGlobFiles, command, repoRoot, customKey = "") {
     const envHash = await getEnvHash(environmentGlobFiles, repoRoot);
-    return hashStrings([
+    return (0, _hashStringsJs.hashStrings)([
         ...envHash,
         command,
         customKey
@@ -72,6 +31,12 @@ async function salt(environmentGlobFiles, command, repoRoot, customKey = "") {
 function envHashKey(environmentGlobFiles) {
     return environmentGlobFiles.sort().join("|");
 }
+function sortObject(unordered) {
+    return Object.keys(unordered).sort((a, b)=>a.localeCompare(b)).reduce((obj, key)=>{
+        obj[key] = unordered[key];
+        return obj;
+    }, {});
+}
 async function getEnvHash(environmentGlobFiles, repoRoot) {
     const key = envHashKey(environmentGlobFiles);
     // We want to make sure that we only call getEnvHashOneAtTime one at a time
@@ -85,35 +50,17 @@ async function getEnvHash(environmentGlobFiles, repoRoot) {
     });
     return oneAtATime;
 }
-async function getEnvHashOneAtTime(environmentGlobFiles, repoRoot) {
-    const envHash = [];
-    const newline = /\r\n|\r|\n/g;
-    const LF = "\n";
-    const files = _fastGlob.sync(environmentGlobFiles, {
-        cwd: repoRoot
-    });
-    files.sort((a, b)=>a.localeCompare(b));
-    for (const file of files){
-        const hasher = _crypto.createHash("sha1");
-        hasher.update(file);
-        const fileBuffer = await _promises.readFile(_path.join(repoRoot, file), "utf-8");
-        const data = fileBuffer.replace(newline, LF);
-        hasher.update(data);
-        envHash.push(hasher.digest("hex"));
-    }
+function getEnvHashOneAtTime(environmentGlobFiles, repoRoot) {
     const key = envHashKey(environmentGlobFiles);
-    envHashes[key] = envHash;
-    return envHash;
-}
-function hashStrings(strings) {
-    const hasher = _crypto.createHash("sha1");
-    const anArray = typeof strings === "string" ? [
-        strings
-    ] : strings;
-    const elements = [
-        ...anArray
-    ];
-    elements.sort((a, b)=>a.localeCompare(b));
-    elements.forEach((element)=>hasher.update(element));
-    return hasher.digest("hex");
+    if (environmentGlobFiles.length === 0) {
+        envHashes[key] = [];
+        return envHashes[key];
+    }
+    const hashes = (0, _globHasher.hashGlobGit)(environmentGlobFiles, {
+        cwd: repoRoot,
+        gitignore: false
+    });
+    const sortedHashes = sortObject(hashes);
+    envHashes[key] = Object.values(sortedHashes);
+    return envHashes[key];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cache",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Cache for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -15,19 +15,17 @@
     "lint": "monorepo-scripts lint"
   },
   "dependencies": {
-    "@lage-run/hasher": "^0.1.3",
-    "@lage-run/target-graph": "^0.6.2",
+    "@lage-run/hasher": "^0.2.0",
+    "@lage-run/target-graph": "^0.7.0",
     "@lage-run/logger": "^1.2.2",
     "backfill-config": "^6.3.0",
     "backfill-cache": "^5.6.1",
     "backfill-logger": "^5.1.3",
-    "fast-glob": "^3.2.11"
+    "glob-hasher": "1.1.1"
   },
   "devDependencies": {
     "@lage-run/monorepo-fixture": "*",
-    "@types/mock-fs": "4.13.1",
-    "monorepo-scripts": "*",
-    "mock-fs": "5.2.0"
+    "monorepo-scripts": "*"
   },
   "publishConfig": {
     "access": "public"