lincd-cli 0.2.73 → 0.2.75

package/lib/cli-methods.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.depCheck = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const depcheck_1 = __importDefault(require("depcheck"));
@@ -24,6 +24,8 @@ const fs_1 = require("fs");
 var glob = require('glob');
 var variables = {};
 var open = require('open');
+var stagedGitFiles = require('staged-git-files');
+const find_nearest_package_json_1 = require("find-nearest-package-json");
 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');
@@ -776,8 +778,32 @@ invalidImports = new Map()) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 exports.checkImports = checkImports;
-const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
-    (0, depcheck_1.default)(process.cwd(), {}, (results) => {
+const depCheckStaged = () => __awaiter(void 0, void 0, void 0, function* () {
+    console.log('Checking dependencies of staged files');
+    stagedGitFiles(function (err, results) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const packages = new Set();
+            yield Promise.all(results.map((file) => __awaiter(this, void 0, void 0, function* () {
+                // console.log('STAGED: ', file.filename);
+                let root = yield (0, find_nearest_package_json_1.findNearestPackageJson)(file.filename);
+                packages.add(root.path);
+            })));
+            [...packages].forEach((packageRoot) => {
+                const pack = JSON.parse(fs_extra_1.default.readFileSync(packageRoot, 'utf8'));
+                const srcPath = packageRoot.replace('package.json', '');
+                console.log('Checking dependencies of ' + chalk_1.default.blue(pack.name) + ':');
+                return (0, exports.depCheck)(process.cwd() + '/' + srcPath);
+                // console.log('check dependencies of ' + pack.name);
+                //
+                // console.log('ROOT of ' + file.filename + ': ' + root.path);
+                // console.log('ROOT of ' + file.filename + ': ' + root.data);
+            });
+        });
+    });
+});
+exports.depCheckStaged = depCheckStaged;
+const depCheck = (path = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+    (0, depcheck_1.default)(path, {}, (results) => {
         if (results.missing) {
             let lincdPackages = getLocalLincdModules();
             let missing = Object.keys(results.missing);
@@ -793,12 +819,13 @@ const depCheck = () => __awaiter(void 0, void 0, void 0, function* () {
             });
             //currently just missing LINCD packages cause a hard failure exit code
             if (missingLincdPackages.length > 0) {
-                console.warn(chalk_1.default.red('\nThese LINCD packages are imported but they are not listed in package.json:\n- ' +
+                console.warn(chalk_1.default.red('[ERROR] These LINCD packages are imported but they are not listed in package.json:\n- ' +
                     missingLincdPackages.join(',\n- ')));
                 process.exit(1);
             }
             else if (missing.length > 0) {
-                console.warn(chalk_1.default.red('Missing dependencies:\n\t' + missing.join(',\n\t')));
+                console.warn(chalk_1.default.magenta('Missing dependencies (for now a warning, soon an error):\n\t' +
+                    missing.join(',\n\t')));
             }
         }
         // if(Object.keys(results.invalidFiles).length > 0) {

package/lib/cli.js

@@ -128,6 +128,9 @@ program.command('dev [target] [mode]').action((target, mode) => {
 program.command('depcheck').action((target, mode) => {
     (0, cli_methods_1.depCheck)();
 });
+program.command('depcheck-staged').action((target, mode) => {
+    (0, cli_methods_1.depCheckStaged)();
+});
 program.command('check-imports').action((target, mode) => {
     (0, cli_methods_1.checkImports)();
 });

package/lib/config-grunt.js

@@ -89,9 +89,9 @@ function setupGrunt(grunt, moduleName, config) {
         buildServer
             ? [
                 // 'clean:lib',
+                'exec:depcheck',
                 'exec:build-lib',
                 'copy:lib',
-                'exec:depcheck',
                 'exec:check-imports',
             ]
             : null,
@@ -119,7 +119,23 @@ function setupGrunt(grunt, moduleName, config) {
             'build-lib-es5': 'yarn exec tsc --pretty -p tsconfig-es5.json',
             beforeBuildCommand: config.beforeBuildCommand,
             'server-dev': 'tsc -w',
-            depcheck: 'yarn lincd depcheck',
+            depcheck: {
+                command: 'yarn lincd depcheck',
+                // stdout: false,
+                // stderr: true,
+                // callback: function (error, stdout, stderr) {
+                //   if (error) {
+                //     // console.log(chalk.red('XX Error: ') + error.message);
+                //     process.exit(1);
+                //     return;
+                //   }
+                //   if (stderr) {
+                //     process.exit(1);
+                //     return;
+                //   }
+                //   // console.log(stdout);
+                // },
+            },
             'check-imports': 'yarn lincd check-imports',
             test: 'tsc -w',
             // shapes: 'lincd shapes',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lincd-cli",
-  "version": "0.2.73",
+  "version": "0.2.75",
   "description": "Command line tools for the lincd.js library",
   "main": "lib/index.js",
   "scripts": {
@@ -90,6 +90,7 @@
     "sass": "^1.55.0",
     "sass-loader": "^13.0.2",
     "source-map-loader": "^4.0.0",
+    "staged-git-files": "^1.3.0",
     "tailwindcss": "^3.2.7",
     "terser-webpack-plugin": "^5.3.6",
     "ts-loader": "^9.4.1",