lincd-cli 0.2.59 → 0.2.62

package/lib/cli-methods.js

@@ -23,7 +23,6 @@ const depcheck_1 = __importDefault(require("depcheck"));
 var glob = require('glob');
 var variables = {};
 var open = require('open');
-var gruntConfig;
 const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
     if (!name) {
         console.warn('Please provide a name as the first argument');
@@ -67,24 +66,6 @@ function progressUpdate(message) {
     process.stdout.write('                                                                    \r');
     process.stdout.write(message + '\r');
 }
-function debugInfo(...messages) {
-    // messages.forEach((message) => {
-    //   console.log(chalk.cyan('Info: ') + message);
-    // });
-    //@TODO: let packages also use lincd.config.json? instead of gruntfile...
-    // that way we can read "analyse" here and see if we need to log debug info
-    // if(!gruntConfig)
-    // {
-    //   gruntConfig = getGruntConfig();
-    //   console.log(gruntConfig);
-    //   process.exit();
-    // }
-    if (gruntConfig && gruntConfig.analyse === true) {
-        messages.forEach((message) => {
-            console.log(chalk_1.default.cyan('Info: ') + message);
-        });
-    }
-}
 function warn(...messages) {
     messages.forEach((message) => {
         console.log(chalk_1.default.magenta('Warning: ') + message);
@@ -359,10 +340,10 @@ function buildAll(options) {
     // let packagesLeft = lincdPackages.size - done.size;
     runOnPackagesGroupedByDependencies(lincdPackages, (packageGroup, dependencies) => {
         if (done.size > 0) {
-            debugInfo(chalk_1.default.magenta('\n-------\nThese packages are next, since all their dependencies have now been build:'));
+            (0, utils_1.debugInfo)(chalk_1.default.magenta('\n-------\nThese packages are next, since all their dependencies have now been build:'));
             // log(stack);
         }
-        debugInfo('Now building: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
+        (0, utils_1.debugInfo)('Now building: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
         return (pkg) => __awaiter(this, void 0, void 0, function* () {
             let command;
             let skipping = false;
@@ -1008,54 +989,6 @@ const buildPackage = (target, target2, packagePath = process.cwd(), logResults =
     }
 };
 exports.buildPackage = buildPackage;
-const getLastBuildTime = (packagePath) => {
-    return getLastModifiedFile(packagePath + '/@(builds|lib|dist)/**/*.js');
-};
-const getLastModifiedSourceTime = (packagePath) => {
-    return getLastModifiedFile(packagePath + '/@(src|data|scss)/**/*', {
-        ignore: [packagePath + '/**/*.scss.json', packagePath + '/**/*.d.ts'],
-    });
-};
-const getLastCommitTime = (packagePath) => {
-    // console.log(`git log -1 --format=%ci -- ${packagePath}`);
-    // process.exit();
-    return (0, utils_1.execPromise)(`git log -1 --format="%h %ci" -- ${packagePath}`)
-        .then((result) => __awaiter(void 0, void 0, void 0, function* () {
-        let commitId = result.substring(0, result.indexOf(' '));
-        let date = result.substring(commitId.length + 1);
-        let lastCommitDate = new Date(date);
-        let changes = yield (0, utils_1.execPromise)(`git show --stat --oneline ${commitId} -- ${packagePath}`);
-        // log(packagePath,result,lastCommit);
-        // log(changes);
-        return { date: lastCommitDate, changes, commitId };
-    }))
-        .catch(({ error, stdout, stderr }) => {
-        debugInfo(chalk_1.default.red('Git error: ') + error.message.toString());
-        return null;
-    });
-};
-const getLastModifiedFile = (filePath, config = {}) => {
-    var files = glob.sync(filePath, config);
-    // console.log(files.join(" - "));
-    var lastModifiedName;
-    var lastModified;
-    var lastModifiedTime = 0;
-    files.forEach((fileName) => {
-        if (fs_extra_1.default.lstatSync(fileName).isDirectory()) {
-            // console.log("skipping directory "+fileName);
-            return;
-        }
-        let mtime = fs_extra_1.default.statSync(path_1.default.join(fileName)).mtime;
-        let modifiedTime = mtime.getTime();
-        if (modifiedTime > lastModifiedTime) {
-            // console.log(fileName,mtime);
-            lastModifiedName = fileName;
-            lastModified = mtime;
-            lastModifiedTime = modifiedTime;
-        }
-    });
-    return { lastModified, lastModifiedName, lastModifiedTime };
-};
 var publishUpdated = function (test = false) {
     let packages = getLocalLincdModules();
     var p = Promise.resolve('');
@@ -1077,7 +1010,7 @@ var publishUpdated = function (test = false) {
             let version = getNextVersion(pack.version);
             if (pack.private) {
                 shouldPublish = false;
-                debugInfo(chalk_1.default.blue('--> is private, skipping'));
+                (0, utils_1.debugInfo)(chalk_1.default.blue('--> is private, skipping'));
                 return chalk_1.default.gray(pckg.packageName + ' is private');
                 // return previousResult + ' ' + chalk.gray(pckg.packageName + ' is private\n');
             }
@@ -1088,7 +1021,7 @@ var publishUpdated = function (test = false) {
                 var info;
                 try {
                     if (output == '' || output.includes('E404')) {
-                        debugInfo('Empty or 404 response from `npm info`. This package was probably not published before');
+                        (0, utils_1.debugInfo)('Empty or 404 response from `npm info`. This package was probably not published before');
                         // throw new Error('Empty response from `yarn info`. This pkg was probably not published before');
                         // return;
                         shouldPublish = true;
@@ -1111,10 +1044,10 @@ var publishUpdated = function (test = false) {
                         // }
                         let lastPublishDate = new Date(lastPublish);
                         // let {lastModifiedTime, lastModifiedName, lastModified} = getLastModifiedSourceTime(pkg.path);
-                        let lastCommitInfo = yield getLastCommitTime(pckg.path);
+                        let lastCommitInfo = yield (0, utils_1.getLastCommitTime)(pckg.path);
                         if (!lastCommitInfo) {
                             shouldPublish = false;
-                            debugInfo('Could not determine last git commit');
+                            (0, utils_1.debugInfo)('Could not determine last git commit');
                             // return previousResult + ' ' + chalk.red(pckg.packageName + ' - could not determine last commit\n');
                             return chalk_1.default.red(pckg.packageName + ' - could not determine last commit');
                         }
@@ -1235,7 +1168,7 @@ var publishPackage = function (pkg, test, info, publishVersion) {
             publishVersion = info ? getNextVersion(info.version) : 'patch';
         }
         if (test) {
-            debugInfo('should publish ' + pkg.packageName + ' ' + publishVersion);
+            (0, utils_1.debugInfo)('should publish ' + pkg.packageName + ' ' + publishVersion);
             //when testing what needs to be published
             return chalk_1.default.blue(pkg.packageName + ' should publish');
         }
@@ -1265,7 +1198,7 @@ var publishPackage = function (pkg, test, info, publishVersion) {
     });
 };
 exports.publishPackage = publishPackage;
-var buildUpdated = function (back, target, target2, test = false) {
+var buildUpdated = function (back, target, target2, useGitForLastModified = false, test = false) {
     return __awaiter(this, void 0, void 0, function* () {
         // back = back || 1;
         // return execPromise(`git log -${back} --format=%ci`).then((result) => {
@@ -1277,8 +1210,8 @@ var buildUpdated = function (back, target, target2, test = false) {
         // let packages = getLocalLincdModules();
         let packages = getLocalLincdPackageMap();
         // console.log(packages);
-        let jsonldPkgUpdated = needsRebuilding(packages.get('lincd-jsonld'));
-        // let cliPkgUpdated = needsRebuilding(packages.get('lincd-cli'));
+        let jsonldPkgUpdated = yield needsRebuilding(packages.get('lincd-jsonld'), useGitForLastModified);
+        // let cliPkgUpdated = await needsRebuilding(packages.get('lincd-cli'), useGitForLastModified);
         //if either cli or jsonldPkg needs to be rebuilt
         // if (jsonldPkgUpdated || cliPkgUpdated) {
         if (jsonldPkgUpdated) {
@@ -1291,12 +1224,12 @@ var buildUpdated = function (back, target, target2, test = false) {
         // }
         let packagesLeft = packages.size;
         runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
-            debugInfo('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
-            debugInfo(packagesLeft + ' packages left.');
+            (0, utils_1.debugInfo)('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
+            (0, utils_1.debugInfo)(packagesLeft + ' packages left.');
             packagesLeft = packagesLeft - packageGroup.length;
             return (pkg) => __awaiter(this, void 0, void 0, function* () {
                 // debugInfo('# Checking package ' + pkg.packageName);
-                let needRebuild = needsRebuilding(pkg, true);
+                let needRebuild = yield needsRebuilding(pkg, useGitForLastModified, true);
                 if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
                     needRebuild = true;
                 }
@@ -1304,7 +1237,7 @@ var buildUpdated = function (back, target, target2, test = false) {
                     //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
                     // log(packageName+' modified since last commit on '+now.toString());
                     if (test) {
-                        debugInfo('Need to build ' + pkg.packageName);
+                        (0, utils_1.debugInfo)('Need to build ' + pkg.packageName);
                         return chalk_1.default.blue(pkg.packageName + ' should be build');
                     }
                     log('Building ' + pkg.packageName);
@@ -1314,7 +1247,7 @@ var buildUpdated = function (back, target, target2, test = false) {
                         (target ? ' ' + target : '') +
                         (target2 ? ' ' + target2 : ''))
                         .then((res) => {
-                        debugInfo(chalk_1.default.green(pkg.packageName + ' successfully built'));
+                        (0, utils_1.debugInfo)(chalk_1.default.green(pkg.packageName + ' successfully built'));
                         return chalk_1.default.green(pkg.packageName + ' built');
                     })
                         .catch(({ error, stdout, stderr }) => {
@@ -1345,22 +1278,35 @@ var buildUpdated = function (back, target, target2, test = false) {
     });
 };
 exports.buildUpdated = buildUpdated;
-const needsRebuilding = function (pkg, log = false) {
-    let lastModifiedSource = getLastModifiedSourceTime(pkg.path);
-    let lastModifiedBundle = getLastBuildTime(pkg.path);
-    let result = lastModifiedSource.lastModifiedTime > lastModifiedBundle.lastModifiedTime;
-    if (log) {
-        console.log(chalk_1.default.cyan('Last modified source: ' +
-            lastModifiedSource.lastModifiedName +
-            ' on ' +
-            lastModifiedSource.lastModified.toString()));
-        console.log(chalk_1.default.cyan('Last build: ' +
-            (lastModifiedBundle &&
-                typeof lastModifiedBundle.lastModified !== 'undefined'
-                ? lastModifiedBundle.lastModified.toString()
-                : 'never')));
-    }
-    return result;
+const needsRebuilding = function (pkg, useGitForLastModified, log = false) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let lastModifiedSourceDate;
+        let lastModifiedSourceName;
+        if (useGitForLastModified) {
+            const { changes, commitId, date } = yield (0, utils_1.getLastCommitTime)(pkg.path);
+            lastModifiedSourceDate = date;
+            lastModifiedSourceName = commitId;
+        }
+        else {
+            const { lastModified, lastModifiedName, lastModifiedTime } = (0, utils_1.getLastModifiedSourceTime)(pkg.path);
+            lastModifiedSourceName = lastModifiedName;
+            lastModifiedSourceDate = lastModified;
+        }
+        let lastModifiedBundle = (0, utils_1.getLastBuildTime)(pkg.path);
+        let result = lastModifiedSourceDate.getTime() > lastModifiedBundle.lastModifiedTime;
+        if (log) {
+            console.log(chalk_1.default.cyan('Last modified source: ' +
+                lastModifiedSourceName +
+                ' on ' +
+                lastModifiedSourceDate.toString()));
+            console.log(chalk_1.default.cyan('Last build: ' +
+                (lastModifiedBundle &&
+                    typeof lastModifiedBundle.lastModified !== 'undefined'
+                    ? lastModifiedBundle.lastModified.toString()
+                    : 'never')));
+        }
+        return result;
+    });
 };
 const printBuildResults = function (failed, done) {
     log('Successfully built: ' +

package/lib/cli.js

@@ -97,9 +97,11 @@ program.command('status').action(() => {
 });
 program
     .command('build-updated [target] [target2]')
-    .action((target, target2) => {
-    return (0, cli_methods_1.buildUpdated)(1, target, target2);
-});
+    .action((target, target2, options) => {
+    const { useGit } = options;
+    return (0, cli_methods_1.buildUpdated)(1, target, target2, useGit || false);
+})
+    .option('--use-git', 'Use git commit timestamps to check which packages have been updated since the last build');
 program
     .command('build-updated-since [num-commits-back] [target] [target2]')
     .action((back, target, target2) => {

package/lib/config-grunt.js

@@ -269,11 +269,11 @@ function setupGrunt(grunt, moduleName, config) {
             grunt.task.loadTasks(nestedWorkspacePath);
         }
         else {
-            (0, utils_1.warn)(`Could not load grunt task module ${taskName}
-Could not find task at any of these paths:
-${localPath}
-${localPath2}
-${workspacePath}
+            (0, utils_1.warn)(`Could not load grunt task module ${taskName}
+Could not find task at any of these paths:
+${localPath}
+${localPath2}
+${workspacePath}
 ${nestedWorkspacePath}`);
         }
     });

package/lib/plugins/check-imports.js

@@ -54,7 +54,7 @@ function handler(source) {
     if (isRelativeReq &&
         this.resourcePath.indexOf(baseUrl) !== 0 &&
         this.resourcePath.indexOf('node_modules') === -1) {
-        this.emitError(Error(`LINCD Error: You are importing a file from outside the baseUrl ${tsconfig.compilerOptions.baseUrl}. 
+        this.emitError(Error(`LINCD Error: You are importing a file from outside the baseUrl ${tsconfig.compilerOptions.baseUrl}. 
         ${relativePath} is not in ${tsconfig.compilerOptions.baseUrl}.`));
     }
     // if (this.resourcePath.indexOf(path.resolve('./src')) !== 0) {

package/lib/utils.js

@@ -22,16 +22,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLinkedTailwindColors = exports.flatten = exports.warn = exports.debug = exports.log = exports.generateScopedName = exports.execPromise = exports.execp = exports.getGruntConfig = exports.getModulePackageJSON = exports.getLINCDDependencies = exports.getPackageJSON = void 0;
+exports.getLinkedTailwindColors = exports.flatten = exports.warn = exports.debugInfo = exports.debug = exports.log = exports.generateScopedName = exports.execPromise = exports.execp = exports.getGruntConfig = exports.getModulePackageJSON = exports.getLastModifiedFile = exports.getLastCommitTime = exports.getLastModifiedSourceTime = exports.getLastBuildTime = exports.getLINCDDependencies = exports.getPackageJSON = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const { findNearestPackageJson, findNearestPackageJsonSync, } = require('find-nearest-package-json');
+var glob = require('glob');
+var gruntConfig;
 var getPackageJSON = function (root = process.cwd(), error = true) {
     let packagePath = path.join(root, 'package.json');
     if (fs.existsSync(packagePath)) {
@@ -156,6 +167,58 @@ var getLINCDDependencies = function (packageJson, checkedPackages = new Set()) {
     return lincdPackagePaths;
 };
 exports.getLINCDDependencies = getLINCDDependencies;
+const getLastBuildTime = (packagePath) => {
+    return (0, exports.getLastModifiedFile)(packagePath + '/@(builds|lib|dist)/**/*.js');
+};
+exports.getLastBuildTime = getLastBuildTime;
+const getLastModifiedSourceTime = (packagePath) => {
+    return (0, exports.getLastModifiedFile)(packagePath + '/@(src|data|scss)/**/*', {
+        ignore: [packagePath + '/**/*.scss.json', packagePath + '/**/*.d.ts'],
+    });
+};
+exports.getLastModifiedSourceTime = getLastModifiedSourceTime;
+const getLastCommitTime = (packagePath) => {
+    // console.log(`git log -1 --format=%ci -- ${packagePath}`);
+    // process.exit();
+    return execPromise(`git log -1 --format="%h %ci" -- ${packagePath}`)
+        .then((result) => __awaiter(void 0, void 0, void 0, function* () {
+        let commitId = result.substring(0, result.indexOf(' '));
+        let date = result.substring(commitId.length + 1);
+        let lastCommitDate = new Date(date);
+        let changes = yield execPromise(`git show --stat --oneline ${commitId} -- ${packagePath}`);
+        // log(packagePath,result,lastCommit);
+        // log(changes);
+        return { date: lastCommitDate, changes, commitId };
+    }))
+        .catch(({ error, stdout, stderr }) => {
+        debugInfo(chalk_1.default.red('Git error: ') + error.message.toString());
+        return null;
+    });
+};
+exports.getLastCommitTime = getLastCommitTime;
+const getLastModifiedFile = (filePath, config = {}) => {
+    var files = glob.sync(filePath, config);
+    // console.log(files.join(" - "));
+    var lastModifiedName;
+    var lastModified;
+    var lastModifiedTime = 0;
+    files.forEach((fileName) => {
+        if (fs.lstatSync(fileName).isDirectory()) {
+            // console.log("skipping directory "+fileName);
+            return;
+        }
+        let mtime = fs.statSync(path.join(fileName)).mtime;
+        let modifiedTime = mtime.getTime();
+        if (modifiedTime > lastModifiedTime) {
+            // console.log(fileName,mtime);
+            lastModifiedName = fileName;
+            lastModified = mtime;
+            lastModifiedTime = modifiedTime;
+        }
+    });
+    return { lastModified, lastModifiedName, lastModifiedTime };
+};
+exports.getLastModifiedFile = getLastModifiedFile;
 //from https://github.com/haalcala/node-packagejson/blob/master/index.js
 var getModulePackageJSON = function (module_name, work_dir) {
     if (!work_dir) {
@@ -311,6 +374,25 @@ function debug(config, ...messages) {
     }
 }
 exports.debug = debug;
+function debugInfo(...messages) {
+    // messages.forEach((message) => {
+    //   console.log(chalk.cyan('Info: ') + message);
+    // });
+    //@TODO: let packages also use lincd.config.json? instead of gruntfile...
+    // that way we can read "analyse" here and see if we need to log debug info
+    // if(!gruntConfig)
+    // {
+    //   gruntConfig = getGruntConfig();
+    //   console.log(gruntConfig);
+    //   process.exit();
+    // }
+    if (gruntConfig && gruntConfig.analyse === true) {
+        messages.forEach((message) => {
+            console.log(chalk_1.default.cyan('Info: ') + message);
+        });
+    }
+}
+exports.debugInfo = debugInfo;
 function warn(...messages) {
     messages.forEach((message) => {
         console.log(chalk_1.default.red(message));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.59",
+  "version": "0.2.62",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {